[git pull] drm fixes for 2.6.22-rc4

From: Dave Airlie
Date: Mon Jun 11 2007 - 19:14:55 EST

Hi Linus,

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

It contains a fix for a radeon 32/64-bit issue along with
hw support for some new Intel hw. Sorry for the lateness but I rely
on AGP PCI IDS being in the tree before DRM ids become useful.


drivers/char/drm/drm_pciids.h | 5 ++
drivers/char/drm/i915_dma.c | 90 +++++++++++++++++++++++++++++++--------
drivers/char/drm/i915_drm.h | 5 ++
drivers/char/drm/i915_drv.h | 2 +
drivers/char/drm/radeon_ioc32.c | 26 +++++++++++
5 files changed, 110 insertions(+), 18 deletions(-)

commit 9b01bd5b284bbf519b726b39f1352023cb5e9e69
Author: Dave Airlie <airlied@xxxxxxxx>
Date: Sun Jun 10 16:00:27 2007 +1000

drm: fix radeon setparam on 32/64 bit systems.

The alignment on 64-bit is different for 64-bit values.

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

commit dc7a93190c21edbf3ed23e678ad04f852b9cff28
Author: Wang Zhenyu <zhenyu.z.wang@xxxxxxxxx>
Date: Sun Jun 10 15:58:19 2007 +1000

drm/i915: Add support for the G33, Q33, and Q35 chipsets.

These require that the status page be referenced by a pointer in GTT, rather
than phsyical memory. So, we have the X Server allocate that memory and tell
us the address, instead.

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

commit 2f4042b186b9bfe82f48fe801619c6c285c16bef
Author: Wang Zhenyu <zhenyu.z.wang@xxxxxxxxx>
Date: Fri Jun 1 22:03:44 2007 +1000

i915: add new pciids for 945GME, 965GME/GLE

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

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/