Attachment 50547 Details for Bug 40336 – fix

[patch] fix

nv04_crtc_no_fb.patch (text/plain), 1.29 KB, created by Emil Velikov on 2011-08-24 14:36:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emil Velikov

Created: 2011-08-24 14:36:37 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
>index 118261d..5e45398 100644
>--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
>+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
>@@ -781,11 +781,20 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
> 	struct drm_device *dev = crtc->dev;
> 	struct drm_nouveau_private *dev_priv = dev->dev_private;
> 	struct nv04_crtc_reg *regp = &dev_priv->mode_reg.crtc_reg[nv_crtc->index];
>-	struct drm_framebuffer *drm_fb = nv_crtc->base.fb;
>-	struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);
>+	struct drm_framebuffer *drm_fb;
>+	struct nouveau_framebuffer *fb;
> 	int arb_burst, arb_lwm;
> 	int ret;
> 
>+	NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);
>+
>+	/* no fb bound */
>+	if (!atomic && !crtc->fb) {
>+		NV_DEBUG_KMS(dev, "No FB bound\n");
>+		return 0;
>+	}
>+
>+
> 	/* If atomic, we want to switch to the fb we were passed, so
> 	 * now we update pointers to do that.  (We don't pin; just
> 	 * assume we're already pinned and update the base address.)
>@@ -794,6 +803,8 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
> 		drm_fb = passed_fb;
> 		fb = nouveau_framebuffer(passed_fb);
> 	} else {
>+		drm_fb = crtc->fb;
>+		fb = nouveau_framebuffer(crtc->fb);
> 		/* If not atomic, we can go ahead and pin, and unpin the
> 		 * old fb we were passed.
> 		 */

Actions: View | Splinter Review

Attachments on bug 40336: 50518 | 50519 | 50520 | 50521 | 50522 | 50523 | 50524 | 50525 | 50547

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.