diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-03-10 11:07:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-10 11:07:34 +1000 |
| commit | 9813527abc558415dbe4dc0bb5bfbd12aab2c457 (patch) | |
| tree | 873854dc54932c6b2633eaf4272386596eacacbb /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | Merge tag 'drm-intel-fixes-2017-03-09' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes (diff) | |
| parent | drm/amdgpu: bump driver version for some new features (diff) | |
| download | linux-dev-9813527abc558415dbe4dc0bb5bfbd12aab2c457.tar.xz linux-dev-9813527abc558415dbe4dc0bb5bfbd12aab2c457.zip | |
Merge branch 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
* 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: bump driver version for some new features
drm/amdgpu: validate paramaters in the gem ioctl
drm/amd/amdgpu: fix console deadlock if late init failed
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 75fc376ba735..f7adbace428a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -59,9 +59,10 @@ * - 3.7.0 - Add support for VCE clock list packet * - 3.8.0 - Add support raster config init in the kernel * - 3.9.0 - Add support for memory query info about VRAM and GTT. + * - 3.10.0 - Add support for new fences ioctl, new gem ioctl flags */ #define KMS_DRIVER_MAJOR 3 -#define KMS_DRIVER_MINOR 9 +#define KMS_DRIVER_MINOR 10 #define KMS_DRIVER_PATCHLEVEL 0 int amdgpu_vram_limit = 0; |