Messages in this thread | | | Date | Sun, 21 Jun 2015 13:50:51 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm tree with Linus' tree |
| |
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/radeon/radeon_kms.c include/uapi/drm/radeon_drm.h
between commit:
3bc980bf19bb ("drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query")
from Linus' tree and commit:
72b9076b2887 ("drm/radeon: add a GPU reset counter queryable by userspace")
from the drm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/radeon/radeon_kms.c index b0acf50d9558,9632e886ddc3..000000000000 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@@ -576,8 -576,8 +576,10 @@@ static int radeon_info_ioctl(struct drm if (radeon_get_allowed_info_register(rdev, *value, value)) return -EINVAL; break; + case RADEON_INFO_VA_UNMAP_WORKING: + *value = true; + case RADEON_INFO_GPU_RESET_COUNTER: + *value = atomic_read(&rdev->gpu_reset_counter); break; default: DRM_DEBUG_KMS("Invalid request %d\n", info->request); diff --cc include/uapi/drm/radeon_drm.h index 94d44ab2fda1,573cb86a3d6e..000000000000 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@@ -1038,7 -1038,7 +1038,8 @@@ struct drm_radeon_cs #define RADEON_INFO_CURRENT_GPU_SCLK 0x22 #define RADEON_INFO_CURRENT_GPU_MCLK 0x23 #define RADEON_INFO_READ_REG 0x24 -#define RADEON_INFO_GPU_RESET_COUNTER 0x25 +#define RADEON_INFO_VA_UNMAP_WORKING 0x25 ++#define RADEON_INFO_GPU_RESET_COUNTER 0x26 struct drm_radeon_info { uint32_t request; [unhandled content-type:application/pgp-signature] | |