From: jsg Date: Thu, 18 Apr 2024 01:08:20 +0000 (+0000) Subject: drm/amdgpu: fix incorrect number of active RBs for gfx11 X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=28fc325f784d0d738661796d2dc39ca06cfbd92b;p=openbsd drm/amdgpu: fix incorrect number of active RBs for gfx11 From Tim Huang bd3105a71d1c125deedf35be11b4d79e8b84e6f2 in linux-6.6.y/6.6.28 bbca7f414ae9a12ea231cdbafd79c607e3337ea8 in mainline linux --- diff --git a/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c b/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c index 25203311ded..291b883c7d7 100644 --- a/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c @@ -1616,7 +1616,7 @@ static void gfx_v11_0_setup_rb(struct amdgpu_device *adev) active_rb_bitmap |= (0x3 << (i * rb_bitmap_width_per_sa)); } - active_rb_bitmap |= global_active_rb_bitmap; + active_rb_bitmap &= global_active_rb_bitmap; adev->gfx.config.backend_enable_mask = active_rb_bitmap; adev->gfx.config.num_rbs = hweight32(active_rb_bitmap); }