misc i915 fixes. * tag 'drm-intel-fixes-2015-05-08' of git://anongit.freedesktop.org/drm-intel: drm/i915: Drop PIPE-A quirk for 945GSE HP Mini drm/i915: Sink rate read should be saved in deca-kHz drm/i915/dp: there is no audio on port A drm/i915: Add missing MacBook Pro models with dual channel LVDS drm/i915: Assume dual channel LVDS if pixel clock necessitates it
Unified · Split
| @@ -13635,9 +13635,6 @@ static const struct intel_dmi_quirk intel_dmi_quirks[] = { · 13634 unmodified lines | ||
| 13635 | 13635 | }; |
| 13636 | 13636 | |
| 13637 | 13637 | static struct intel_quirk intel_quirks[] = { |
| 13638 | − /* HP Mini needs pipe A force quirk (LP: #322104) */ | |
| 13639 | − { 0x27ae, 0x103c, 0x361a, quirk_pipea_force }, | |
| 13640 | − | |
| 13641 | 13638 | /* Toshiba Protege R-205, S-209 needs pipe A force quirk */ |
| 13642 | 13639 | { 0x2592, 0x1179, 0x0001, quirk_pipea_force }, |
| 13643 | 13640 | |
| @@ -1348,7 +1348,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, · 1347 unmodified lines | ||
| 1348 | 1348 | |
| 1349 | 1349 | pipe_config->has_dp_encoder = true; |
| 1350 | 1350 | pipe_config->has_drrs = false; |
| 1351 | − pipe_config->has_audio = intel_dp->has_audio; | |
| 1351 | + pipe_config->has_audio = intel_dp->has_audio && port != PORT_A; | |
| 1352 | 1352 | |
| 1353 | 1353 | if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) { |
| 1354 | 1354 | intel_fixed_panel_mode(intel_connector->panel.fixed_mode, |
| @@ -2211,8 +2211,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder, · 856 unmodified lines | ||
| 2211 | 2211 | int dotclock; |
| 2212 | 2212 | |
| 2213 | 2213 | tmp = I915_READ(intel_dp->output_reg); |
| 2214 | − if (tmp & DP_AUDIO_OUTPUT_ENABLE) | |
| 2215 | − pipe_config->has_audio = true; | |
| 2214 | + | |
| 2215 | + pipe_config->has_audio = tmp & DP_AUDIO_OUTPUT_ENABLE && port != PORT_A; | |
| 2216 | 2216 | |
| 2217 | 2217 | if ((port == PORT_A) || !HAS_PCH_CPT(dev)) { |
| 2218 | 2218 | if (tmp & DP_SYNC_HS_HIGH) |
| @@ -3812,7 +3812,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) · 1593 unmodified lines | ||
| 3812 | 3812 | if (val == 0) |
| 3813 | 3813 | break; |
| 3814 | 3814 | |
| 3815 | − intel_dp->sink_rates[i] = val * 200; | |
| 3815 | + /* Value read is in kHz while drm clock is saved in deca-kHz */ | |
| 3816 | + intel_dp->sink_rates[i] = (val * 200) / 10; | |
| 3816 | 3817 | } |
| 3817 | 3818 | intel_dp->num_sink_rates = i; |
| 3818 | 3819 | } |
| @@ -813,12 +813,28 @@ static int intel_dual_link_lvds_callback(const struct dmi_system_id *id) · 812 unmodified lines | ||
| 813 | 813 | static const struct dmi_system_id intel_dual_link_lvds[] = { |
| 814 | 814 | { |
| 815 | 815 | .callback = intel_dual_link_lvds_callback, |
| 816 | − .ident = "Apple MacBook Pro (Core i5/i7 Series)", | |
| 816 | + .ident = "Apple MacBook Pro 15\" (2010)", | |
| 817 | + .matches = { | |
| 818 | + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), | |
| 819 | + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"), | |
| 820 | + }, | |
| 821 | + }, | |
| 822 | + { | |
| 823 | + .callback = intel_dual_link_lvds_callback, | |
| 824 | + .ident = "Apple MacBook Pro 15\" (2011)", | |
| 817 | 825 | .matches = { |
| 818 | 826 | DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), |
| 819 | 827 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"), |
| 820 | 828 | }, |
| 821 | 829 | }, |
| 830 | + { | |
| 831 | + .callback = intel_dual_link_lvds_callback, | |
| 832 | + .ident = "Apple MacBook Pro 15\" (2012)", | |
| 833 | + .matches = { | |
| 834 | + DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), | |
| 835 | + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro9,1"), | |
| 836 | + }, | |
| 837 | + }, | |
| 822 | 838 | { } /* terminating entry */ |
| 823 | 839 | }; |
| 824 | 840 | |
| @@ -848,6 +864,11 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder) · 23 unmodified lines | ||
| 848 | 864 | if (i915.lvds_channel_mode > 0) |
| 849 | 865 | return i915.lvds_channel_mode == 2; |
| 850 | 866 | |
| 867 | + /* single channel LVDS is limited to 112 MHz */ | |
| 868 | + if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock | |
| 869 | + > 112999) | |
| 870 | + return true; | |
| 871 | + | |
| 851 | 872 | if (dmi_check_system(intel_dual_link_lvds)) |
| 852 | 873 | return true; |
| 853 | 874 | |
| @@ -1111,6 +1132,8 @@ void intel_lvds_init(struct drm_device *dev) · 257 unmodified lines | ||
| 1111 | 1132 | out: |
| 1112 | 1133 | mutex_unlock(&dev->mode_config.mutex); |
| 1113 | 1134 | |
| 1135 | + intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); | |
| 1136 | + | |
| 1114 | 1137 | lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder); |
| 1115 | 1138 | DRM_DEBUG_KMS("detected %s-link lvds configuration\n", |
| 1116 | 1139 | lvds_encoder->is_dual_link ? "dual" : "single"); |
| @@ -1125,7 +1148,6 @@ out: · 8 unmodified lines | ||
| 1125 | 1148 | } |
| 1126 | 1149 | drm_connector_register(connector); |
| 1127 | 1150 | |
| 1128 | − intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); | |
| 1129 | 1151 | intel_panel_setup_backlight(connector, INVALID_PIPE); |
| 1130 | 1152 | |
| 1131 | 1153 | return; |