<div class="gmail_quote">On Tue, Apr 9, 2013 at 8:44 AM, Christian König <span dir="ltr"><<a href="mailto:deathsimple@vodafone.de" target="_blank">deathsimple@vodafone.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Christian König <<a href="mailto:christian.koenig@amd.com">christian.koenig@amd.com</a>><br>
<br>
Add new ioctl option and bumb minor version number.<br></blockquote><div><br>I already have the tiling patch that bump the version, but i think it's just a matter for Alex.<br><br>Reviewed-by: Jerome Glisse <<a href="mailto:jglisse@redhat.com">jglisse@redhat.com</a>><br>
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Signed-off-by: Christian König <<a href="mailto:christian.koenig@amd.com">christian.koenig@amd.com</a>><br>
---<br>
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-<br>
drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++++++++++++<br>
include/uapi/drm/radeon_drm.h | 2 ++<br>
3 files changed, 20 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c<br>
index 66a7f0f..31b193b 100644<br>
--- a/drivers/gpu/drm/radeon/radeon_drv.c<br>
+++ b/drivers/gpu/drm/radeon/radeon_drv.c<br>
@@ -73,7 +73,7 @@<br>
* 2.30.0 - fix for FMASK texturing<br>
*/<br>
#define KMS_DRIVER_MAJOR 2<br>
-#define KMS_DRIVER_MINOR 30<br>
+#define KMS_DRIVER_MINOR 31<br>
#define KMS_DRIVER_PATCHLEVEL 0<br>
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);<br>
int radeon_driver_unload_kms(struct drm_device *dev);<br>
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c<br>
index 3019759..8cb9d12 100644<br>
--- a/drivers/gpu/drm/radeon/radeon_kms.c<br>
+++ b/drivers/gpu/drm/radeon/radeon_kms.c<br>
@@ -376,6 +376,23 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)<br>
else<br>
return -EINVAL;<br>
break;<br>
+ case RADEON_INFO_RING_WORKING:<br>
+ switch (value) {<br>
+ case RADEON_CS_RING_GFX:<br>
+ case RADEON_CS_RING_COMPUTE:<br>
+ value = rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready;<br>
+ break;<br>
+ case RADEON_CS_RING_DMA:<br>
+ value = rdev->ring[R600_RING_TYPE_DMA_INDEX].ready;<br>
+ value |= rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready;<br>
+ break;<br>
+ case RADEON_CS_RING_UVD:<br>
+ value = rdev->ring[R600_RING_TYPE_UVD_INDEX].ready;<br>
+ break;<br>
+ default:<br>
+ return -EINVAL;<br>
+ }<br>
+ break;<br>
default:<br>
DRM_DEBUG_KMS("Invalid request %d\n", info->request);<br>
return -EINVAL;<br>
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h<br>
index cd085d1..8459415 100644<br>
--- a/include/uapi/drm/radeon_drm.h<br>
+++ b/include/uapi/drm/radeon_drm.h<br>
@@ -973,6 +973,8 @@ struct drm_radeon_cs {<br>
#define RADEON_INFO_MAX_SE 0x12<br>
/* max SH per SE */<br>
#define RADEON_INFO_MAX_SH_PER_SE 0x13<br>
+/* query if a RADEON_CS_RING_* submission is supported */<br>
+#define RADEON_INFO_RING_WORKING 0x14<br>
<br>
struct drm_radeon_info {<br>
uint32_t request;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.5<br>
<br>
_______________________________________________<br>
dri-devel mailing list<br>
<a href="mailto:dri-devel@lists.freedesktop.org">dri-devel@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/dri-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/dri-devel</a><br>
</font></span></blockquote></div><br>