diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-12-07 09:47:35 +1000 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-12-07 09:19:19 -0800 |
| commit | 44bed805065f40ef89e4a8bd92a7be794e6531ee (patch) | |
| tree | 5b17edc3b33436321f11a79107673bc54db510e8 | |
| parent | dfadf838aef2a232e2f900c47ea0e88de0ef6d0e (diff) | |
radeonsi: fix regression on gpus using the radeon winsys.
For GPUs using the radeon kernel driver, num_se was never
getting initialised.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3939
Fixes: f2977a162af4 ("ac: fix min/max_good_num_cu_per_sa on gfx10.3 with disabled SEs")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7954>
(cherry picked from commit 7c075bae56e45f268e62efcd82589111bce92ae3)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 741273d24c7..2c76f890618 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -175,7 +175,7 @@ "description": "radeonsi: fix regression on gpus using the radeon winsys.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "f2977a162af46ff0b9d9334bb677b768900ba5d3" }, diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 569d273a1f7..f0e1b9f7df3 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -530,6 +530,8 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) } } + ws->info.num_se = ws->info.max_se; + radeon_get_drm_value(ws->fd, RADEON_INFO_MAX_SH_PER_SE, NULL, &ws->info.max_sh_per_se); if (ws->gen == DRV_SI) { |