diff options
| author | Maxime Ripard <[email protected]> | 2025-01-14 17:21:58 +0000 |
|---|---|---|
| committer | Maxime Ripard <[email protected]> | 2025-01-14 17:21:58 +0000 |
| commit | 12080e85254fa05ff25ad2e6e74dc523621a8706 (patch) | |
| tree | ff0bd8354f12ff20d956a3e15e71555c5ed275a4 /drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | |
| parent | drm/display: hdmi-state-helper: add drm_display_mode declaration (diff) | |
| parent | Merge tag 'drm-msm-next-2025-01-07' of gitlab.freedesktop.org:drm/msm into dr... (diff) | |
| download | kernel-12080e85254fa05ff25ad2e6e74dc523621a8706.tar.gz kernel-12080e85254fa05ff25ad2e6e74dc523621a8706.zip | |
Merge drm/drm-next into drm-misc-next-fixes
drm-next has the dmem cgroup patches we need to merge fixes for.
Signed-off-by: Maxime Ripard <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c index 59ec20b07a6a..32b27a1658e7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -1610,10 +1610,12 @@ int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe) pipe == AMDGPU_MES_SCHED_PIPE ? "" : "1"); } - r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe], "%s", fw_name); + r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe], AMDGPU_UCODE_REQUIRED, + "%s", fw_name); if (r && need_retry && pipe == AMDGPU_MES_SCHED_PIPE) { dev_info(adev->dev, "try to fall back to %s_mes.bin\n", ucode_prefix); r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe], + AMDGPU_UCODE_REQUIRED, "amdgpu/%s_mes.bin", ucode_prefix); } |