Hi Linus,
Nothing too major, the radeon sanity checks and i915 fixes probably the most important.
Dave.
The following changes since commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d:
Linux 2.6.39-rc1 (2011-03-29 12:09:47 -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 (3): drm/radeon/kms: Add support for tv-out dongle on G5 9600 drm/radeon/kms: pageflipping cleanup for avivo+ drm/radeon/kms: add some new ontario pci ids
Ben Skeggs (1): drm: export drm_find_cea_extension to drivers
Chris Wilson (3): drm/i915/lvds: Always return connected in the absence of better information drm/i915: Busy-spin wait_for condition in atomic contexts drm/i915: Reset GMBUS controller after NAK
Dave Airlie (1): Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
Jan Engelhardt (1): drm: fix "persistant" typo
John Lindgren (1): drm/radeon/kms: add some sanity checks to obj info record parsingi (v2)
drivers/gpu/drm/drm_edid.c | 3 ++- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 25 +++++++++++++++++++++---- drivers/gpu/drm/i915/intel_lvds.c | 10 ++-------- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 20 ++++++++++++++++++++ drivers/gpu/drm/radeon/evergreen.c | 11 ----------- drivers/gpu/drm/radeon/radeon_atombios.c | 13 +++++++------ drivers/gpu/drm/radeon/radeon_combios.c | 13 +++++++++++++ drivers/gpu/drm/radeon/rs600.c | 11 ----------- drivers/gpu/drm/ttm/ttm_bo.c | 10 +++++----- drivers/gpu/drm/ttm/ttm_tt.c | 16 ++++++++-------- include/drm/drm_crtc.h | 1 + include/drm/drm_pciids.h | 2 ++ include/drm/ttm/ttm_bo_api.h | 18 +++++++++--------- include/drm/ttm/ttm_bo_driver.h | 4 ++-- 16 files changed, 94 insertions(+), 67 deletions(-)
On Tue, 5 Apr 2011 01:38:31 +0100 (IST), Dave Airlie airlied@linux.ie wrote:
drm/i915: Reset GMBUS controller after NAK
We've got a report of a regression from this patch and have a fix in review right now. Please don't merge this to master until that fix has been verified and added to this sequence.
On Mon, Apr 4, 2011 at 6:02 PM, Keith Packard keithp@keithp.com wrote:
On Tue, 5 Apr 2011 01:38:31 +0100 (IST), Dave Airlie airlied@linux.ie wrote:
drm/i915: Reset GMBUS controller after NAK
We've got a report of a regression from this patch and have a fix in review right now. Please don't merge this to master until that fix has been verified and added to this sequence.
Gaah. Too late. I had already pulled and pushed out.
I'm not doing an -rc2 until tomorrow, though, so hopefully the issue will be resolved and a fix pushed to me by then.
Linus
On Mon, 4 Apr 2011 18:09:55 -0700, Linus Torvalds torvalds@linux-foundation.org wrote:
I'm not doing an -rc2 until tomorrow, though, so hopefully the issue will be resolved and a fix pushed to me by then.
Should be resolved this evening; someone is trying to use an i2c address of 0xa0, which is obviously wrong, we're just trying to figure out where that code came from.
Hi Linus,
Nothing too major, the radeon sanity checks and i915 fixes probably the most important.
Oh in a shock to me the i915 fixes break VGA detect which is doing something really stdupid.
so please hold off on this until Chris/Keith can get the correct patch, and I'll send a new one.
Dave.
Dave.
The following changes since commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d:
Linux 2.6.39-rc1 (2011-03-29 12:09:47 -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 (3): drm/radeon/kms: Add support for tv-out dongle on G5 9600 drm/radeon/kms: pageflipping cleanup for avivo+ drm/radeon/kms: add some new ontario pci ids
Ben Skeggs (1): drm: export drm_find_cea_extension to drivers
Chris Wilson (3): drm/i915/lvds: Always return connected in the absence of better information drm/i915: Busy-spin wait_for condition in atomic contexts drm/i915: Reset GMBUS controller after NAK
Dave Airlie (1): Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
Jan Engelhardt (1): drm: fix "persistant" typo
John Lindgren (1): drm/radeon/kms: add some sanity checks to obj info record parsingi (v2)
drivers/gpu/drm/drm_edid.c | 3 ++- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 25 +++++++++++++++++++++---- drivers/gpu/drm/i915/intel_lvds.c | 10 ++-------- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/gpu/drm/radeon/atombios_crtc.c | 20 ++++++++++++++++++++ drivers/gpu/drm/radeon/evergreen.c | 11 ----------- drivers/gpu/drm/radeon/radeon_atombios.c | 13 +++++++------ drivers/gpu/drm/radeon/radeon_combios.c | 13 +++++++++++++ drivers/gpu/drm/radeon/rs600.c | 11 ----------- drivers/gpu/drm/ttm/ttm_bo.c | 10 +++++----- drivers/gpu/drm/ttm/ttm_tt.c | 16 ++++++++-------- include/drm/drm_crtc.h | 1 + include/drm/drm_pciids.h | 2 ++ include/drm/ttm/ttm_bo_api.h | 18 +++++++++--------- include/drm/ttm/ttm_bo_driver.h | 4 ++-- 16 files changed, 94 insertions(+), 67 deletions(-)
dri-devel@lists.freedesktop.org