Attachment 855221 Details for Bug 1057533 – i915_remove_pm_qos_request_on_error.patch

i915_remove_pm_qos_request_on_error.patch

i915_remove_pm_qos_request_on_error.patch (text/plain), 1.27 KB, created by Stanislaw Gruszka on 2014-01-24 20:40:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2014-01-24 20:40:47 UTC

Size: 1.27 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index 5c64842..5892515 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -1603,6 +1603,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
> 		goto out_mtrrfree;
> 	}
> 
>+	pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY,
>+			   PM_QOS_DEFAULT_VALUE);
>+
> 	intel_irq_init(dev);
> 	intel_uncore_sanitize(dev);
> 
>@@ -1680,6 +1683,7 @@ out_gem_unload:
> 	intel_teardown_gmbus(dev);
> 	intel_teardown_mchbar(dev);
> 	destroy_workqueue(dev_priv->wq);
>+	pm_qos_remove_request(&dev_priv->pm_qos);
> out_mtrrfree:
> 	arch_phys_wc_del(dev_priv->gtt.mtrr);
> 	io_mapping_free(dev_priv->gtt.mappable);
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 5d1dedc..09e268a 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -3784,8 +3784,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);
>-
> 	if (IS_GEN2(dev)) {
> 		dev->max_vblank_count = 0;
> 		dev->driver->get_vblank_counter = i8xx_get_vblank_counter;

Actions: View

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