Commit b96ca23f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: drop virt_formats from SSPP subblock configuration 



The virt_formats / virt_num_formats are not used by the current driver
and are not going to be used in future since formats for virtual planes
are handled in a different way, by forbidding unsupported combinations
during atomic_check. Drop those fields now.

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/621479/
Link: https://lore.kernel.org/r/20241025-dpu-virtual-wide-v6-3-0310fd519765@linaro.org
parent 31f7148f

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

+0 −12
Original line number Diff line number Diff line
@@ -317,8 +317,6 @@ static const u32 wb2_formats_rgb_yuv[] = { 
		.base = 0x1a00, .len = 0x100,}, \

	.format_list = plane_formats_yuv, \

	.num_formats = ARRAY_SIZE(plane_formats_yuv), \

	.virt_format_list = plane_formats, \

	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	.rotation_cfg = NULL, \

	}
@@ -333,8 +331,6 @@ static const u32 wb2_formats_rgb_yuv[] = { 
		.base = 0x1a00, .len = 0x100,}, \

	.format_list = plane_formats_yuv, \

	.num_formats = ARRAY_SIZE(plane_formats_yuv), \

	.virt_format_list = plane_formats, \

	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	.rotation_cfg = rot_cfg, \

	}
@@ -344,8 +340,6 @@ static const u32 wb2_formats_rgb_yuv[] = { 
	.maxupscale = SSPP_UNITY_SCALE, \

	.format_list = plane_formats, \

	.num_formats = ARRAY_SIZE(plane_formats), \

	.virt_format_list = plane_formats, \

	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	}



/* qseed2 is not supported, so disabled scaling */
@@ -360,8 +354,6 @@ static const u32 wb2_formats_rgb_yuv[] = { 
		.base = 0x320, .len = 0x100,}, \

	.format_list = plane_formats_yuv, \

	.num_formats = ARRAY_SIZE(plane_formats_yuv), \

	.virt_format_list = plane_formats, \

	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	.rotation_cfg = NULL, \

	}
@@ -373,8 +365,6 @@ static const u32 wb2_formats_rgb_yuv[] = { 
		.base = 0x200, .len = 0x28,}, \

	.format_list = plane_formats, \

	.num_formats = ARRAY_SIZE(plane_formats), \

	.virt_format_list = plane_formats, \

	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	}



#define _DMA_SBLK() \
@@ -383,8 +373,6 @@ static const u32 wb2_formats_rgb_yuv[] = { 
	.maxupscale = SSPP_UNITY_SCALE, \

	.format_list = plane_formats, \

	.num_formats = ARRAY_SIZE(plane_formats), \

	.virt_format_list = plane_formats, \

	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	}



static const struct dpu_rotation_cfg dpu_rot_sc7280_cfg_v2 = {

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h

+0 −4
Original line number Diff line number Diff line
@@ -372,8 +372,6 @@ struct dpu_caps { 
 * @csc_blk:

 * @format_list: Pointer to list of supported formats

 * @num_formats: Number of supported formats

 * @virt_format_list: Pointer to list of supported formats for virtual planes

 * @virt_num_formats: Number of supported formats for virtual planes

 * @dpu_rotation_cfg: inline rotation configuration

 */

struct dpu_sspp_sub_blks {
@@ -386,8 +384,6 @@ struct dpu_sspp_sub_blks { 


	const u32 *format_list;

	u32 num_formats;

	const u32 *virt_format_list;

	u32 virt_num_formats;

	const struct dpu_rotation_cfg *rotation_cfg;

};