kernel/linux.git/drivers/gpu/drm/amd, branch linux-5.9.y

drm/amdgpu: fix sdma instance fw version and feature version init

2020-12-16T09:58:37+00:00

commit 6896887b8676d8fb445c85ea56333b9661a6a8aa upstream. each sdma instance fw_version and feature_version should be set right value when asic type isn't between SIENNA_CICHILD and CHIP_DIMGREY_CAVEFISH Signed-off-by: Stanley.Yang Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman

drm/amdgpu/disply: set num_crtc earlier

2020-12-16T09:58:36+00:00

commit 578b6c487899179fed730e710ffec0b069917971 upstream. To avoid a recently added warning: Bogus possible_crtcs: [ENCODER:65:TMDS-65] possible_crtcs=0xf (full crtc mask=0x7) WARNING: CPU: 3 PID: 439 at drivers/gpu/drm/drm_mode_config.c:617 drm_mode_config_validate+0x178/0x200 [drm] In this case the warning is harmless, but confusing to users. Fixes: 0df108237433 ("drm: Validate encoder->possible_crtcs") Bug: https://bugzilla.kernel.org/show_bug.cgi?id=209123 Reviewed-by: Daniel Vetter Reviewed-by: Nicholas Kazlauskas Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman

Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"

2020-12-11T12:22:11+00:00

This patch should not have been applied to stable. It depends on changes in newer drivers. This reverts commit 756fec062e4b823bbbe10b95cbcfa84f948131c6. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1402 Signed-off-by: Alex Deucher Cc: Sasha Levin Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman

drm/amdgpu/vcn3.0: remove old DPG workaround

2020-12-11T12:22:08+00:00

commit efd6d85a18102241538dd1cc257948a0dbe6fae6 upstream. Port from VCN2.5 SCRATCH2 is used to keep decode wptr as a workaround which fix a hardware DPG decode wptr update bug for vcn2.5 beforehand. Signed-off-by: Boyuan Zhang Reviewed-by: James Zhu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Greg Kroah-Hartman

drm/amdgpu/vcn3.0: stall DPG when WPTR/RPTR reset

2020-12-11T12:22:08+00:00

commit ac2db9488cf21de0be7899c1e5963e5ac0ff351f upstream. Port from VCN2.5 Add vcn dpg harware synchronization to fix race condition issue between vcn driver and hardware. Signed-off-by: Boyuan Zhang Reviewed-by: James Zhu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Greg Kroah-Hartman

drm/amdgpu: add rlc iram and dram firmware support

2020-12-02T07:52:02+00:00

commit 843c7eb2f7571aa092a8ea010c80e8d94c197f67 upstream. Support to load RLC iram and dram ucode when RLC firmware struct use v2.2 Signed-off-by: Likun Gao Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman

drm/amd/display: Avoid HDCP initialization in devices without output

2020-12-02T07:51:48+00:00

commit d661155bfca329851a27bb5120fab027db43bd23 upstream. The HDCP feature requires at least one connector attached to the device; however, some GPUs do not have a physical output, making the HDCP initialization irrelevant. This patch disables HDCP initialization when the graphic card does not have output. Acked-by: Alex Deucher Signed-off-by: Rodrigo Siqueira Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman

drm/amd/amdgpu: fix null pointer in runtime pm

2020-12-02T07:51:47+00:00

commit 7acc79eb5f78d3d1aa5dd21fc0a0329f1b7f2be5 upstream. fix the null pointer issue when runtime pm is triggered. Signed-off-by: Kenneth Feng Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman

drm/amdgpu: update golden setting for sienna_cichlid

2020-12-02T07:51:47+00:00

commit 60734bd54679d7998a24a257b0403f7644005572 upstream. Update golden setting for sienna_cichlid. Signed-off-by: Likun Gao Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.9.x Signed-off-by: Greg Kroah-Hartman

drm/amdgpu: fix a page fault

2020-12-02T07:51:47+00:00

commit dbbf2728d50343b7947001a81f4c8cc98e4b44e5 upstream. The UVD firmware is copied to cpu addr in uvd_resume, so it should be used after that. This is to fix a bug introduced by patch drm/amdgpu: fix SI UVD firmware validate resume fail. Signed-off-by: Sonny Jiang Reviewed-by: Leo Liu Signed-off-by: Alex Deucher CC: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman