Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_kms.c
diff --git
a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index
e23843f
..
a5c8240
100644
(file)
--- a/
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@
-227,7
+227,7
@@
static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
type = AMD_IP_BLOCK_TYPE_UVD;
ring_mask = adev->uvd.ring.ready ? 1 : 0;
ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
type = AMD_IP_BLOCK_TYPE_UVD;
ring_mask = adev->uvd.ring.ready ? 1 : 0;
ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
- ib_size_alignment =
8
;
+ ib_size_alignment =
16
;
break;
case AMDGPU_HW_IP_VCE:
type = AMD_IP_BLOCK_TYPE_VCE;
break;
case AMDGPU_HW_IP_VCE:
type = AMD_IP_BLOCK_TYPE_VCE;
@@
-303,7
+303,7
@@
static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
fw_info.feature = adev->vce.fb_version;
break;
case AMDGPU_INFO_FW_UVD:
fw_info.feature = adev->vce.fb_version;
break;
case AMDGPU_INFO_FW_UVD:
- fw_info.ver =
0
;
+ fw_info.ver =
adev->uvd.fw_version
;
fw_info.feature = 0;
break;
case AMDGPU_INFO_FW_GMC:
fw_info.feature = 0;
break;
case AMDGPU_INFO_FW_GMC: