OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[uclinux-h8/linux.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_kms.c
diff --git
a/drivers/gpu/drm/radeon/radeon_kms.c
b/drivers/gpu/drm/radeon/radeon_kms.c
index
b0acf50
..
4a119c2
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_kms.c
+++ b/
drivers/gpu/drm/radeon/radeon_kms.c
@@
-579,6
+579,9
@@
static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
case RADEON_INFO_VA_UNMAP_WORKING:
*value = true;
break;
+ case RADEON_INFO_GPU_RESET_COUNTER:
+ *value = atomic_read(&rdev->gpu_reset_counter);
+ break;
default:
DRM_DEBUG_KMS("Invalid request %d\n", info->request);
return -EINVAL;