Commit f0b60e6e authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amd/display: Eliminate warnings in amdgpu_dm_helpers.c 



Fix the following warnings reported by checkpatch:

WARNING: Block comments use a trailing */ on a separate line
WARNING: Prefer using '"%s...", __func__' to using 'execute_synaptics_rc_command', this function's name, in a string
WARNING: Prefer using '"%s...", __func__' to using 'apply_synaptics_fifo_reset_wa', this function's name, in a string
WARNING: braces {} are not necessary for single statement blocks

Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a19de9db

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

+16 −15
Original line number Diff line number Diff line
@@ -68,15 +68,15 @@ static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps) 
	}

}



/* dm_helpers_parse_edid_caps

 *

 * Parse edid caps

/**

 * dm_helpers_parse_edid_caps() - Parse edid caps

 *

 * @link: current detected link

 * @edid:	[in] pointer to edid

 *  edid_caps:	[in] pointer to edid caps

 * @return

 *	void

 * */

 * @edid_caps:	[in] pointer to edid caps

 *

 * Return: void

 */

enum dc_edid_status dm_helpers_parse_edid_caps(

		struct dc_link *link,

		const struct dc_edid *edid,
@@ -255,7 +255,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( 
	/* Accessing the connector state is required for vcpi_slots allocation

	 * and directly relies on behaviour in commit check

	 * that blocks before commit guaranteeing that the state

	 * is not gonna be swapped while still in use in commit tail */

	 * is not gonna be swapped while still in use in commit tail

	 */



	if (!aconnector || !aconnector->mst_root)

		return false;
@@ -282,7 +283,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( 
	/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or

	 * AUX message. The sequence is slot 1-63 allocated sequence for each

	 * stream. AMD ASIC stream slot allocation should follow the same

	 * sequence. copy DRM MST allocation to dc */

	 * sequence. copy DRM MST allocation to dc

	 */

	fill_dc_mst_payload_table_from_drm(stream->link, enable, target_payload, proposed_table);



	return true;
@@ -633,7 +635,7 @@ static bool execute_synaptics_rc_command(struct drm_dp_aux *aux, 
	ret = drm_dp_dpcd_write(aux, SYNAPTICS_RC_COMMAND, &rc_cmd, sizeof(rc_cmd));



	if (ret < 0) {

		DRM_ERROR("	execute_synaptics_rc_command - write cmd ..., err = %d\n", ret);

		DRM_ERROR("%s: write cmd ..., err = %d\n",  __func__, ret);

		return false;

	}
@@ -655,7 +657,7 @@ static bool execute_synaptics_rc_command(struct drm_dp_aux *aux, 
		drm_dp_dpcd_read(aux, SYNAPTICS_RC_DATA, data, length);

	}



	DC_LOG_DC("	execute_synaptics_rc_command - success = %d\n", success);

	DC_LOG_DC("%s: success = %d\n", __func__, success);



	return success;

}
@@ -664,7 +666,7 @@ static void apply_synaptics_fifo_reset_wa(struct drm_dp_aux *aux) 
{

	unsigned char data[16] = {0};



	DC_LOG_DC("Start apply_synaptics_fifo_reset_wa\n");

	DC_LOG_DC("Start %s\n", __func__);



	// Step 2

	data[0] = 'P';
@@ -722,7 +724,7 @@ static void apply_synaptics_fifo_reset_wa(struct drm_dp_aux *aux) 
	if (!execute_synaptics_rc_command(aux, true, 0x02, 0, 0, NULL))

		return;



	DC_LOG_DC("Done apply_synaptics_fifo_reset_wa\n");

	DC_LOG_DC("Done %s\n", __func__);

}



/* MST Dock */
@@ -995,10 +997,9 @@ void dm_helpers_override_panel_settings( 
	struct dc_panel_config *panel_config)

{

	// Feature DSC

	if (amdgpu_dc_debug_mask & DC_DISABLE_DSC) {

	if (amdgpu_dc_debug_mask & DC_DISABLE_DSC)

		panel_config->dsc.disable_dsc_edp = true;

}

}



void *dm_helpers_allocate_gpu_mem(

		struct dc_context *ctx,