Attachment 95992 Details for Bug 76242 – uncore init fix, alternate version

[patch] uncore init fix, alternate version

uncore_init_fix.patch (text/plain), 1014 bytes, created by Daniel Vetter on 2014-03-18 08:57:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-03-18 08:57:48 UTC

Size: 1014 bytes

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index e4d2b9f15ae2..9faee49f210d 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -1608,8 +1608,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
> 		goto put_bridge;
> 	}
> 
>-	intel_uncore_early_sanitize(dev);
>-
> 	/* This must be called before any calls to HAS_PCH_* */
> 	intel_detect_pch(dev);
> 
>diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
>index e2e328d86aff..c3832d9270a6 100644
>--- a/drivers/gpu/drm/i915/intel_uncore.c
>+++ b/drivers/gpu/drm/i915/intel_uncore.c
>@@ -736,6 +736,8 @@ void intel_uncore_init(struct drm_device *dev)
> 	setup_timer(&dev_priv->uncore.force_wake_timer,
> 		    gen6_force_wake_timer, (unsigned long)dev_priv);
> 
>+	intel_uncore_early_sanitize(dev);
>+
> 	if (IS_VALLEYVIEW(dev)) {
> 		dev_priv->uncore.funcs.force_wake_get = __vlv_force_wake_get;
> 		dev_priv->uncore.funcs.force_wake_put = __vlv_force_wake_put;

Actions: View | Splinter Review

Attachments on bug 76242: 95901 | 95992

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.