diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 | 
1 files changed, 7 insertions, 11 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 5afaf6016b4a..0b14b5373783 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -717,7 +717,7 @@ int amdgpu_queue_mgr_fini(struct amdgpu_device *adev,  			  struct amdgpu_queue_mgr *mgr);  int amdgpu_queue_mgr_map(struct amdgpu_device *adev,  			 struct amdgpu_queue_mgr *mgr, -			 int hw_ip, int instance, int ring, +			 u32 hw_ip, u32 instance, u32 ring,  			 struct amdgpu_ring **out_ring);  /* @@ -1572,18 +1572,14 @@ struct amdgpu_device {  	/* 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; | 

