[git pull] drm-fixes

From: Dave Airlie
Date: Tue Oct 27 2009 - 21:33:17 EST



Hi Linus,

Please pull the 'drm-fixes' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

This is just 3 fast track fixes, one for the colormap issues with 1.7 and
2.9.0 intel driver (note final 1.7 + 2.9.1 is fine, and 1.6 is fine with
any Intel). The other is a mode validation fix, and the last one at least
lets davem load the kms radeon driver.

I have some radeon KMS fixes queued but will leave them until tomorrow
just in case.

Dave.

drivers/gpu/drm/drm_edid.c | 15 +++++++++++
drivers/gpu/drm/drm_fb_helper.c | 42 ++++++++++++++++++++++----------
drivers/gpu/drm/radeon/radeon_device.c | 7 ++---
3 files changed, 47 insertions(+), 17 deletions(-)

commit 77de0846aed9d7a1b0ea65090620900d66fb5cfb
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Fri Oct 23 18:49:03 2009 +1000

drm/kms: fix kms/fbdev colormap support properly.

This sets the fbcon to use TRUECOLOR by default, it then
only modifies the pseudo palette for fbcon, and only touches
the real palette when in 8-bit pseudo color mode.

Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

commit fcb45611448098a36b893bda71e72bd39730a3dd
Author: Zhao Yakui <yakui.zhao@xxxxxxxxx>
Date: Wed Oct 14 09:11:25 2009 +0800

drm: Add the basic check for the detailed timing in EDID

Sometimes we will get the incorrect display modeline when parsing the detailed
timing in EDID. For example:
>hsync/vsync width is zero
>sync is beyond the blank.

So add the basic check for the detailed timing in EDID to avoid the incorrect
display modeline.

Signed-off-by: Zhao Yakui <yakui.zhao@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

commit 93239ea158368016a017200cb133e1057fb3ef89
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Wed Oct 28 11:09:58 2009 +1000

drm/radeon/kms: ignore vga arbiter return.

Since we register all radeon devices, and the arbiter only cares about
VGA class ones, we will fail to startup on display controller class devices.
We don't gain anything by using the return value here.

this helps kms on sparc64 get started.

Reported-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/