r600g,radeonsi: workaround for late shared screen initialization

Accidentally broken by the consolidation.

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 097a6b8cf407dcd3157a347b552838a8903d7635..6b31bd87efba5b46cfcdac4655ef1465581c9be5 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -1018,6 +1018,8 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
                return NULL;
        }
 
+       ws->query_info(ws, &rscreen->b.info);
+
        /* Set functions first. */
        rscreen->b.b.context_create = r600_create_context;
        rscreen->b.b.destroy = r600_destroy_screen;
@@ -1028,7 +1030,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        rscreen->b.b.get_paramf = r600_get_paramf;
        rscreen->b.b.get_compute_param = r600_get_compute_param;
        rscreen->b.b.get_timestamp = r600_get_timestamp;
-       if (rscreen->b.chip_class >= EVERGREEN) {
+       if (rscreen->b.info.chip_class >= EVERGREEN) {
                rscreen->b.b.is_format_supported = evergreen_is_format_supported;
        } else {
                rscreen->b.b.is_format_supported = r600_is_format_supported;

diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 5016e13dab39be37ac904b02ce2c838f4b3ac4be..a9292709e517a973dbb16e7c1423bed2c0c4a1e8 100644 (file)
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -765,6 +765,8 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
                return NULL;
        }
 
+       ws->query_info(ws, &rscreen->b.info);
+
        /* Set functions first. */
        rscreen->b.b.context_create = r600_create_context;
        rscreen->b.b.destroy = r600_destroy_screen;