diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-07 04:51:14 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-07 04:51:14 +0300 |
commit | a58997e1a6287068be2d923f5fde6102e7e08f56 (patch) | |
tree | aaf3eebfc2a62fdaf883e86a45809ede9754b4d4 /arch/sparc/include/asm/visasm.h | |
parent | ebc90be6b9ccbdaccd93feaabef78b1c92870be2 (diff) | |
parent | 595fd013f795daeed0c7ddda02d8e0c51d8ce76c (diff) | |
download | linux-a58997e1a6287068be2d923f5fde6102e7e08f56.tar.xz |
Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux
Pull amdgpu fixes from Alex Deucher:
"Just a few amdgpu fixes to make sure we report the proper firmware
information and number of render buffers to userspace and a typo in a
debugging function"
[ Pulling directly from Alex since Dave Airlie is on vacation - Linus ]
* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: set fw_version and feature_version for smu fw loading
drm/amdgpu: add feature version for SDMA ucode
drm/amdgpu: add feature version for RLC and MEC v2
drm/amdgpu: increment queue when iterating on this variable.
drm/amdgpu: fix rb setting for CZ
Diffstat (limited to 'arch/sparc/include/asm/visasm.h')
0 files changed, 0 insertions, 0 deletions