Ping on this series. Alex
On Fri, Nov 17, 2023 at 11:17 AM Alex Deucher <alexander.deuc...@amd.com> wrote: > > The changes to support vram_usagebyfirmware v2.2 changed the behavior > to explicitly match 2.1 for everything older rather than just using it > by default. If the version is 2.2 or newer, use the 2.2 parsing, for > everything else, use the 2.1 parsing. This restores the previous > behavior for tables that didn't explicitly match 2.1. > > Fixes: 4864f2ee9ee2 ("drm/amdgpu: add vram reservation based on > vram_usagebyfirmware_v2_2") > Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1215802 > Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> > --- > .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c > index fb2681dd6b33..d8393e3f2778 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c > @@ -181,18 +181,18 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct > amdgpu_device *adev) > int usage_bytes = 0; > > if (amdgpu_atom_parse_data_header(ctx, index, NULL, &frev, &crev, > &data_offset)) { > - if (frev == 2 && crev == 1) { > - fw_usage_v2_1 = > - (struct vram_usagebyfirmware_v2_1 > *)(ctx->bios + data_offset); > - amdgpu_atomfirmware_allocate_fb_v2_1(adev, > - fw_usage_v2_1, > - &usage_bytes); > - } else if (frev >= 2 && crev >= 2) { > + if (frev >= 2 && crev >= 2) { > fw_usage_v2_2 = > (struct vram_usagebyfirmware_v2_2 > *)(ctx->bios + data_offset); > amdgpu_atomfirmware_allocate_fb_v2_2(adev, > - fw_usage_v2_2, > - &usage_bytes); > + fw_usage_v2_2, > + &usage_bytes); > + } else { > + fw_usage_v2_1 = > + (struct vram_usagebyfirmware_v2_1 > *)(ctx->bios + data_offset); > + amdgpu_atomfirmware_allocate_fb_v2_1(adev, > + fw_usage_v2_1, > + &usage_bytes); > } > } > > -- > 2.41.0 >