Commit 00f24897 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm: drop msm_kms_funcs::get_format() callback 



Now as all subdrivers were converted to use common database of formats,
drop the get_format() callback and use mdp_get_format() directly.

Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/590431/
Link: https://lore.kernel.org/r/20240420-dpu-format-v2-9-9e93226cbffd@linaro.org
parent b228501f

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine( 


	drm_mode_to_intf_timing_params(phys_enc, &mode, &timing_params);



	fmt = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);

	fmt = mdp_get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);

	DPU_DEBUG_VIDENC(phys_enc, "fmt_fourcc 0x%X\n", fmt_fourcc);



	if (phys_enc->hw_cdm)
@@ -414,7 +414,7 @@ static void dpu_encoder_phys_vid_enable(struct dpu_encoder_phys *phys_enc) 


	ctl = phys_enc->hw_ctl;

	fmt_fourcc = dpu_encoder_get_drm_fmt(phys_enc);

	fmt = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);

	fmt = mdp_get_format(&phys_enc->dpu_kms->base, fmt_fourcc, 0);



	DPU_DEBUG_VIDENC(phys_enc, "\n");

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c

+2 −3
Original line number Diff line number Diff line
@@ -326,8 +326,7 @@ static void dpu_encoder_phys_wb_setup( 


	wb_job = wb_enc->wb_job;

	format = msm_framebuffer_format(wb_enc->wb_job->fb);

	dpu_fmt = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base,

							    format->pixel_format, wb_job->fb->modifier);

	dpu_fmt = mdp_get_format(&phys_enc->dpu_kms->base, format->pixel_format, wb_job->fb->modifier);



	DPU_DEBUG("[mode_set:%d, \"%s\",%d,%d]\n",

			hw_wb->idx - WB_0, mode.name,
@@ -577,7 +576,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc 


	format = msm_framebuffer_format(job->fb);



	wb_cfg->dest.format = phys_enc->dpu_kms->base.funcs->get_format(&phys_enc->dpu_kms->base,

	wb_cfg->dest.format = mdp_get_format(&phys_enc->dpu_kms->base,

					     format->pixel_format, job->fb->modifier);

	if (!wb_cfg->dest.format) {

		/* this error should be detected during atomic_check */

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+0 −1
Original line number Diff line number Diff line
@@ -982,7 +982,6 @@ static const struct msm_kms_funcs kms_funcs = { 
	.enable_vblank   = dpu_kms_enable_vblank,

	.disable_vblank  = dpu_kms_disable_vblank,

	.check_modified_format = dpu_format_check_modified_format,

	.get_format      = mdp_get_format,

	.destroy         = dpu_kms_destroy,

	.snapshot        = dpu_kms_mdp_snapshot,

#ifdef CONFIG_DEBUG_FS

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static void _dpu_plane_color_fill(struct dpu_plane *pdpu, 
	 * select fill format to match user property expectation,

	 * h/w only supports RGB variants

	 */

	fmt = priv->kms->funcs->get_format(priv->kms, DRM_FORMAT_ABGR8888, 0);

	fmt = mdp_get_format(priv->kms, DRM_FORMAT_ABGR8888, 0);

	/* should not happen ever */

	if (!fmt)

		return;

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ static const struct mdp_kms_funcs kms_funcs = { 
		.flush_commit    = mdp4_flush_commit,

		.wait_flush      = mdp4_wait_flush,

		.complete_commit = mdp4_complete_commit,

		.get_format      = mdp_get_format,

		.round_pixclk    = mdp4_round_pixclk,

		.destroy         = mdp4_destroy,

	},