Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm intel fixes from Dave Airlie:
"Two intel stable fixes, that should be it from me for this round"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Unlock panel even when LVDS is disabled
drm/i915: More cautious with pch fifo underruns
+11
-13
-2
drivers/gpu/drm/i915/intel_display.c
-2
drivers/gpu/drm/i915/intel_display.c
···
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 */
···
4388
4389
4389
4390
if (intel_crtc->config.has_pch_encoder) {
4390
4391
lpt_disable_pch_transcoder(dev_priv);
4391
-
intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);
4392
4392
intel_ddi_fdi_disable(crtc);
4393
4393
}
4394
4394
+11
-11
drivers/gpu/drm/i915/intel_lvds.c
+11
-11
drivers/gpu/drm/i915/intel_lvds.c
···
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
···
1108
1097
lvds_encoder->a3_power = I915_READ(lvds_encoder->reg) &
1109
1098
LVDS_A3_POWER_MASK;
1110
1099
1111
-
/*
1112
-
* Unlock registers and just
1113
-
* leave them unlocked
1114
-
*/
1115
-
if (HAS_PCH_SPLIT(dev)) {
1116
-
I915_WRITE(PCH_PP_CONTROL,
1117
-
I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS);
1118
-
} else {
1119
-
I915_WRITE(PP_CONTROL,
1120
-
I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS);
1121
-
}
1122
1100
lvds_connector->lid_notifier.notifier_call = intel_lid_notify;
1123
1101
if (acpi_lid_notifier_register(&lvds_connector->lid_notifier)) {
1124
1102
DRM_DEBUG_KMS("lid notifier registration failed\n");