diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-01-21 13:24:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-01-21 13:24:12 +1000 |
| commit | a3f5aed42f64878ad98006e27492255381bba061 (patch) | |
| tree | d9dbee246d96b003572eb011609cdf021cc4e0c4 /drivers/gpu/drm/radeon/radeon_drv.c | |
| parent | 7b4cf994e4c6ba48872bb25253cc393b7fb74c82 (diff) | |
| parent | 20707874fd4fd37e09513f508e642fa8bd06365a (diff) | |
| download | op-kernel-dev-a3f5aed42f64878ad98006e27492255381bba061.zip op-kernel-dev-a3f5aed42f64878ad98006e27492255381bba061.tar.gz | |
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next
A number of fixes, and one revert for a patch having some wierd side effects.
* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
Revert "drm/radeon: do not move bo to different placement at each cs"
drm/radeon: improve semaphore debugging on lockup
drm/radeon: allow FP16 color clear registers on r500
drm/radeon: clear reset flags if engines are idle
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |
