[PATCH] drm/radeon/kms: allow r500 US_FORMAT regs in the CS checker

[Alex Deucher]

On Sat, Dec 18, 2010 at 5:41 AM, Marek Olšák <maraeo at gmail.com> wrote:
> And bump the DRM version to 2.8.0.
>
> The purpose of these regs is to work around a TX hw bug in R520.
>
> Signed-off-by: Marek Olšák <maraeo at gmail.com>

Acked-by: Alex Deucher <alexdeucher at gmail.com>

> ---
>  drivers/gpu/drm/radeon/radeon_drv.c   |    5 +++--
>  drivers/gpu/drm/radeon/reg_srcs/rv515 |   16 ++++++++++++++++
>  2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 88e4ea9..787ab5b 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -47,10 +47,11 @@
>  * - 2.4.0 - add crtc id query
>  * - 2.5.0 - add get accel 2 to work around ddx breakage for evergreen
>  * - 2.6.0 - add tiling config query (r6xx+), add initial HiZ support (r300->r500)
> - *   2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs
> + * - 2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs
> + * - 2.8.0 - add r500 US_FORMAT regs
>  */
>  #define KMS_DRIVER_MAJOR       2
> -#define KMS_DRIVER_MINOR       7
> +#define KMS_DRIVER_MINOR       8
>  #define KMS_DRIVER_PATCHLEVEL  0
>  int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
>  int radeon_driver_unload_kms(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/radeon/reg_srcs/rv515 b/drivers/gpu/drm/radeon/reg_srcs/rv515
> index b3f9f1d..ef422bb 100644
> --- a/drivers/gpu/drm/radeon/reg_srcs/rv515
> +++ b/drivers/gpu/drm/radeon/reg_srcs/rv515
> @@ -304,6 +304,22 @@ rv515 0x6d40
>  0x4630 US_CODE_ADDR
>  0x4634 US_CODE_RANGE
>  0x4638 US_CODE_OFFSET
> +0x4640 US_FORMAT0_0
> +0x4644 US_FORMAT0_1
> +0x4648 US_FORMAT0_2
> +0x464C US_FORMAT0_3
> +0x4650 US_FORMAT0_4
> +0x4654 US_FORMAT0_5
> +0x4658 US_FORMAT0_6
> +0x465C US_FORMAT0_7
> +0x4660 US_FORMAT0_8
> +0x4664 US_FORMAT0_9
> +0x4668 US_FORMAT0_10
> +0x466C US_FORMAT0_11
> +0x4670 US_FORMAT0_12
> +0x4674 US_FORMAT0_13
> +0x4678 US_FORMAT0_14
> +0x467C US_FORMAT0_15
>  0x46A4 US_OUT_FMT_0
>  0x46A8 US_OUT_FMT_1
>  0x46AC US_OUT_FMT_2
> --
> 1.7.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>