gallium/radeon: print all members of radeon_info with R600_DEBUG=info

also set max_alignment on amdgpu.

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 1342092fec5b992b71d6c6d14455eca521f0ef34..2acef6a93c662819eabc3adbf9b574879d0bdbc5 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -1412,28 +1412,39 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
        (void) mtx_init(&rscreen->gpu_load_mutex, mtx_plain);
 
        if (rscreen->debug_flags & DBG_INFO) {
+               printf("pci (domain:bus:dev.func): %04x:%02x:%02x.%x\n",
+                      rscreen->info.pci_domain, rscreen->info.pci_bus,
+                      rscreen->info.pci_dev, rscreen->info.pci_func);
                printf("pci_id = 0x%x\n", rscreen->info.pci_id);
                printf("family = %i (%s)\n", rscreen->info.family,
                       r600_get_family_name(rscreen));
                printf("chip_class = %i\n", rscreen->info.chip_class);
+               printf("pte_fragment_size = %u\n", rscreen->info.pte_fragment_size);
+               printf("gart_page_size = %u\n", rscreen->info.gart_page_size);
                printf("gart_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.gart_size, 1024*1024));
                printf("vram_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.vram_size, 1024*1024));
                printf("vram_vis_size = %i MB\n", (int)DIV_ROUND_UP(rscreen->info.vram_vis_size, 1024*1024));
                printf("max_alloc_size = %i MB\n",
                       (int)DIV_ROUND_UP(rscreen->info.max_alloc_size, 1024*1024));
+               printf("min_alloc_size = %u\n", rscreen->info.min_alloc_size);
+               printf("has_dedicated_vram = %u\n", rscreen->info.has_dedicated_vram);
                printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory);
                printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2);
+               printf("has_hw_decode = %u\n", rscreen->info.has_hw_decode);
                printf("num_sdma_rings = %i\n", rscreen->info.num_sdma_rings);
-               printf("has_hw_decode = %i\n", rscreen->info.has_hw_decode);
+               printf("num_compute_rings = %u\n", rscreen->info.num_compute_rings);
+               printf("uvd_fw_version = %u\n", rscreen->info.uvd_fw_version);
+               printf("vce_fw_version = %u\n", rscreen->info.vce_fw_version);
                printf("me_fw_version = %i\n", rscreen->info.me_fw_version);
                printf("pfp_fw_version = %i\n", rscreen->info.pfp_fw_version);
                printf("ce_fw_version = %i\n", rscreen->info.ce_fw_version);
-               printf("vce_fw_version = %i\n", rscreen->info.vce_fw_version);
                printf("vce_harvest_config = %i\n", rscreen->info.vce_harvest_config);
                printf("clock_crystal_freq = %i\n", rscreen->info.clock_crystal_freq);
+               printf("tcc_cache_line_size = %u\n", rscreen->info.tcc_cache_line_size);
                printf("drm = %i.%i.%i\n", rscreen->info.drm_major,
                       rscreen->info.drm_minor, rscreen->info.drm_patchlevel);
                printf("has_userptr = %i\n", rscreen->info.has_userptr);
+               printf("has_syncobj = %u\n", rscreen->info.has_syncobj);
 
                printf("r600_max_quad_pipes = %i\n", rscreen->info.r600_max_quad_pipes);
                printf("max_shader_clock = %i\n", rscreen->info.max_shader_clock);
@@ -1448,6 +1459,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
                printf("num_tile_pipes = %i\n", rscreen->info.num_tile_pipes);
                printf("pipe_interleave_bytes = %i\n", rscreen->info.pipe_interleave_bytes);
                printf("enabled_rb_mask = 0x%x\n", rscreen->info.enabled_rb_mask);
+               printf("max_alignment = %u\n", (unsigned)rscreen->info.max_alignment);
        }
        return true;
 }

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 26c7dacb9df4daa7c2e75e5304129912aa6b5b87..a8b5e5b41a184f12b10780344626b29faf5a5886 100644 (file)
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -63,7 +63,7 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, int fd)
       goto fail;
    }
 
-   ws->addrlib = amdgpu_addr_create(&ws->info, &ws->amdinfo, NULL);
+   ws->addrlib = amdgpu_addr_create(&ws->info, &ws->amdinfo, &ws->info.max_alignment);
    if (!ws->addrlib) {
       fprintf(stderr, "amdgpu: Cannot create addrlib.\n");
       goto fail;