aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2013-03-01 16:14:13 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-03-06 13:50:28 -0500
commit248ee3a803bf5754b86aef6af8d2a8f8104c8215 (patch)
tree2252af03afb06867e10ac3e24dca4d372136b2e0 /drivers/gpu/drm/i915/i915_drv.c
parent56c2912afc71bd3523167c5403d45ad3f7b33d22 (diff)
drm/i915: VLV has force wake
This was omitted from commit b7884eb45ec98c0d34c7f49005ae9d4b4b4e38f6 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Mon Jun 4 11:18:15 2012 +0200 drm/i915: hold forcewake around ring hw init which introduced the ->has_force_wake flag. Note that this only enables the above w/a hack. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> [danvet: Put some interesting stuff into the empty commit message.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b342749fcc87..1ebed9670ab9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -275,6 +275,7 @@ static const struct intel_device_info intel_valleyview_m_info = {
275 .has_blt_ring = 1, 275 .has_blt_ring = 1,
276 .is_valleyview = 1, 276 .is_valleyview = 1,
277 .display_mmio_offset = VLV_DISPLAY_BASE, 277 .display_mmio_offset = VLV_DISPLAY_BASE,
278 .has_force_wake = 1,
278}; 279};
279 280
280static const struct intel_device_info intel_valleyview_d_info = { 281static const struct intel_device_info intel_valleyview_d_info = {
@@ -285,6 +286,7 @@ static const struct intel_device_info intel_valleyview_d_info = {
285 .has_blt_ring = 1, 286 .has_blt_ring = 1,
286 .is_valleyview = 1, 287 .is_valleyview = 1,
287 .display_mmio_offset = VLV_DISPLAY_BASE, 288 .display_mmio_offset = VLV_DISPLAY_BASE,
289 .has_force_wake = 1,
288}; 290};
289 291
290static const struct intel_device_info intel_haswell_d_info = { 292static const struct intel_device_info intel_haswell_d_info = {