Attachment 31546 Details for Bug 24980 – kernel patch against drm-intel-next

[patch] kernel patch against drm-intel-next

overlay_resume_fix.patch (text/plain), 2.50 KB, created by Daniel Vetter on 2009-11-29 03:10:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2009-11-29 03:10:15 UTC

Size: 2.50 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
>index 1e4557a..890274f 100644
>--- a/drivers/gpu/drm/i915/intel_overlay.c
>+++ b/drivers/gpu/drm/i915/intel_overlay.c
>@@ -413,28 +413,12 @@ static int intel_overlay_off(struct intel_overlay *overlay)
> 	if (ret != 0)
> 		return ret;
> 
>+	overlay->active = 0;
> 	overlay->hw_wedged = 0;
> 	overlay->last_flip_req = 0;
> 	return ret;
> }
> 
>-static void intel_overlay_off_tail(struct intel_overlay *overlay)
>-{
>-	struct drm_gem_object *obj;
>-
>-	/* never have the overlay hw on without showing a frame */
>-	BUG_ON(!overlay->vid_bo);
>-	obj = overlay->vid_bo->obj;
>-
>-	i915_gem_object_unpin(obj);
>-	drm_gem_object_unreference(obj);
>-	overlay->vid_bo = NULL;
>-
>-	overlay->crtc->overlay = NULL;
>-	overlay->crtc = NULL;
>-	overlay->active = 0;
>-}
>-
> /* recover from an interruption due to a signal
>  * We have to be careful not to repeat work forever an make forward progess. */
> int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
>@@ -492,7 +476,17 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
> 				return ret;
> 
> 		case SWITCH_OFF_STAGE_2:
>-			intel_overlay_off_tail(overlay);
>+			BUG_ON(!overlay->vid_bo);
>+			obj = overlay->vid_bo->obj;
>+
>+			i915_gem_object_unpin(obj);
>+			drm_gem_object_unreference(obj);
>+			overlay->vid_bo = NULL;
>+
>+			overlay->crtc->overlay = NULL;
>+			overlay->crtc = NULL;
>+
>+			overlay->active = 0;
> 			break;
> 		default:
> 			BUG_ON(overlay->hw_wedged != NEEDS_WAIT_FOR_FLIP);
>@@ -875,20 +869,18 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
> {
> 	int ret;
> 	struct overlay_registers *regs;
>+	struct drm_gem_object *obj;
> 	struct drm_device *dev = overlay->dev;
> 
> 	BUG_ON(!mutex_is_locked(&dev->struct_mutex));
> 	BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
> 
>-	if (overlay->hw_wedged) {
>-		ret = intel_overlay_recover_from_interrupt(overlay, 1);
>-		if (ret != 0)
>-			return;
>-	}
>-
> 	if (!overlay->active)
> 		return 0;
> 
>+	if (overlay->hw_wedged)
>+		return -EBUSY;
>+
> 	ret = intel_overlay_release_old_vid(overlay);
> 	if (ret != 0)
> 		return ret;
>@@ -905,7 +897,16 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
> 	if (ret != 0)
> 		return ret;
> 
>-	intel_overlay_off_tail(overlay);
>+	/* never have the overlay hw on without showing a frame */
>+	BUG_ON(!overlay->vid_bo);
>+	obj = overlay->vid_bo->obj;
>+
>+	i915_gem_object_unpin(obj);
>+	drm_gem_object_unreference(obj);
>+	overlay->vid_bo = NULL;
>+
>+	overlay->crtc->overlay = NULL;
>+	overlay->crtc = NULL;
> 
> 	return 0;
> }

Actions: View | Splinter Review

Attachments on bug 24980: 31546

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.