Hi Stephen & Dave,
indeed RADEON_INFO_VA_UNMAP_WORKING was added to 4.1 to indicate that a
certain kernel bug is fixed now and we can remove the user space workaround.
And RADEON_INFO_GPU_RESET_COUNTER was stashed to be merged in 4.2 as new
feature.
Annoying but harmless and Stephen's resolve of the conflict looks valid
to me.
Regards,
Christian.
On 21.06.2015 05:50, Stephen Rothwell wrote:
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).
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
