From: Ben Widawsky Date: Fri, 8 Nov 2013 00:24:31 +0000 (-0800) Subject: drm/i915/bdw: Initialize BDW forcewake vfuncs X-Git-Tag: v3.13-rc1~69^2~8^2~72 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43d1b64728ee699cdcc8cc0f8abab1c170b451ff;p=profile%2Fcommon%2Fkernel-common.git drm/i915/bdw: Initialize BDW forcewake vfuncs Somehow this got missed or dropped during development. The simulator does not use forcewake, so it's entirely possible it never worked correctly. After the mmio rework, this will end up in an OOPs, and the system will not boot. Signed-off-by: Ben Widawsky [danvet: Use IS_GEN8 instead of IS_BROADWELL.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index ccbbd6d..170c44e 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -533,7 +533,7 @@ void intel_uncore_init(struct drm_device *dev) if (IS_VALLEYVIEW(dev)) { dev_priv->uncore.funcs.force_wake_get = vlv_force_wake_get; dev_priv->uncore.funcs.force_wake_put = vlv_force_wake_put; - } else if (IS_HASWELL(dev)) { + } else if (IS_HASWELL(dev) || IS_GEN8(dev)) { dev_priv->uncore.funcs.force_wake_get = __gen6_gt_force_wake_mt_get; dev_priv->uncore.funcs.force_wake_put = __gen6_gt_force_wake_mt_put; } else if (IS_IVYBRIDGE(dev)) {