Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61251512 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915/guc: Remove one unnecessary variable 



No need for local struct drm_device * since dev_priv is the
correct thing to pass in to NEEDS_WaRsDisableCoarsePowerGating
anyway. Changed the macro definition for the latter to reflect
that as well.

v2: Alignment bikeshed.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466518034-24838-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent ee648a74

drivers/gpu/drm/i915/i915_drv.h

+4 −3
Original line number Diff line number Diff line
@@ -2789,9 +2789,10 @@ struct drm_i915_cmd_table { 
#define HAS_BROKEN_CS_TLB(dev)		(IS_I830(dev) || IS_845G(dev))



/* WaRsDisableCoarsePowerGating:skl,bxt */

#define NEEDS_WaRsDisableCoarsePowerGating(dev) (IS_BXT_REVID(dev, 0, BXT_REVID_A1) || \

						 IS_SKL_GT3(dev) || \

						 IS_SKL_GT4(dev))

#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \

	(IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) || \

	 IS_SKL_GT3(dev_priv) || \

	 IS_SKL_GT4(dev_priv))



/*

 * dp aux and gmbus irq on gen4 seems to be able to generate legacy interrupts

drivers/gpu/drm/i915/i915_guc_submission.c

+1 −2
Original line number Diff line number Diff line
@@ -153,12 +153,11 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, 
				     struct i915_guc_client *client)

{

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_device *dev = dev_priv->dev;

	u32 data[2];



	data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;

	/* WaRsDisableCoarsePowerGating:skl,bxt */

	if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev))

	if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev_priv))

		data[1] = 0;

	else

		/* bit 0 and 1 are for Render and Media domain separately */