On Fri, Jan 11, 2013 at 10:19 PM, Marek Olšák <maraeo@xxxxxxxxx> wrote: > Probably not a candidate for stable kernels because of conflicts > in DRM versioning. > > Signed-off-by: Marek Olšák <maraeo@xxxxxxxxx> Added to my -fixes queue. Thanks, Alex > --- > drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- > drivers/gpu/drm/radeon/reg_srcs/rv515 | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index dff6cf7..d9bf96e 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -69,9 +69,10 @@ > * 2.26.0 - r600-eg: fix htile size computation > * 2.27.0 - r600-SI: Add CS ioctl support for async DMA > * 2.28.0 - r600-eg: Add MEM_WRITE packet support > + * 2.29.0 - R500 FP16 color clear registers > */ > #define KMS_DRIVER_MAJOR 2 > -#define KMS_DRIVER_MINOR 28 > +#define KMS_DRIVER_MINOR 29 > #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 911a8fb..78d5e99 100644 > --- a/drivers/gpu/drm/radeon/reg_srcs/rv515 > +++ b/drivers/gpu/drm/radeon/reg_srcs/rv515 > @@ -324,6 +324,8 @@ rv515 0x6d40 > 0x46AC US_OUT_FMT_2 > 0x46B0 US_OUT_FMT_3 > 0x46B4 US_W_FMT > +0x46C0 RB3D_COLOR_CLEAR_VALUE_AR > +0x46C4 RB3D_COLOR_CLEAR_VALUE_GB > 0x4BC0 FG_FOG_BLEND > 0x4BC4 FG_FOG_FACTOR > 0x4BC8 FG_FOG_COLOR_R > -- > 1.7.10.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
