diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-11 05:55:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-11 05:55:53 -0400 |
commit | 9d17601c4e132eee9fe450191f6866fb9fb5a762 (patch) | |
tree | f4bdfbc95a28370ad0bf9f0d0f42a821f5a8ec9d /drivers/char/drm/radeon_drv.h | |
parent | 70dfcfea4b728ab26af1a3e0f331cc63a7e3554b (diff) |
drm: update radeon driver to 1.18
Add support for GL_ATI_fragment_shader, new packets R200_EMIT_PP_AFS_0/1,
R200_EMIT_PP_TXCTLALL_0-5 (replaces R200_EMIT_PP_TXFILTER_0-5, 2 more regs)
and R200_EMIT_ATF_TFACTOR (replaces R200_EMIT_TFACTOR_0 (8 consts instead of 6)
From: Roland Scheidegger, David Airlie
Signed-off-by: David Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
-rw-r--r-- | drivers/char/drm/radeon_drv.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index f12a963ede18..430598e1fa67 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | #define DRIVER_NAME "radeon" | 39 | #define DRIVER_NAME "radeon" |
40 | #define DRIVER_DESC "ATI Radeon" | 40 | #define DRIVER_DESC "ATI Radeon" |
41 | #define DRIVER_DATE "20050311" | 41 | #define DRIVER_DATE "20050720" |
42 | 42 | ||
43 | /* Interface history: | 43 | /* Interface history: |
44 | * | 44 | * |
@@ -83,9 +83,13 @@ | |||
83 | * 1.16- Add R200_EMIT_PP_TRI_PERF_CNTL packet to support brilinear | 83 | * 1.16- Add R200_EMIT_PP_TRI_PERF_CNTL packet to support brilinear |
84 | * texture filtering on r200 | 84 | * texture filtering on r200 |
85 | * 1.17- Add initial support for R300 (3D). | 85 | * 1.17- Add initial support for R300 (3D). |
86 | * 1.18- Add support for GL_ATI_fragment_shader, new packets | ||
87 | * R200_EMIT_PP_AFS_0/1, R200_EMIT_PP_TXCTLALL_0-5 (replaces | ||
88 | * R200_EMIT_PP_TXFILTER_0-5, 2 more regs) and R200_EMIT_ATF_TFACTOR | ||
89 | * (replaces R200_EMIT_TFACTOR_0 (8 consts instead of 6) | ||
86 | */ | 90 | */ |
87 | #define DRIVER_MAJOR 1 | 91 | #define DRIVER_MAJOR 1 |
88 | #define DRIVER_MINOR 17 | 92 | #define DRIVER_MINOR 18 |
89 | #define DRIVER_PATCHLEVEL 0 | 93 | #define DRIVER_PATCHLEVEL 0 |
90 | 94 | ||
91 | #define GET_RING_HEAD(dev_priv) DRM_READ32( (dev_priv)->ring_rptr, 0 ) | 95 | #define GET_RING_HEAD(dev_priv) DRM_READ32( (dev_priv)->ring_rptr, 0 ) |
@@ -857,6 +861,9 @@ extern int r300_do_cp_cmdbuf(drm_device_t* dev, DRMFILE filp, | |||
857 | 861 | ||
858 | #define R200_PP_TRI_PERF 0x2cf8 | 862 | #define R200_PP_TRI_PERF 0x2cf8 |
859 | 863 | ||
864 | #define R200_PP_AFS_0 0x2f80 | ||
865 | #define R200_PP_AFS_1 0x2f00 /* same as txcblend_0 */ | ||
866 | |||
860 | /* Constants */ | 867 | /* Constants */ |
861 | #define RADEON_MAX_USEC_TIMEOUT 100000 /* 100 ms */ | 868 | #define RADEON_MAX_USEC_TIMEOUT 100000 /* 100 ms */ |
862 | 869 | ||