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

Commit 06558561 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 8a8f8f04 203b2781

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

+1 −0
Original line number Diff line number Diff line
@@ -4903,6 +4903,7 @@ static void sde_crtc_install_properties(struct drm_crtc *crtc, 
	}



	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 * 1000LL);

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

+6 −0
Original line number Diff line number Diff line
@@ -3147,6 +3147,12 @@ 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) ||

	    IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_400) ||

	    IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_401))

		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 −0
Original line number Diff line number Diff line
@@ -913,6 +913,7 @@ struct sde_perf_cfg { 
 * @has_sbuf           indicate if stream buffer is available

 * @sbuf_headroom      stream buffer headroom in lines

 * @has_idle_pc        indicate if idle power collapse feature is supported

 * @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
@@ -941,6 +942,7 @@ struct sde_mdss_cfg { 
	u32 vbif_qos_nlvl;

	u32 ts_prefill_rev;



	bool has_hdr;

	u32 mdss_count;

	struct sde_mdss_base_cfg mdss[MAX_BLOCKS];