Commit 981a5aea authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: vlv: clean up GTLC wake control/status register macros 



These will be needed by the upcoming VLV RPM helpers.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a8ebba75

drivers/gpu/drm/i915/i915_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -4476,8 +4476,9 @@ int i915_gem_init(struct drm_device *dev) 


	if (IS_VALLEYVIEW(dev)) {

		/* VLVA0 (potential hack), BIOS isn't actually waking us */

		I915_WRITE(VLV_GTLC_WAKE_CTRL, 1);

		if (wait_for((I915_READ(VLV_GTLC_PW_STATUS) & 1) == 1, 10))

		I915_WRITE(VLV_GTLC_WAKE_CTRL, VLV_GTLC_ALLOWWAKEREQ);

		if (wait_for((I915_READ(VLV_GTLC_PW_STATUS) &

			      VLV_GTLC_ALLOWWAKEACK), 10))

			DRM_DEBUG_DRIVER("allow wake ack timed out\n");

	}

drivers/gpu/drm/i915/i915_reg.h

+8 −2
Original line number Diff line number Diff line
@@ -4997,9 +4997,15 @@ enum punit_power_well { 
#define  FORCEWAKE_ACK_HSW			0x130044

#define  FORCEWAKE_ACK				0x130090

#define  VLV_GTLC_WAKE_CTRL			0x130090

#define   VLV_GTLC_RENDER_CTX_EXISTS		(1 << 25)

#define   VLV_GTLC_MEDIA_CTX_EXISTS		(1 << 24)

#define   VLV_GTLC_ALLOWWAKEREQ			(1 << 0)



#define  VLV_GTLC_PW_STATUS			0x130094

#define VLV_GTLC_PW_RENDER_STATUS_MASK		0x80

#define VLV_GTLC_PW_MEDIA_STATUS_MASK		0x20

#define   VLV_GTLC_ALLOWWAKEACK			(1 << 0)

#define   VLV_GTLC_ALLOWWAKEERR			(1 << 1)

#define   VLV_GTLC_PW_MEDIA_STATUS_MASK		(1 << 5)

#define   VLV_GTLC_PW_RENDER_STATUS_MASK	(1 << 7)

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

#define   FORCEWAKE_KERNEL			0x1

#define   FORCEWAKE_USER			0x2

CRA Git | Maintained and supported by SUSTech CRA and CCSE