Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3629cb73 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: Expose the HDR support capability of the chipset"

parents d68ac604 fb87ca54

drivers/gpu/drm/msm/sde/sde_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -1385,6 +1385,7 @@ static void sde_crtc_install_properties(struct drm_crtc *crtc, 
	if (catalog->qseed_type == SDE_SSPP_SCALER_QSEED3)

		sde_kms_info_add_keystr(info, "qseed_type", "qseed3");

	sde_kms_info_add_keyint(info, "has_src_split", catalog->has_src_split);

	sde_kms_info_add_keyint(info, "has_hdr", catalog->has_hdr);

	if (catalog->perf.max_bw_low)

		sde_kms_info_add_keyint(info, "max_bandwidth_low",

				catalog->perf.max_bw_low);

drivers/gpu/drm/msm/sde/sde_hw_catalog.c

+5 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,11 @@ static int sde_hardware_format_caps(struct sde_mdss_cfg *sde_cfg, 
		goto end;

	}



	if (IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_300) ||

		IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_301)) {

		sde_cfg->has_hdr = true;

	}



	index = _sde_copy_formats(sde_cfg->dma_formats, dma_list_size,

		0, plane_formats, ARRAY_SIZE(plane_formats));

	index += _sde_copy_formats(sde_cfg->dma_formats, dma_list_size,

drivers/gpu/drm/msm/sde/sde_hw_catalog.h

+2 −1
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ struct sde_vp_cfg { 
 * @csc_type           csc or csc_10bit support.

 * @has_src_split      source split feature status

 * @has_cdp            Client driver prefetch feature status

 * @has_hdr            HDR feature support

 * @dma_formats        Supported formats for dma pipe

 * @cursor_formats     Supported formats for cursor pipe

 * @vig_formats        Supported formats for vig pipe
@@ -672,7 +673,7 @@ struct sde_mdss_cfg { 
	u32 csc_type;

	bool has_src_split;

	bool has_cdp;



	bool has_hdr;

	u32 mdss_count;

	struct sde_mdss_base_cfg mdss[MAX_BLOCKS];