Attachment 855323 Details for Bug 1057533 – i915_remove_pm_qos_request_on_error_v3.12.patch

i915_remove_pm_qos_request_on_error_v3.12.patch

i915_remove_pm_qos_request_on_error_v3.12.patch (text/plain), 1.37 KB, created by Stanislaw Gruszka on 2014-01-25 09:17:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2014-01-25 09:17:36 UTC

Size: 1.37 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index 5a25f24..34f3ba3 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -1609,6 +1609,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
> 	/* This must be called before any calls to HAS_PCH_* */
> 	intel_detect_pch(dev);
> 
>+	pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY,
>+			   PM_QOS_DEFAULT_VALUE);
>+
> 	intel_irq_init(dev);
> 	intel_pm_init(dev);
> 	intel_uncore_sanitize(dev);
>@@ -1683,6 +1686,7 @@ out_gem_unload:
> 
> 	intel_teardown_gmbus(dev);
> 	intel_teardown_mchbar(dev);
>+	pm_qos_remove_request(&dev_priv->pm_qos);
> 	destroy_workqueue(dev_priv->wq);
> out_mtrrfree:
> 	arch_phys_wc_del(dev_priv->gtt.mtrr);
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 4b91228..c262a3f 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -3120,8 +3120,6 @@ void intel_irq_init(struct drm_device *dev)
> 	setup_timer(&dev_priv->hotplug_reenable_timer, i915_reenable_hotplug_timer_func,
> 		    (unsigned long) dev_priv);
> 
>-	pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);
>-
> 	dev->driver->get_vblank_counter = i915_get_vblank_counter;
> 	dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
> 	if (IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5) {

Actions: View

Attachments on bug 1057533: 854869 | 855221 | 855323 | 855421