AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Introduce gpu_reset_clobbers_display()

Browse Source 
Factor out the "does the GPU reset clobber the display?" check into a
small helper.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470428910-12125-4-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2016-08-05 23:28:29 +03:00
parent 522a63de18
commit 4ac2ba2f8c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/intel_display.c
View File

@ -3135,6 +3135,11 @@ __intel_display_resume(struct drm_device *dev,
return ret; return ret;
} }
static bool gpu_reset_clobbers_display(struct drm_i915_private *dev_priv)
{
return INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv);
}
void intel_prepare_reset(struct drm_i915_private *dev_priv) void intel_prepare_reset(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
@ -3162,7 +3167,7 @@ void intel_prepare_reset(struct drm_i915_private *dev_priv)
/* reset doesn't touch the display, but flips might get nuked anyway, */ /* reset doesn't touch the display, but flips might get nuked anyway, */
if (!i915.force_reset_modeset_test && if (!i915.force_reset_modeset_test &&
(INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))) !gpu_reset_clobbers_display(dev_priv))
return; return;
/* /*
@ -3212,7 +3217,7 @@ void intel_finish_reset(struct drm_i915_private *dev_priv)
dev_priv->modeset_restore_state = NULL; dev_priv->modeset_restore_state = NULL;
/* reset doesn't touch the display */ /* reset doesn't touch the display */
if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv)) { if (!gpu_reset_clobbers_display(dev_priv)) {
if (!state) { if (!state) {
/* /*
* Flips in the rings have been nuked by the reset, * Flips in the rings have been nuked by the reset,