Commit 7c57d686 authored by openeuler-sync-bot's avatar openeuler-sync-bot
Browse files

Merge remote-tracking branch 'upstream/openEuler-22.03-LTS-SP1' into HEAD

parents 7ff5b87a bed633e6

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

+6 −0
Original line number Diff line number Diff line
@@ -459,6 +459,9 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, 
	if (size & 0x3 || *pos & 0x3)

		return -EINVAL;



	if (!adev->didt_rreg)

		return -EOPNOTSUPP;



	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);

	if (r < 0) {

		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
@@ -518,6 +521,9 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user 
	if (size & 0x3 || *pos & 0x3)

		return -EINVAL;



	if (!adev->didt_wreg)

		return -EOPNOTSUPP;



	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);

	if (r < 0) {

		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -1455,6 +1455,7 @@ static int dm_sw_fini(void *handle) 


	if (adev->dm.dmub_srv) {

		dmub_srv_destroy(adev->dm.dmub_srv);

		kfree(adev->dm.dmub_srv);

		adev->dm.dmub_srv = NULL;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf, 
	const uint32_t rd_buf_size = 10;

	struct pipe_ctx *pipe_ctx;

	ssize_t result = 0;

	int i, r, str_len = 30;

	int i, r, str_len = 10;



	rd_buf = kcalloc(rd_buf_size, sizeof(char), GFP_KERNEL);

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+5 −2
Original line number Diff line number Diff line
@@ -1669,6 +1669,9 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, 
{

	struct dpp *dpp = pipe_ctx->plane_res.dpp;



	if (!stream)

		return false;



	if (dpp == NULL)

		return false;
@@ -1691,8 +1694,8 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, 
	} else

		dpp->funcs->dpp_program_regamma_pwl(dpp, NULL, OPP_REGAMMA_BYPASS);



	if (stream != NULL && stream->ctx != NULL &&

			stream->out_transfer_func != NULL) {

	if (stream->ctx &&

	    stream->out_transfer_func) {

		log_tf(stream->ctx,

				stream->out_transfer_func,

				dpp->regamma_params.hw_points_num);

drivers/gpu/drm/amd/pm/powerplay/si_dpm.c

+2 −3
Original line number Diff line number Diff line
@@ -7349,10 +7349,9 @@ static int si_dpm_init(struct amdgpu_device *adev) 
		kcalloc(4,

			sizeof(struct amdgpu_clock_voltage_dependency_entry),

			GFP_KERNEL);

	if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries) {

		amdgpu_free_extended_power_table(adev);

	if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries)

		return -ENOMEM;

	}



	adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count = 4;

	adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].clk = 0;

	adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0].v = 0;