diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-10-09 13:02:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-09 13:02:49 +1000 |
| commit | dded93ffbb8c4a578adf13b54cd62519908a23f8 (patch) | |
| tree | d6e0f499ec23a6c204527e2109ddc73dca13c2b2 /drivers/gpu/drm/amd/amdgpu | |
| parent | drm/nouveau/mem: guard against NULL pointer access in mem_del (diff) | |
| parent | drm/amd/display: Change ABM config init interface (diff) | |
| download | wireguard-linux-dded93ffbb8c4a578adf13b54cd62519908a23f8.tar.xz wireguard-linux-dded93ffbb8c4a578adf13b54cd62519908a23f8.zip | |
Merge tag 'amd-drm-fixes-5.9-2020-10-08' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
amd-drm-fixes-5.9-2020-10-08:
amdgpu:
- Fix a crash on renoir if you override the IP discovery parameter
- Fix the build on ARC platforms
- Display fix for Sienna Cichlid
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201009024917.3984-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 84d811b6e48b..c28ebf41530a 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -694,12 +694,12 @@ static void soc15_reg_base_init(struct amdgpu_device *adev) * it doesn't support SRIOV. */ if (amdgpu_discovery) { r = amdgpu_discovery_reg_base_init(adev); - if (r) { - DRM_WARN("failed to init reg base from ip discovery table, " - "fallback to legacy init method\n"); - vega10_reg_base_init(adev); - } + if (r == 0) + break; + DRM_WARN("failed to init reg base from ip discovery table, " + "fallback to legacy init method\n"); } + vega10_reg_base_init(adev); break; case CHIP_VEGA20: vega20_reg_base_init(adev); |