summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_atomic.c
diff options
context:
space:
mode:
authorRob Clark2014-11-19 18:29:33 +0100
committerRob Clark2014-11-21 14:57:22 +0100
commit3e2f29e4137c78a3bd7e1b85cf287ff375f6367e (patch)
treec2c827f1ef39695cd1e62f57cb6fa08161d9962a /drivers/gpu/drm/msm/msm_atomic.c
parentdrm/msm/mdp5: remove global mdp5_ctl_mgr (diff)
downloadkernel-qcow2-linux-3e2f29e4137c78a3bd7e1b85cf287ff375f6367e.tar.gz
kernel-qcow2-linux-3e2f29e4137c78a3bd7e1b85cf287ff375f6367e.tar.xz
kernel-qcow2-linux-3e2f29e4137c78a3bd7e1b85cf287ff375f6367e.zip
drm/msm: atomic fixes
Fixes for a couple little issues found in testing. Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_atomic.c')
-rw-r--r--drivers/gpu/drm/msm/msm_atomic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 8cf3361daba3..f0de412e13dc 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -117,7 +117,7 @@ int msm_atomic_commit(struct drm_device *dev,
if (!plane)
continue;
- if (plane->state->fb != new_state->fb)
+ if ((plane->state->fb != new_state->fb) && new_state->fb)
add_fb(c, new_state->fb);
}