diff options
| author | Marek Olšák <[email protected]> | 2019-02-12 12:14:15 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-04-23 11:28:56 -0400 |
| commit | 64d6cc982d5ccf6b396c0dec24611c5c6ef1cc7d (patch) | |
| tree | a30438ca7a2d57e1b8d0535af370a493435d7e12 /src/gallium/drivers/r600 | |
| parent | 9b33465481daf465cde3ff46261486ab5c6433c6 (diff) | |
ac: add radeon_info::marketing_name, replacing the winsys callback
Tested-by: Dieter Nützel <[email protected]>
Acked-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe_common.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c index fce35b45141..bce45ea0456 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.c +++ b/src/gallium/drivers/r600/r600_pipe_common.c @@ -805,13 +805,6 @@ static const char* r600_get_device_vendor(struct pipe_screen* pscreen) return "AMD"; } -static const char *r600_get_marketing_name(struct radeon_winsys *ws) -{ - if (!ws->get_chip_name) - return NULL; - return ws->get_chip_name(ws); -} - static const char *r600_get_family_name(const struct r600_common_screen *rscreen) { switch (rscreen->info.family) { @@ -1274,11 +1267,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, ws->query_info(ws, &rscreen->info); rscreen->ws = ws; - if ((chip_name = r600_get_marketing_name(ws))) - snprintf(family_name, sizeof(family_name), "%s / ", - r600_get_family_name(rscreen) + 4); - else - chip_name = r600_get_family_name(rscreen); + chip_name = r600_get_family_name(rscreen); if (uname(&uname_data) == 0) snprintf(kernel_version, sizeof(kernel_version), |