aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/radeon/drm
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2019-11-14 17:49:51 -0500
committerMarek Olšák <[email protected]>2019-11-19 18:31:53 -0500
commite7fb9c73a73b94d92f308c45a87772bb62ae5c9c (patch)
treeaa851757600578aa5fcc1791bf605b98e962e32a /src/gallium/winsys/radeon/drm
parente9cc4f670f7faf4e95933fe670b3bd13a6efa887 (diff)
ac: fill num_rings for remaining IPs
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Diffstat (limited to 'src/gallium/winsys/radeon/drm')
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm_winsys.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index 0177fe110c2..0a4da02262e 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -303,6 +303,7 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
ws->info.has_dedicated_vram = true;
}
+ ws->info.num_rings[RING_GFX] = 1;
/* Check for dma */
ws->info.num_rings[RING_DMA] = 0;
/* DMA is disabled on R700. There is IB corruption and hangs. */
@@ -316,16 +317,20 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
if (ws->info.drm_minor >= 32) {
uint32_t value = RADEON_CS_RING_UVD;
if (radeon_get_drm_value(ws->fd, RADEON_INFO_RING_WORKING,
- "UVD Ring working", &value))
+ "UVD Ring working", &value)) {
ws->info.has_hw_decode = value;
+ ws->info.num_rings[RING_UVD] = 1;
+ }
value = RADEON_CS_RING_VCE;
if (radeon_get_drm_value(ws->fd, RADEON_INFO_RING_WORKING,
NULL, &value) && value) {
if (radeon_get_drm_value(ws->fd, RADEON_INFO_VCE_FW_VERSION,
- "VCE FW version", &value))
+ "VCE FW version", &value)) {
ws->info.vce_fw_version = value;
+ ws->info.num_rings[RING_VCE] = 1;
+ }
}
}