From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PULL] drm-intel-fixes Date: Tue, 11 Jun 2013 10:32:36 +0200 Message-ID: <20130611083236.GS22870@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: Intel Graphics Development , DRI Development List-Id: dri-devel@lists.freedesktop.org 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 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=E4l=E4 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(-) -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch