Skip to content

Commit 06f6516

Browse files
airliedairlied
committed
Merge tag 'amd-drm-fixes-6.16-2025-25-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.16-2025-25-25: amdgpu: - Cleaner shader support for additional GFX9 GPUs - MES firmware compatibility fixes - Discovery error reporting fixes - SDMA6/7 userq fixes - Backlight fix - EDID sanity check Signed-off-by: Dave Airlie <[email protected]> From: Alex Deucher <[email protected]> Link: https://lore.kernel.org/r/[email protected]
2 parents 86731a2 + 6847b3b commit 06f6516

File tree

8 files changed

+74
-31
lines changed

8 files changed

+74
-31
lines changed

‎drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,12 @@ static int amdgpu_discovery_read_binary_from_file(struct amdgpu_device *adev,
321321
const struct firmware *fw;
322322
int r;
323323

324-
r = request_firmware(&fw, fw_name, adev->dev);
324+
r = firmware_request_nowarn(&fw, fw_name, adev->dev);
325325
if (r) {
326-
dev_err(adev->dev, "can't load firmware \"%s\"\n",
327-
fw_name);
326+
if (amdgpu_discovery == 2)
327+
dev_err(adev->dev, "can't load firmware \"%s\"\n", fw_name);
328+
else
329+
drm_info(&adev->ddev, "Optional firmware \"%s\" was not found\n", fw_name);
328330
return r;
329331
}
330332

@@ -459,16 +461,12 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev)
459461
/* Read from file if it is the preferred option */
460462
fw_name = amdgpu_discovery_get_fw_name(adev);
461463
if (fw_name != NULL) {
462-
dev_info(adev->dev, "use ip discovery information from file");
464+
drm_dbg(&adev->ddev, "use ip discovery information from file");
463465
r = amdgpu_discovery_read_binary_from_file(adev, adev->mman.discovery_bin, fw_name);
464-
465-
if (r) {
466-
dev_err(adev->dev, "failed to read ip discovery binary from file\n");
467-
r = -EINVAL;
466+
if (r)
468467
goto out;
469-
}
470-
471468
} else {
469+
drm_dbg(&adev->ddev, "use ip discovery information from memory");
472470
r = amdgpu_discovery_read_binary_from_mem(
473471
adev, adev->mman.discovery_bin);
474472
if (r)
@@ -1338,10 +1336,8 @@ static int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
13381336
int r;
13391337

13401338
r = amdgpu_discovery_init(adev);
1341-
if (r) {
1342-
DRM_ERROR("amdgpu_discovery_init failed\n");
1339+
if (r)
13431340
return r;
1344-
}
13451341

13461342
wafl_ver = 0;
13471343
adev->gfx.xcc_mask = 0;
@@ -2579,8 +2575,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
25792575
break;
25802576
default:
25812577
r = amdgpu_discovery_reg_base_init(adev);
2582-
if (r)
2583-
return -EINVAL;
2578+
if (r) {
2579+
drm_err(&adev->ddev, "discovery failed: %d\n", r);
2580+
return r;
2581+
}
25842582

25852583
amdgpu_discovery_harvest_ip(adev);
25862584
amdgpu_discovery_get_gfx_info(adev);

‎drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,6 +2235,25 @@ static int gfx_v9_0_sw_init(struct amdgpu_ip_block *ip_block)
22352235
}
22362236

22372237
switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
2238+
case IP_VERSION(9, 0, 1):
2239+
case IP_VERSION(9, 2, 1):
2240+
case IP_VERSION(9, 4, 0):
2241+
case IP_VERSION(9, 2, 2):
2242+
case IP_VERSION(9, 1, 0):
2243+
case IP_VERSION(9, 3, 0):
2244+
adev->gfx.cleaner_shader_ptr = gfx_9_4_2_cleaner_shader_hex;
2245+
adev->gfx.cleaner_shader_size = sizeof(gfx_9_4_2_cleaner_shader_hex);
2246+
if (adev->gfx.me_fw_version >= 167 &&
2247+
adev->gfx.pfp_fw_version >= 196 &&
2248+
adev->gfx.mec_fw_version >= 474) {
2249+
adev->gfx.enable_cleaner_shader = true;
2250+
r = amdgpu_gfx_cleaner_shader_sw_init(adev, adev->gfx.cleaner_shader_size);
2251+
if (r) {
2252+
adev->gfx.enable_cleaner_shader = false;
2253+
dev_err(adev->dev, "Failed to initialize cleaner shader\n");
2254+
}
2255+
}
2256+
break;
22382257
case IP_VERSION(9, 4, 2):
22392258
adev->gfx.cleaner_shader_ptr = gfx_9_4_2_cleaner_shader_hex;
22402259
adev->gfx.cleaner_shader_size = sizeof(gfx_9_4_2_cleaner_shader_hex);

‎drivers/gpu/drm/amd/amdgpu/mes_v11_0.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,10 +1630,12 @@ static int mes_v11_0_hw_init(struct amdgpu_ip_block *ip_block)
16301630
if (r)
16311631
goto failure;
16321632

1633-
r = mes_v11_0_set_hw_resources_1(&adev->mes);
1634-
if (r) {
1635-
DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);
1636-
goto failure;
1633+
if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x50) {
1634+
r = mes_v11_0_set_hw_resources_1(&adev->mes);
1635+
if (r) {
1636+
DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);
1637+
goto failure;
1638+
}
16371639
}
16381640

16391641
r = mes_v11_0_query_sched_status(&adev->mes);

‎drivers/gpu/drm/amd/amdgpu/mes_v12_0.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,8 @@ static int mes_v12_0_hw_init(struct amdgpu_ip_block *ip_block)
17421742
if (r)
17431743
goto failure;
17441744

1745-
mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);
1745+
if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x4b)
1746+
mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);
17461747

17471748
mes_v12_0_init_aggregated_doorbell(&adev->mes);
17481749

‎drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,9 +1374,22 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
13741374
else
13751375
DRM_ERROR("Failed to allocated memory for SDMA IP Dump\n");
13761376

1377-
/* add firmware version checks here */
1378-
if (0 && !adev->sdma.disable_uq)
1379-
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1377+
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
1378+
case IP_VERSION(6, 0, 0):
1379+
if ((adev->sdma.instance[0].fw_version >= 24) && !adev->sdma.disable_uq)
1380+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1381+
break;
1382+
case IP_VERSION(6, 0, 2):
1383+
if ((adev->sdma.instance[0].fw_version >= 21) && !adev->sdma.disable_uq)
1384+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1385+
break;
1386+
case IP_VERSION(6, 0, 3):
1387+
if ((adev->sdma.instance[0].fw_version >= 25) && !adev->sdma.disable_uq)
1388+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1389+
break;
1390+
default:
1391+
break;
1392+
}
13801393

13811394
r = amdgpu_sdma_sysfs_reset_mask_init(adev);
13821395
if (r)

‎drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,9 +1349,15 @@ static int sdma_v7_0_sw_init(struct amdgpu_ip_block *ip_block)
13491349
else
13501350
DRM_ERROR("Failed to allocated memory for SDMA IP Dump\n");
13511351

1352-
/* add firmware version checks here */
1353-
if (0 && !adev->sdma.disable_uq)
1354-
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1352+
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
1353+
case IP_VERSION(7, 0, 0):
1354+
case IP_VERSION(7, 0, 1):
1355+
if ((adev->sdma.instance[0].fw_version >= 7836028) && !adev->sdma.disable_uq)
1356+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1357+
break;
1358+
default:
1359+
break;
1360+
}
13551361

13561362
return r;
13571363
}

‎drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4718,16 +4718,16 @@ static int get_brightness_range(const struct amdgpu_dm_backlight_caps *caps,
47184718
return 1;
47194719
}
47204720

4721-
/* Rescale from [min..max] to [0..AMDGPU_MAX_BL_LEVEL] */
4721+
/* Rescale from [min..max] to [0..MAX_BACKLIGHT_LEVEL] */
47224722
static inline u32 scale_input_to_fw(int min, int max, u64 input)
47234723
{
4724-
return DIV_ROUND_CLOSEST_ULL(input * AMDGPU_MAX_BL_LEVEL, max - min);
4724+
return DIV_ROUND_CLOSEST_ULL(input * MAX_BACKLIGHT_LEVEL, max - min);
47254725
}
47264726

4727-
/* Rescale from [0..AMDGPU_MAX_BL_LEVEL] to [min..max] */
4727+
/* Rescale from [0..MAX_BACKLIGHT_LEVEL] to [min..max] */
47284728
static inline u32 scale_fw_to_input(int min, int max, u64 input)
47294729
{
4730-
return min + DIV_ROUND_CLOSEST_ULL(input * (max - min), AMDGPU_MAX_BL_LEVEL);
4730+
return min + DIV_ROUND_CLOSEST_ULL(input * (max - min), MAX_BACKLIGHT_LEVEL);
47314731
}
47324732

47334733
static void convert_custom_brightness(const struct amdgpu_dm_backlight_caps *caps,
@@ -4947,7 +4947,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector)
49474947
drm_dbg(drm, "Backlight caps: min: %d, max: %d, ac %d, dc %d\n", min, max,
49484948
caps->ac_level, caps->dc_level);
49494949
} else
4950-
props.brightness = props.max_brightness = AMDGPU_MAX_BL_LEVEL;
4950+
props.brightness = props.max_brightness = MAX_BACKLIGHT_LEVEL;
49514951

49524952
if (caps->data_points && !(amdgpu_dc_debug_mask & DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE))
49534953
drm_info(drm, "Using custom brightness curve\n");

‎drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,10 @@ enum dc_edid_status dm_helpers_read_local_edid(
10291029
return EDID_NO_RESPONSE;
10301030

10311031
edid = drm_edid_raw(drm_edid); // FIXME: Get rid of drm_edid_raw()
1032+
if (!edid ||
1033+
edid->extensions >= sizeof(sink->dc_edid.raw_edid) / EDID_LENGTH)
1034+
return EDID_BAD_INPUT;
1035+
10321036
sink->dc_edid.length = EDID_LENGTH * (edid->extensions + 1);
10331037
memmove(sink->dc_edid.raw_edid, (uint8_t *)edid, sink->dc_edid.length);
10341038

0 commit comments

Comments
 (0)