diff options
author | Dave Airlie <airlied@redhat.com> | 2013-02-19 20:40:49 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-02-19 20:41:26 -0500 |
commit | b81e059ec5a7128622ab5d74d78e9b4f361b54ae (patch) | |
tree | 65344a0adc351fd0a14a14d9fa50e93b69a5bb6e /drivers/gpu/drm/i915/intel_dp.c | |
parent | 35f8badc1cf652381fa3f82c1fbea39f4dbe87fd (diff) | |
parent | 210561ffd72d00eccf12c0131b8024d5436bae95 (diff) |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
So here's my promised pile of fixes for 3.9. I've dropped the core prep
patches for vt-switchless suspend/resume as discussed on irc. Highlights:
- Fix dmar on g4x. Not really gfx related, but I'm fed up with getting
blamed for dmar crapouts.
- Disable wc ptes updates on ilk when dmar is enabled (Chris). So again,
dmar, but this time gfx related :(
- Reduced range support for hsw, using the pipe CSC (Ville).
- Fixup pll limits for gen3/4 (Patrick Jakobsson). The sdvo patch is
already confirmed to fix 2 bug reports, so added cc: stable on that one.
- Regression fix for 8bit fb console (Ville).
- Preserve lane reversal bits on DDI/FDI ports (Damien).
- Page flip vs. gpu hang fixes (Ville). Unfortuntely not quite all of
them, need to decide what to do with the currently still in-flight ones.
- Panel fitter regression fix from Mika Kuoppala (was accidentally left on
on some pipes with the new modset code since 3.7). This also improves
the modeset sequence and might help a few other unrelated issues with
lvds.
- Write backlight regs even harder ... another installement in our eternal
fight against the BIOS and backlights.
- Fixup lid notifier vs. suspend/resume races (Zhang Rui). Prep work for
new ACPI stuff, but closing the race itself seems worthwile on its own.
- A few other small fixes and tiny cleanups all over.
Lots of the patches are cc: stable since I've stalled on a few
not-so-important fixes for 3.8 due to the grumpy noise Linus made.
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (33 commits)
intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets
drm/i915: Disable WC PTE updates to w/a buggy IOMMU on ILK
drm/i915: Implement pipe CSC based limited range RGB output
drm/i915: inverted brightness quirk for Acer Aspire 4736Z
drm/i915: Print the hw context status is debugfs
drm/i915: Use HAS_L3_GPU_CACHE in i915_gem_l3_remap
drm/i915: Fix PIPE_CONTROL DW/QW write through global GTT on IVB+
drm/i915: Set i9xx sdvo clock limits according to specifications
drm/i915: Set i9xx lvds clock limits according to specifications
drm/i915: Preserve the DDI link reversal configuration
drm/i915: Preserve the FDI line reversal override bit on CPT
drm/i915: add missing \n to UTS_RELEASE in the error_state
drm: Use C8 instead of RGB332 when determining the format from depth/bpp
drm: Fill depth/bits_per_pixel for C8 format
drm/i915: don't clflush gem objects in stolen memory
drm/i915: Don't wait for page flips if there was GPU reset
drm/i915: Kill obj->pending_flip
drm/i915: Fix a typo in a intel_modeset_stage_output_state() comment
drm/i915: remove bogus mutex_unlock from error-path
drm/i915: Print the pipe control page GTT address
...
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 13c1536a8bb2..31c0205685ab 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -2302,13 +2302,13 @@ g4x_dp_detect(struct intel_dp *intel_dp) | |||
2302 | 2302 | ||
2303 | switch (intel_dig_port->port) { | 2303 | switch (intel_dig_port->port) { |
2304 | case PORT_B: | 2304 | case PORT_B: |
2305 | bit = DPB_HOTPLUG_LIVE_STATUS; | 2305 | bit = PORTB_HOTPLUG_LIVE_STATUS; |
2306 | break; | 2306 | break; |
2307 | case PORT_C: | 2307 | case PORT_C: |
2308 | bit = DPC_HOTPLUG_LIVE_STATUS; | 2308 | bit = PORTC_HOTPLUG_LIVE_STATUS; |
2309 | break; | 2309 | break; |
2310 | case PORT_D: | 2310 | case PORT_D: |
2311 | bit = DPD_HOTPLUG_LIVE_STATUS; | 2311 | bit = PORTD_HOTPLUG_LIVE_STATUS; |
2312 | break; | 2312 | break; |
2313 | default: | 2313 | default: |
2314 | return connector_status_unknown; | 2314 | return connector_status_unknown; |
@@ -2837,15 +2837,15 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, | |||
2837 | name = "DPDDC-A"; | 2837 | name = "DPDDC-A"; |
2838 | break; | 2838 | break; |
2839 | case PORT_B: | 2839 | case PORT_B: |
2840 | dev_priv->hotplug_supported_mask |= DPB_HOTPLUG_INT_STATUS; | 2840 | dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS; |
2841 | name = "DPDDC-B"; | 2841 | name = "DPDDC-B"; |
2842 | break; | 2842 | break; |
2843 | case PORT_C: | 2843 | case PORT_C: |
2844 | dev_priv->hotplug_supported_mask |= DPC_HOTPLUG_INT_STATUS; | 2844 | dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS; |
2845 | name = "DPDDC-C"; | 2845 | name = "DPDDC-C"; |
2846 | break; | 2846 | break; |
2847 | case PORT_D: | 2847 | case PORT_D: |
2848 | dev_priv->hotplug_supported_mask |= DPD_HOTPLUG_INT_STATUS; | 2848 | dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS; |
2849 | name = "DPDDC-D"; | 2849 | name = "DPDDC-D"; |
2850 | break; | 2850 | break; |
2851 | default: | 2851 | default: |