diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-11-21 21:54:30 +0200 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-03 09:29:39 +0100 |
| commit | f98ce92fea8a865b044d3bc4097e88a81efb74b5 (patch) | |
| tree | 9c4d550af2d8089bc1c22e95afdf6150796e5e83 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | drm/i915: Grab modeset locks for GPU rest on pre-ctg (diff) | |
| download | linux-dev-f98ce92fea8a865b044d3bc4097e88a81efb74b5.tar.xz linux-dev-f98ce92fea8a865b044d3bc4097e88a81efb74b5.zip | |
drm/i915: Disable crtcs gracefully before GPU reset on gen3/4
The GPU reset also resets the display on gen3/4. The g33 docs say we
should disable all planes before flipping the reset switch. Just
disable all the crtcs instead. That seems a nicer thing to do anyway.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index cf8ecc01deb4..2b34c046da66 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1371,8 +1371,6 @@ static int g4x_reset_complete(struct drm_device *dev) static int g33_do_reset(struct drm_device *dev) { - /* FIXME spec says to turn off all planes and wait 1 usec before reset */ - pci_write_config_byte(dev->pdev, I915_GDRST, GRDOM_RESET_ENABLE); return wait_for(g4x_reset_complete(dev), 500); } |