diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-08-26 01:40:39 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 08:12:11 +0200 |
| commit | 84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33 (patch) | |
| tree | a18abd035000d31f7722bbcb4e5ef1b1bd14195e | |
| parent | drm/nvd9/disp: stub some more api hooks so we don't oops on resume (diff) | |
| download | linux-84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33.tar.xz linux-84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33.zip | |
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.c | 5 |
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 20072fb784a5..23d63b4b3d77 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; |