[bk pull] drm tree update and bugfix..

[bk pull] drm tree update and bugfix..

[Dave Airlie]

Hi Linus,

There is an issue with the last merge and AGP in certain situations, this
merge fixes that, adds some missing macros and adds a new feature to the
r200 drm,

Please do a

	bk pull bk://drm.bkbits.net/drm-2.6

This will include the latest DRM changes and will update the following files:

 drivers/char/drm/drm_agpsupport.h |    2 --
 drivers/char/drm/r128_state.c     |    8 ++++----
 drivers/char/drm/radeon.h         |    4 +++-
 drivers/char/drm/radeon_drm.h     |    3 ++-
 drivers/char/drm/radeon_drv.h     |    1 +
 drivers/char/drm/radeon_mem.c     |    4 ++--
 drivers/char/drm/radeon_state.c   |    2 ++
 7 files changed, 14 insertions(+), 10 deletions(-)

through these ChangeSets:

<airlied@starflyer.(none)> (04/06/06 1.1608.1.13)
   Remove check that is needed only for 2.4 kernel fixes bug reports on lk.

   Signed-off-by: Colin Leroy <colin@colino.net>
   Signed-off-by: Dave Airlie <airlied@linux.ie>

<airlied@starflyer.(none)> (04/06/01 1.1608.1.12)
   add R200_EMIT_RB3D_BLENDCOLOR state packet to support GL_EXT_blend_color, GL_EXT_blend_func_separate and GL_EXT_blend_equation_separate on r200
   from Roland Scheidegger

   Signed-off-by: Dave Airlie <airlied@linux.ie>

<airlied@starflyer.(none)> (04/06/01 1.1608.1.11)
   fix missing DRM_ERR()s - Eric Anholt

   Signed-off-by: Dave Airlie <airlied@linux.ie>