summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_fb.c
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-11-19 12:29:33 -0500
committerRob Clark <robdclark@gmail.com>2014-11-21 08:57:22 -0500
commit3e2f29e4137c78a3bd7e1b85cf287ff375f6367e (patch)
treec2c827f1ef39695cd1e62f57cb6fa08161d9962a /drivers/gpu/drm/msm/msm_fb.c
parent32c0e3e24c885ffeecb6d3a67ecb607b8fe63129 (diff)
downloadlinux-3e2f29e4137c78a3bd7e1b85cf287ff375f6367e.tar.bz2
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_fb.c')
-rw-r--r--drivers/gpu/drm/msm/msm_fb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index f4e42d506ff7..84dec161d836 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -120,6 +120,8 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb, int id)
uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb, int id, int plane)
{
struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
+ if (!msm_fb->planes[plane])
+ return 0;
return msm_gem_iova(msm_fb->planes[plane], id);
}