diff options
| author | Imre Deak | 2014-04-14 19:24:22 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-05-05 09:08:50 +0200 |
| commit | 981a5aead1fcfe3ef4de3ae86b1469b99032b287 (patch) | |
| tree | 541d7eb3f23e012df5afd815c7aef353b43f702e /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Use the coarse ping-pong mechanism based on drm fd to dispatch the ... (diff) | |
| download | kernel-qcow2-linux-981a5aead1fcfe3ef4de3ae86b1469b99032b287.tar.gz kernel-qcow2-linux-981a5aead1fcfe3ef4de3ae86b1469b99032b287.tar.xz kernel-qcow2-linux-981a5aead1fcfe3ef4de3ae86b1469b99032b287.zip | |
drm/i915: vlv: clean up GTLC wake control/status register macros
These will be needed by the upcoming VLV RPM helpers.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 7057eab3ccfa..10079cab9229 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -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"); } |