Commit 3e3282c0a23d8eb9438dcf4ac908a5eb48c7038b
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge tag 'drm-intel-fixes-2014-12-04' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Silence some pch fifo underrun reports and panel locking backtraces, both cc: stable. * tag 'drm-intel-fixes-2014-12-04' of git://anongit.freedesktop.org/drm-intel: drm/i915: Unlock panel even when LVDS is disabled drm/i915: More cautious with pch fifo underruns
Showing 2 changed files Side-by-side Diff
drivers/gpu/drm/i915/intel_display.c
| ... | ... | @@ -4325,7 +4325,6 @@ |
| 4325 | 4325 | ironlake_fdi_disable(crtc); |
| 4326 | 4326 | |
| 4327 | 4327 | ironlake_disable_pch_transcoder(dev_priv, pipe); |
| 4328 | - intel_set_pch_fifo_underrun_reporting(dev, pipe, true); | |
| 4329 | 4328 | |
| 4330 | 4329 | if (HAS_PCH_CPT(dev)) { |
| 4331 | 4330 | /* disable TRANS_DP_CTL */ |
| ... | ... | @@ -4389,7 +4388,6 @@ |
| 4389 | 4388 | |
| 4390 | 4389 | if (intel_crtc->config.has_pch_encoder) { |
| 4391 | 4390 | lpt_disable_pch_transcoder(dev_priv); |
| 4392 | - intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true); | |
| 4393 | 4391 | intel_ddi_fdi_disable(crtc); |
| 4394 | 4392 | } |
| 4395 | 4393 |
drivers/gpu/drm/i915/intel_lvds.c
| ... | ... | @@ -899,6 +899,17 @@ |
| 899 | 899 | int pipe; |
| 900 | 900 | u8 pin; |
| 901 | 901 | |
| 902 | + /* | |
| 903 | + * Unlock registers and just leave them unlocked. Do this before | |
| 904 | + * checking quirk lists to avoid bogus WARNINGs. | |
| 905 | + */ | |
| 906 | + if (HAS_PCH_SPLIT(dev)) { | |
| 907 | + I915_WRITE(PCH_PP_CONTROL, | |
| 908 | + I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS); | |
| 909 | + } else { | |
| 910 | + I915_WRITE(PP_CONTROL, | |
| 911 | + I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS); | |
| 912 | + } | |
| 902 | 913 | if (!intel_lvds_supported(dev)) |
| 903 | 914 | return; |
| 904 | 915 | |
| ... | ... | @@ -1097,17 +1108,6 @@ |
| 1097 | 1108 | lvds_encoder->a3_power = I915_READ(lvds_encoder->reg) & |
| 1098 | 1109 | LVDS_A3_POWER_MASK; |
| 1099 | 1110 | |
| 1100 | - /* | |
| 1101 | - * Unlock registers and just | |
| 1102 | - * leave them unlocked | |
| 1103 | - */ | |
| 1104 | - if (HAS_PCH_SPLIT(dev)) { | |
| 1105 | - I915_WRITE(PCH_PP_CONTROL, | |
| 1106 | - I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS); | |
| 1107 | - } else { | |
| 1108 | - I915_WRITE(PP_CONTROL, | |
| 1109 | - I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS); | |
| 1110 | - } | |
| 1111 | 1111 | lvds_connector->lid_notifier.notifier_call = intel_lid_notify; |
| 1112 | 1112 | if (acpi_lid_notifier_register(&lvds_connector->lid_notifier)) { |
| 1113 | 1113 | DRM_DEBUG_KMS("lid notifier registration failed\n"); |