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

Commit e7911c48 authored by Eugeni Dodonov's avatar Eugeni Dodonov Committed by Daniel Vetter
Browse files

drm/i915: support Haswell force waking 



There is a different ACK register for force wake on Haswell, so account
for that.

Signed-off-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c4de7b0f

drivers/gpu/drm/i915/i915_drv.c

+18 −4
Original line number Diff line number Diff line
@@ -451,12 +451,19 @@ static void __gen6_gt_wait_for_thread_c0(struct drm_i915_private *dev_priv) 


static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)

{

	if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK) & 1) == 0, 500))

	u32 forcewake_ack;



	if (IS_HASWELL(dev_priv->dev))

		forcewake_ack = FORCEWAKE_ACK_HSW;

	else

		forcewake_ack = FORCEWAKE_ACK;



	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0, 500))

		DRM_ERROR("Force wake wait timed out\n");



	I915_WRITE_NOTRACE(FORCEWAKE, 1);



	if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK) & 1), 500))

	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1), 500))

		DRM_ERROR("Force wake wait timed out\n");



	__gen6_gt_wait_for_thread_c0(dev_priv);
@@ -464,12 +471,19 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) 


static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)

{

	if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_MT_ACK) & 1) == 0, 500))

	u32 forcewake_ack;



	if (IS_HASWELL(dev_priv->dev))

		forcewake_ack = FORCEWAKE_ACK_HSW;

	else

		forcewake_ack = FORCEWAKE_MT_ACK;



	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0, 500))

		DRM_ERROR("Force wake wait timed out\n");



	I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(1));



	if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_MT_ACK) & 1), 500))

	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1), 500))

		DRM_ERROR("Force wake wait timed out\n");



	__gen6_gt_wait_for_thread_c0(dev_priv);

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -4071,6 +4071,7 @@ 
#define  FORCEWAKE				0xA18C

#define  FORCEWAKE_VLV				0x1300b0

#define  FORCEWAKE_ACK_VLV			0x1300b4

#define  FORCEWAKE_ACK_HSW			0x130044

#define  FORCEWAKE_ACK				0x130090

#define  FORCEWAKE_MT				0xa188 /* multi-threaded */

#define  FORCEWAKE_MT_ACK			0x130040