From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [pull] drm-intel-fixes Date: Mon, 17 Sep 2012 21:02:46 +0200 Message-ID: <20120917190246.GC5522@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 4589F9E9C4 for ; Mon, 17 Sep 2012 12:02:11 -0700 (PDT) Received: by bkcji2 with SMTP id ji2so2793166bkc.36 for ; Mon, 17 Sep 2012 12:02:10 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: Intel Graphics Development , DRI Development List-Id: dri-devel@lists.freedesktop.org Hi Dave, Essentially just flush my -fixes queue before I head off to xdc. - gen2 regression fixer, we've enabled the lvds stuff too late. Not causing any known issues, but this restores the sequence before a refactor that landed in 3.5, and lvds is a fickle beast. And seriously, who runs gen2 still ... - downgrade a BUG to a WARN - we haven't root-caused/fixed the underlying issue yet, but this should help bug reporters quite a bit. - properly disable hdmi audio - we've lost track of this, which resulted in the alsa driver again losing track of the unplug event. All patches cc: stable. Cheers, Daniel The following changes since commit 5698bd757d55b1bb87edd1a9744ab09c142abfc2: Linux 3.6-rc6 (2012-09-16 14:58:51 -0700) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel drm-intel-fixes for you to fetch changes up to b98b60167279df3acac9422c3c9820d9ebbcf9fb: drm/i915: HDMI - Clear Audio Enable bit for Hot Plug (2012-09-17 10:13:02 +0200) ---------------------------------------------------------------- Chris Wilson (1): drm/i915: Reduce a pin-leak BUG into a WARN Daniel Vetter (1): drm/i915: enable lvds pin pairs before dpll on gen2 Wang Xingchao (1): drm/i915: HDMI - Clear Audio Enable bit for Hot Plug drivers/gpu/drm/i915/i915_gem.c | 3 ++- drivers/gpu/drm/i915/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/intel_hdmi.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch