Attachment 113537 Details for Bug 89166 – Still ugly

[patch] Still ugly

0001-bug89166.patch (text/plain), 4.32 KB, created by Chris Wilson on 2015-02-16 14:04:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2015-02-16 14:04:33 UTC

Size: 4.32 KB

patch

obsolete

>From 84f92cbf45998dcbf4eb5f22c6ec44f865d69010 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 16 Feb 2015 13:40:40 +0000
>Subject: [PATCH] bug89166
>
>---
> drivers/gpu/drm/i915/intel_display.c | 42 ++++++++++++++++++++++++------------
> 1 file changed, 28 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 3b0fe9f1f3c9..0c910af7afef 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -102,6 +102,12 @@ static void chv_prepare_pll(struct intel_crtc *crtc,
> static void intel_begin_crtc_commit(struct drm_crtc *crtc);
> static void intel_finish_crtc_commit(struct drm_crtc *crtc);
> 
>+static void intel_fb_unreference(struct drm_framebuffer *fb)
>+{
>+	BUG_ON(mutex_is_locked(&fb->dev->struct_mutex));
>+	drm_framebuffer_unreference(fb);
>+}
>+
> static struct intel_encoder *intel_find_encoder(struct intel_connector *connector, int pipe)
> {
> 	if (!connector->mst_port)
>@@ -2426,7 +2432,7 @@ update_state_fb(struct drm_plane *plane)
> 		return;
> 
> 	if (plane->state->fb)
>-		drm_framebuffer_unreference(plane->state->fb);
>+		intel_fb_unreference(plane->state->fb);
> 	plane->state->fb = plane->fb;
> 	if (plane->state->fb)
> 		drm_framebuffer_reference(plane->state->fb);
>@@ -8790,7 +8796,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
> 
> 		if (old->release_fb) {
> 			drm_framebuffer_unregister_private(old->release_fb);
>-			drm_framebuffer_unreference(old->release_fb);
>+			intel_fb_unreference(old->release_fb);
> 		}
> 
> 		return;
>@@ -9107,7 +9113,6 @@ static void intel_unpin_work_fn(struct work_struct *__work)
> 	mutex_lock(&dev->struct_mutex);
> 	intel_unpin_fb_obj(intel_fb_obj(work->old_fb));
> 	drm_gem_object_unreference(&work->pending_flip_obj->base);
>-	drm_framebuffer_unreference(work->old_fb);
> 
> 	intel_fbc_update(dev);
> 
>@@ -9116,6 +9121,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
> 	mutex_unlock(&dev->struct_mutex);
> 
> 	intel_frontbuffer_flip_complete(dev, INTEL_FRONTBUFFER_PRIMARY(pipe));
>+	intel_fb_unreference(work->old_fb);
> 
> 	BUG_ON(atomic_read(&to_intel_crtc(work->crtc)->unpin_work_count) == 0);
> 	atomic_dec(&to_intel_crtc(work->crtc)->unpin_work_count);
>@@ -9778,10 +9784,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> 	if (atomic_read(&intel_crtc->unpin_work_count) >= 2)
> 		flush_workqueue(dev_priv->wq);
> 
>-	ret = i915_mutex_lock_interruptible(dev);
>-	if (ret)
>-		goto cleanup;
>-
> 	/* Reference the objects for the scheduled work. */
> 	drm_framebuffer_reference(work->old_fb);
> 	drm_gem_object_reference(&obj->base);
>@@ -9791,6 +9793,10 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> 
> 	work->pending_flip_obj = obj;
> 
>+	ret = i915_mutex_lock_interruptible(dev);
>+	if (ret)
>+		goto cleanup;
>+
> 	atomic_inc(&intel_crtc->unpin_work_count);
> 	intel_crtc->reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
> 
>@@ -9855,13 +9861,14 @@ cleanup_unpin:
> 	intel_unpin_fb_obj(obj);
> cleanup_pending:
> 	atomic_dec(&intel_crtc->unpin_work_count);
>+	mutex_unlock(&dev->struct_mutex);
>+cleanup:
> 	crtc->primary->fb = old_fb;
> 	update_state_fb(crtc->primary);
>-	drm_framebuffer_unreference(work->old_fb);
>-	drm_gem_object_unreference(&obj->base);
>-	mutex_unlock(&dev->struct_mutex);
> 
>-cleanup:
>+	drm_gem_object_unreference_unlocked(&obj->base);
>+	intel_fb_unreference(work->old_fb);
>+
> 	spin_lock_irq(&dev->event_lock);
> 	intel_crtc->unpin_work = NULL;
> 	spin_unlock_irq(&dev->event_lock);
>@@ -13671,6 +13678,8 @@ void intel_modeset_gem_init(struct drm_device *dev)
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct drm_crtc *c;
> 	struct drm_i915_gem_object *obj;
>+	struct drm_plane *unused[I915_MAX_PIPES];
>+	int n_unused = 0;
> 
> 	mutex_lock(&dev->struct_mutex);
> 	intel_init_gt_powersave(dev);
>@@ -13706,13 +13715,18 @@ void intel_modeset_gem_init(struct drm_device *dev)
> 					       NULL)) {
> 			DRM_ERROR("failed to pin boot fb on pipe %d\n",
> 				  to_intel_crtc(c)->pipe);
>-			drm_framebuffer_unreference(c->primary->fb);
>-			c->primary->fb = NULL;
>-			update_state_fb(c->primary);
>+			unused[n_unused++] = c->primary;
> 		}
> 	}
> 	mutex_unlock(&dev->struct_mutex);
> 
>+	while (n_unused--) {
>+		struct drm_plane *p = unused[n_unused];
>+		intel_fb_unreference(p->fb);
>+		p->fb = NULL;
>+		update_state_fb(p);
>+	}
>+
> 	intel_backlight_register(dev);
> }
> 
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89166: 113531 | 113537

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.