aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index eff28e5de4dc..714bf539918b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1251,6 +1251,10 @@ static void intel_update_fbc(struct drm_crtc *crtc,
1251 goto out_disable; 1251 goto out_disable;
1252 } 1252 }
1253 1253
1254 /* If the kernel debugger is active, always disable compression */
1255 if (in_dbg_master())
1256 goto out_disable;
1257
1254 if (intel_fbc_enabled(dev)) { 1258 if (intel_fbc_enabled(dev)) {
1255 /* We can re-enable it in this case, but need to update pitch */ 1259 /* We can re-enable it in this case, but need to update pitch */
1256 if ((fb->pitch > dev_priv->cfb_pitch) || 1260 if ((fb->pitch > dev_priv->cfb_pitch) ||