[<prev] [next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1104280523220.5457@skynet.skynet.ie>
Date:	Thu, 28 Apr 2011 05:25:30 +0100 (IST)
From:	Dave Airlie <airlied@...ux.ie>
To:	torvalds@...ux-foundation.org
cc:	DRI mailing list <dri-devel@...ts.freedesktop.org>,
	linux-kernel@...r.kernel.org
Subject: [git pull] drm fixes
Nothing major, everyone must be on Easter holidays, the i915 one is 
actually a fix for dual-gpu laptops where i915 caused radeon to do 
something bad, the Kconfig one is because I see distros don't enable this 
and its really needed for dual-gpu functionality to work at all.
Otherwise, just a couple of minor updates from Alex.
Dave.
The following changes since commit 8e10cd74342c7f5ce259cceca36f6eba084f5d58:
  Linux 2.6.39-rc5 (2011-04-26 20:48:50 -0700)
are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
Alex Deucher (2):
      drm/radeon/kms: add missing safe regs for 6xx/7xx
      drm/radeon/kms: add info query for tile pipes
Dave Airlie (2):
      drm: select FRAMEBUFFER_CONSOLE_PRIMARY if we have FRAMEBUFFER_CONSOLE
      drm/i915: restore only the mode of this driver on lastclose (v2)
 drivers/gpu/drm/Kconfig              |    1 +
 drivers/gpu/drm/drm_fb_helper.c      |   27 ++++++++++++++++++++-------
 drivers/gpu/drm/i915/i915_dma.c      |    2 +-
 drivers/gpu/drm/i915/intel_drv.h     |    1 +
 drivers/gpu/drm/i915/intel_fb.c      |   10 ++++++++++
 drivers/gpu/drm/radeon/radeon_kms.c  |   13 +++++++++++++
 drivers/gpu/drm/radeon/reg_srcs/r600 |    1 +
 include/drm/drm_fb_helper.h          |    1 +
 include/drm/radeon_drm.h             |    1 +
 9 files changed, 49 insertions(+), 8 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
