summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-08-25 23:40:39 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 06:12:11 (GMT)
commit84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33 (patch)
treea18abd035000d31f7722bbcb4e5ef1b1bd14195e
parentc20ab3e1cb0bb8e2c9a54a49b4637c61512ed856 (diff)
downloadlinux-fsl-qoriq-84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33.tar.xz
drm/nvd9/disp: bail out of mode_set_base if no fb bound to crtc
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 20072fb..23d63b4 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -391,6 +391,11 @@ nvd0_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
int ret;
+ if (!crtc->fb) {
+ NV_DEBUG_KMS(crtc->dev, "No FB bound\n");
+ return 0;
+ }
+
ret = nvd0_crtc_swap_fbs(crtc, old_fb);
if (ret)
return ret;