Commit 5b83c254 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.8-2020-06-24' of... 

Merge tag 'amd-drm-fixes-5.8-2020-06-24' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.8-2020-06-24:

amdgpu:
- Fix missed mutex unlock in DC error path
- Fix firmware leak for sdma5
- DC bpc property fixes

amdkfd:
- Fix memleak in an error path

radeon:
- Fix copy paste typo in NI DPM spll validation

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200624221207.17773-1-alexander.deucher@amd.com
parents a1cd3486 b5b78a6c

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

+5 −1
Original line number Diff line number Diff line
@@ -1298,8 +1298,12 @@ static int sdma_v5_0_sw_fini(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int i;



	for (i = 0; i < adev->sdma.num_instances; i++)

	for (i = 0; i < adev->sdma.num_instances; i++) {

		if (adev->sdma.instance[i].fw != NULL)

			release_firmware(adev->sdma.instance[i].fw);



		amdgpu_ring_fini(&adev->sdma.instance[i].ring);

	}



	return 0;

}

drivers/gpu/drm/amd/amdkfd/kfd_process.c

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ struct kfd_process *kfd_create_process(struct file *filep) 
					   (int)process->lead_thread->pid);

		if (ret) {

			pr_warn("Creating procfs pid directory failed");

			kobject_put(process->kobj);

			goto out;

		}

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

+2 −1
Original line number Diff line number Diff line
@@ -5024,7 +5024,8 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
	struct drm_connector *connector = &aconnector->base;

	struct amdgpu_device *adev = connector->dev->dev_private;

	struct dc_stream_state *stream;

	int requested_bpc = connector->state ? connector->state->max_requested_bpc : 8;

	const struct drm_connector_state *drm_state = dm_state ? &dm_state->base : NULL;

	int requested_bpc = drm_state ? drm_state->max_requested_bpc : 8;

	enum dc_status dc_result = DC_OK;



	do {

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

+3 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,6 @@ static const struct { 
		{"link_settings", &dp_link_settings_debugfs_fops},

		{"phy_settings", &dp_phy_settings_debugfs_fop},

		{"test_pattern", &dp_phy_test_pattern_fops},

		{"output_bpc", &output_bpc_fops},

		{"vrr_range", &vrr_range_fops},

#ifdef CONFIG_DRM_AMD_DC_HDCP

		{"hdcp_sink_capability", &hdcp_sink_capability_fops},
@@ -1142,6 +1141,9 @@ void connector_debugfs_init(struct amdgpu_dm_connector *connector) 
	debugfs_create_file_unsafe("force_yuv420_output", 0644, dir, connector,

				   &force_yuv420_output_fops);



	debugfs_create_file("output_bpc", 0644, dir, connector,

			    &output_bpc_fops);



	connector->debugfs_dpcd_address = 0;

	connector->debugfs_dpcd_size = 0;

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

+4 −2
Original line number Diff line number Diff line
@@ -510,8 +510,10 @@ static ssize_t srm_data_read(struct file *filp, struct kobject *kobj, struct bin 


	srm = psp_get_srm(work->hdcp.config.psp.handle, &srm_version, &srm_size);



	if (!srm)

		return -EINVAL;

	if (!srm) {

		ret = -EINVAL;

		goto ret;

	}



	if (pos >= srm_size)

		ret = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE