From: Daniel Vetter Date: Thu, 22 May 2014 15:56:33 +0000 (+0200) Subject: drm/i915: Disable gpu reset on i965g/gm X-Git-Tag: next-20140530~66^2~34 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a1babbdddb1b02c3e4a13878aa250ec43fe34076;p=karo-tx-linux.git drm/i915: Disable gpu reset on i965g/gm Ville figured out that it needs a full display reset since apparently a lot more goes down than just the GT. Until that's address it's better to just diable gpu reset. Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 889778745935..81839a6a6bbe 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1066,6 +1066,9 @@ static int i965_do_reset(struct drm_device *dev) { int ret; + /* FIXME: i965g/gm need a display save/restore for gpu reset. */ + return -ENODEV; + /* * Set the domains we want to reset (GRDOM/bits 2 and 3) as * well as the reset bit (GR/bit 0). Setting the GR bit