diff mbox

[3/3] drm/i915: Remove duplicate intel_uncore_forcewake_reset.

Message ID 1386490979-20748-1-git-send-email-deepak.s@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

deepak.s@intel.com Dec. 8, 2013, 8:22 a.m. UTC 
From: Deepak S <deepak.s@intel.com>

Since early sanitize and uncore sanitize are called one after the other,
I think, we can remove second forcewake reset which was are calling
twice in both the functions.

Signed-off-by: Deepak S <deepak.s@intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Daniel Vetter Dec. 9, 2013, 8:27 a.m. UTC | #1 
On Sun, Dec 08, 2013 at 01:52:59PM +0530, deepak.s@intel.com wrote:
> From: Deepak S <deepak.s@intel.com>
> 
> Since early sanitize and uncore sanitize are called one after the other,
> I think, we can remove second forcewake reset which was are calling
> twice in both the functions.
> 
> Signed-off-by: Deepak S <deepak.s@intel.com>

This is a merge artifact, I've amend the commit message with the
explanation. git blame is really good for figuring this stuff out.
Queued for -next, thanks for the patch.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 0db5472..fede73d 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -333,8 +333,6 @@  void intel_uncore_sanitize(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 reg_val;
 
-	intel_uncore_forcewake_reset(dev);
-
 	/* BIOS often leaves RC6 enabled, but disable it for hw init */
 	intel_disable_gt_powersave(dev);