Attachment 72315 Details for Bug 58843 – Only signal CRTC idle from the device idle

[patch] Only signal CRTC idle from the device idle

0001-fb-idle.patch (text/plain), 2.85 KB, created by Chris Wilson on 2012-12-30 21:33:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-12-30 21:33:22 UTC

Size: 2.85 KB

patch

obsolete

>From 3c817fa440e7ef2199748dbdfcef134b1e3c9865 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sun, 30 Dec 2012 21:32:16 +0000
>Subject: [PATCH] fb-idle
>
>---
> drivers/gpu/drm/i915/i915_gem.c      |    3 ---
> drivers/gpu/drm/i915/intel_display.c |   11 +++--------
> drivers/gpu/drm/i915/intel_drv.h     |    3 +--
> 3 files changed, 4 insertions(+), 13 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 6f16f77..9597b01 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2053,9 +2053,6 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
> 	BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
> 	BUG_ON(!obj->active);
> 
>-	if (obj->pin_count) /* are we a framebuffer? */
>-		intel_mark_fb_idle(obj);
>-
> 	list_move_tail(&obj->mm_list, &dev_priv->mm.inactive_gpu_list);
> 
> 	list_del_init(&obj->ring_list);
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 51083e5..a56c774 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -6734,10 +6734,6 @@ void intel_mark_busy(struct drm_device *dev)
> 
> void intel_mark_idle(struct drm_device *dev)
> {
>-}
>-
>-void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
>-{
> 	struct drm_device *dev = obj->base.dev;
> 	struct drm_crtc *crtc;
> 
>@@ -6748,12 +6744,11 @@ void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
> 		if (!crtc->fb)
> 			continue;
> 
>-		if (to_intel_framebuffer(crtc->fb)->obj == obj)
>-			intel_increase_pllclock(crtc);
>+		intel_decrease_pllclock(crtc);
> 	}
> }
> 
>-void intel_mark_fb_idle(struct drm_i915_gem_object *obj)
>+void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
> {
> 	struct drm_device *dev = obj->base.dev;
> 	struct drm_crtc *crtc;
>@@ -6766,7 +6761,7 @@ void intel_mark_fb_idle(struct drm_i915_gem_object *obj)
> 			continue;
> 
> 		if (to_intel_framebuffer(crtc->fb)->obj == obj)
>-			intel_decrease_pllclock(crtc);
>+			intel_increase_pllclock(crtc);
> 	}
> }
> 
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index ffd0149..69d1eac 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -480,9 +480,8 @@ extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg,
> extern void intel_dvo_init(struct drm_device *dev);
> extern void intel_tv_init(struct drm_device *dev);
> extern void intel_mark_busy(struct drm_device *dev);
>-extern void intel_mark_idle(struct drm_device *dev);
> extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj);
>-extern void intel_mark_fb_idle(struct drm_i915_gem_object *obj);
>+extern void intel_mark_idle(struct drm_device *dev);
> extern bool intel_lvds_init(struct drm_device *dev);
> extern bool intel_is_dual_link_lvds(struct drm_device *dev);
> extern void intel_dp_init(struct drm_device *dev, int output_reg,
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 58843: 72230 | 72231 | 72232 | 72312 | 72313 | 72314 | 72315 | 72316 | 72317

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.