Commit 62af7387 authored Oct 06, 2023 by Dave Airlie

Merge tag 'amd-drm-fixes-6.6-2023-10-04' of...

Merge tag 'amd-drm-fixes-6.6-2023-10-04' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.6-2023-10-04:

amdgpu:
- Add missing unique_id for GC 11.0.3
- Fix memory leak in FRU error path
- Fix PCIe link reporting on some SMU 11 parts
- Fix ACPI _PR3 detection
- Fix DISPCLK WDIVIDER handling in OTG code

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231005034358.7824-1-alexander.deucher@amd.com

parents dd01714e b206011b

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2093,7 +2093,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
		adev->flags \|= AMD_IS_PX;

		if (!(adev->flags & AMD_IS_APU)) {
		parent = pci_upstream_bridge(adev->pdev);
		parent = pcie_find_root_port(adev->pdev);
		adev->has_pr3 = parent ? pci_pr3_present(parent) : false;
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
		csum += pia[size - 1];
		if (csum) {
		DRM_ERROR("Bad Product Info Area checksum: 0x%02x", csum);
		kfree(pia);
		return -EIO;
		}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr, struct
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)
		@@ -188,7 +188,7 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr, struct
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ static void dcn32_update_clocks_update_dentist(
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)
		@@ -401,7 +401,7 @@ static void dcn32_update_clocks_update_dentist(
		int32_t N;
		int32_t j;

		if (!pipe_ctx->stream)
		if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))
		continue;
		/* Virtual encoders don't have this function */
		if (!stream_enc->funcs->get_fifo_cal_average_level)

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2040,6 +2040,7 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_
		case IP_VERSION(11, 0, 0):
		case IP_VERSION(11, 0, 1):
		case IP_VERSION(11, 0, 2):
		case IP_VERSION(11, 0, 3):
		*states = ATTR_STATE_SUPPORTED;
		break;
		default: