OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b404ae8
)
drm/amdgpu: export both supported and enabled ras features
author
xinhui pan
<xinhui.pan@amd.com>
Thu, 7 Mar 2019 06:01:11 +0000
(14:01 +0800)
committer
Alex Deucher
<alexander.deucher@amd.com>
Tue, 19 Mar 2019 20:36:51 +0000
(15:36 -0500)
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index
df40f35
..
2ab5b3c
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@
-922,11
+922,14
@@
static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
return copy_to_user(out, &ui32, min(size, 4u)) ? -EFAULT : 0;
case AMDGPU_INFO_RAS_ENABLED_FEATURES: {
struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
+ uint64_t ras_mask;
if (!ras)
return -EINVAL;
- return copy_to_user(out, &ras->features,
- min_t(u32, size, sizeof(ras->features))) ?
+ ras_mask = (uint64_t)ras->supported << 32 | ras->features;
+
+ return copy_to_user(out, &ras_mask,
+ min_t(u64, size, sizeof(ras_mask))) ?
-EFAULT : 0;
}
default: