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ä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 68e4239..44abd7b 100644 (file)
--- 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);
 

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_uncore.c
Simple merge