Skip to contentSkip to conversation

drm-intel-fixes

GIT PULL Daniel Vetter 1 participant 1 message Jun 11, 2013

lore
Share & tools
lore
#0 lore raw

Hi Dave,

Just tiny regression fixes here:
- Two fixes to fix sdvo hotplug which broke in the hpd storm detection work.
- One fix to patch-up the sdvo lvds regression fixer from the last pull - we need to prefer the vbt mode over edid modes.

IMPORTANT:

The sdvo lvds fix in this -fixes pull

commit c3456fb3e4712d0448592af3c5d644c9472cd3c1

Author: Daniel Vetter <[email protected]>
Date:   Mon Jun 10 09:47:58 2013 +0200

drm/i915: prefer VBT modes for SVDO-LVDS over EDID

has a silent functional conflict with

commit 990256aec2f10800595dddf4d1c3441fcd6b2616

Author: Ville Syrjälä <[email protected]>
Date:   Fri May 31 12:17:07 2013 +0000

drm: Add probed modes in probe order

in drm-next. Please poke me when you do a backmerge so that I can supply the fixup (we simply need to add the vbt modes before edid modes, i.e. the other way round than now).

Cheers, Daniel

The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:

Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-fixes-2013-06-11

for you to fetch changes up to c3456fb3e4712d0448592af3c5d644c9472cd3c1:

drm/i915: prefer VBT modes for SVDO-LVDS over EDID (2013-06-10 10:13:34 +0200)

----------------------------------------------------------------
Chris Wilson (2):
drm/i915: Fix hotplug interrupt enabling for SDVOC drm/i915: Enable hotplug interrupts after querying hw capabilities.

Daniel Vetter (1):
drm/i915: prefer VBT modes for SVDO-LVDS over EDID

 drivers/gpu/drm/i915/intel_sdvo.c |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch