From: Ville Syrjälä Date: Fri, 21 Nov 2014 19:54:27 +0000 (+0200) Subject: drm/i915: Implement GPU reset for 915/945 X-Git-Tag: omap-for-v3.19/fixes-rc1~80^2~9^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59ea90543f57a40827d7d1e528d657b8cc7161b1;p=pandora-kernel.git drm/i915: Implement GPU reset for 915/945 915/945 have the same reset registers as 965, so share the code. Signed-off-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 68e42392f59c..44abd7b0051d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -881,7 +881,8 @@ int i915_reset(struct drm_device *dev) if (INTEL_INFO(dev)->gen > 5) intel_reset_gt_powersave(dev); - if (IS_GEN4(dev) && !IS_G4X(dev)) { + if ((IS_GEN3(dev) && !IS_G33(dev)) || + (IS_GEN4(dev) && !IS_G4X(dev))) { intel_runtime_pm_disable_interrupts(dev_priv); intel_runtime_pm_enable_interrupts(dev_priv); Reading git-diff-tree failed