From: Jesse Barnes Date: Fri, 1 Mar 2013 21:14:13 +0000 (-0800) Subject: drm/i915: VLV has force wake X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=248ee3a803bf5754b86aef6af8d2a8f8104c8215;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/i915: VLV has force wake This was omitted from commit b7884eb45ec98c0d34c7f49005ae9d4b4b4e38f6 Author: Daniel Vetter 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 [danvet: Put some interesting stuff into the empty commit message.] Signed-off-by: Daniel Vetter --- 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 = { .has_blt_ring = 1, .is_valleyview = 1, .display_mmio_offset = VLV_DISPLAY_BASE, + .has_force_wake = 1, }; static const struct intel_device_info intel_valleyview_d_info = { @@ -285,6 +286,7 @@ static const struct intel_device_info intel_valleyview_d_info = { .has_blt_ring = 1, .is_valleyview = 1, .display_mmio_offset = VLV_DISPLAY_BASE, + .has_force_wake = 1, }; static const struct intel_device_info intel_haswell_d_info = {