Commit 33eade2c authored Oct 01, 2020 by Dirk Gouders Committed by Alex Deucher Oct 07, 2020

drm/amdgpu: fix NULL pointer dereference for Renoir



Commit c1cf79ca ("drm/amdgpu: use IP discovery table for renoir")
introduced a NULL pointer dereference when booting with
amdgpu.discovery=0, because it removed the call of vega10_reg_base_init()
for that case.

Fix this by calling that funcion if amdgpu_discovery == 0 in addition to
the case that amdgpu_discovery_reg_base_init() failed.

Fixes: c1cf79ca ("drm/amdgpu: use IP discovery table for renoir")
Signed-off-by: Dirk Gouders <dirk@gouders.net>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Cc: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent d10285a2

drivers/gpu/drm/amd/amdgpu/soc15.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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) {
		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);
		}
		}
		vega10_reg_base_init(adev);
		break;
		case CHIP_VEGA20:
		vega20_reg_base_init(adev);

Admin message