linux.git/drivers/char, branch v2.6.26-rc7

Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2008-06-20T19:38:18+00:00

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (21 commits)
  drm: only trust core drm ioctls - driver ioctls are a mess.
  drm/i915: add support for Intel series 4 chipsets.
  drm/radeon: add hier-z registers for r300 and r500 chipsets
  drm/radeon: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT
  drm/radeon: switch IGP gart to use radeon_write_agp_base()
  drm/radeon: Restore sw interrupt on resume
  drm/r500: add support for AGP based cards.
  drm/radeon: fix texture uploads with large 3d textures (bug 13980)
  drm/radeon: add initial r500 support.
  drm/radeon: init pipe setup in kernel code.
  drm/radeon: fixup radeon_do_engine_reset
  drm/radeon: fix pixcache and purge/cache flushing registers
  drm/radeon: write AGP_BASE_2 on chips that support it.
  drm/radeon: merge IGP chip setup and fixup RS400 vs RS480 support
  drm/radeon: IGP clean up register and magic numbers.
  drm/rs690: set base 2 to 0.
  drm/rs690: set all of gart base address.
  radeon: add production microcode from AMD
  drm: pcigart use proper pci map interfaces.
  drm: the sg alloc ioctl should write back the handle to userspace
  ...

drm: only trust core drm ioctls - driver ioctls are a mess.

2008-06-20T05:42:38+00:00

So driver ioctls need a full auditing before we can make this change.

Signed-off-by: Dave Airlie

drm/i915: add support for Intel series 4 chipsets.

2008-06-20T02:12:56+00:00

Signed-off-by: Zhenyu Wang 
Signed-off-by: Dave Airlie

[agp]: fixup chipset flush for new Intel G4x.

2008-06-20T01:48:06+00:00

Signed-off-by: Zhenyu Wang 
Signed-off-by: Dave Airlie

agp: brown paper bag patch - put back the two lines it took out.

2008-06-19T04:57:31+00:00

no more whitespace diffs for me.

Signed-off-by: Dave Airlie

agp/intel: cleanup some serious whitespace badness

2008-06-19T04:27:53+00:00

Signed-off-by: Dave Airlie

[AGP] intel_agp: Add support for Intel 4 series chipsets

2008-06-19T04:17:58+00:00

Signed-off-by: Zhenyu Wang 
Signed-off-by: Dave Airlie

[AGP] intel_agp: extra stolen mem size available for IGD_GM chipset

2008-06-19T04:00:37+00:00

This adds missing stolen memory size detect for IGD_GM, be sure to
detect right size as current X intel driver (2.3.2) which has already
worked out.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Dave Airlie

drm/radeon: add hier-z registers for r300 and r500 chipsets

2008-06-19T03:01:58+00:00

drm/radeon: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT

2008-06-19T02:39:23+00:00

According to the hw guys, you should use DSTCACHE_CTLSTAT to flush
the 2D dst cache rather than RB2D_DSTCACHE_CTLSTAT.

Signed-off-by: Dave Airlie