projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/amdgpu: move UVD/VCE and VCN structure out from union
[platform/kernel/linux-rpi.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu.h
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index
12e71bb
..
87801fa
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@
-76,7
+76,7
@@
extern int amdgpu_modeset;
extern int amdgpu_vram_limit;
extern int amdgpu_vis_vram_limit;
extern int amdgpu_modeset;
extern int amdgpu_vram_limit;
extern int amdgpu_vis_vram_limit;
-extern
unsigned
amdgpu_gart_size;
+extern
int
amdgpu_gart_size;
extern int amdgpu_gtt_size;
extern int amdgpu_moverate;
extern int amdgpu_benchmarking;
extern int amdgpu_gtt_size;
extern int amdgpu_moverate;
extern int amdgpu_benchmarking;
@@
-1536,18
+1536,14
@@
struct amdgpu_device {
/* sdma */
struct amdgpu_sdma sdma;
/* sdma */
struct amdgpu_sdma sdma;
- union {
- struct {
- /* uvd */
- struct amdgpu_uvd uvd;
+ /* uvd */
+ struct amdgpu_uvd uvd;
- /* vce */
- struct amdgpu_vce vce;
- };
+ /* vce */
+ struct amdgpu_vce vce;
- /* vcn */
- struct amdgpu_vcn vcn;
- };
+ /* vcn */
+ struct amdgpu_vcn vcn;
/* firmwares */
struct amdgpu_firmware firmware;
/* firmwares */
struct amdgpu_firmware firmware;