summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-12-26 16:00:37 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-12-26 16:00:37 -0300
commit35acfa0fc609f2a2cd95cef4a6a9c3a5c38f1778 (patch)
tree281fc9db2a40c54ee94dc88fc2bf8c119cfafc15 /drivers/gpu
parentf3a16ba6a1152b8966dcadc668af4cf00623c7b1 (diff)
Add support for the exFAT file system, fix hangs on older intel hardware and update AUFSpck-4.3.3-gnu
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b2270d576..84eda179e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6225,9 +6225,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
if (to_intel_plane_state(crtc->primary->state)->visible) {
intel_crtc_wait_for_pending_flips(crtc);
intel_pre_disable_primary(crtc);
+
+ intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
+ to_intel_plane_state(crtc->primary->state)->visible = false;
}
- intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
dev_priv->display.crtc_disable(crtc);
intel_disable_shared_dpll(intel_crtc);