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

Commit c89633ed authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: add support for variable compression ratios"

parents da7839e1 e3f23771

msm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -70,10 +70,12 @@ msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \ 
	sde/sde_hw_reg_dma_v1.o \

	sde/sde_hw_dsc.o \

	sde/sde_hw_dsc_1_2.o \

	sde/sde_hw_vdc.o \

	sde/sde_hw_ds.o \

	sde/sde_fence.o \

	sde/sde_hw_qdss.o \

	sde_dsc_helper.o \

	sde_vdc_helper.o \



msm_drm-$(CONFIG_DRM_SDE_WB) += sde/sde_wb.o \

	sde/sde_encoder_phys_wb.o \

msm/dp/dp_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static void dp_ctrl_mst_calculate_rg(struct dp_ctrl_private *ctrl, 
	u32 x_int = 0, y_frac_enum = 0;

	u64 target_strm_sym, ts_int_fixp, ts_frac_fixp, y_frac_enum_fixp;



	if (panel->pinfo.comp_info.comp_ratio)

	if (panel->pinfo.comp_info.comp_ratio > 1)

		bpp = DSC_BPP(panel->pinfo.comp_info.dsc_info.config);



	/* min_slot_cnt */

msm/dp/dp_display.c

+2 −2
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ static void dp_display_update_dsc_resources(struct dp_display_private *dp, 
	u32 dsc_blk_cnt = 0;



	if (panel->pinfo.comp_info.comp_type == MSM_DISPLAY_COMPRESSION_DSC &&

		panel->pinfo.comp_info.comp_ratio) {

		(panel->pinfo.comp_info.comp_ratio > 1)) {

		dsc_blk_cnt = panel->pinfo.h_active /

				dp->parser->max_dp_dsc_input_width_pixs;

		if (panel->pinfo.h_active %
@@ -2084,7 +2084,7 @@ static enum drm_mode_status dp_display_validate_mode( 


	dp_display->convert_to_dp_mode(dp_display, panel, mode, &dp_mode);



	dsc_en = dp_mode.timing.comp_info.comp_ratio ? true : false;

	dsc_en = (dp_mode.timing.comp_info.comp_ratio > 1) ? true : false;

	mode_bpp = dsc_en ?

		DSC_BPP(dp_mode.timing.comp_info.dsc_info.config)

		: dp_mode.timing.bpp;

msm/dp/dp_drm.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#include <drm/drm_atomic_helper.h>
@@ -418,7 +418,7 @@ int dp_connector_get_mode_info(struct drm_connector *connector, 


	dp_disp->convert_to_dp_mode(dp_disp, dp_panel, drm_mode, &dp_mode);



	if (dp_mode.timing.comp_info.comp_ratio) {

	if (dp_mode.timing.comp_info.comp_ratio > 1) {

		memcpy(&mode_info->comp_info,

			&dp_mode.timing.comp_info,

			sizeof(mode_info->comp_info));

msm/dp/dp_mst_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static int dp_mst_calc_pbn_mode(struct dp_display_mode *dp_mode) 
	bool dsc_en;

	s64 pbn_fp;



	dsc_en = dp_mode->timing.comp_info.comp_ratio ? true : false;

	dsc_en = (dp_mode->timing.comp_info.comp_ratio > 1) ? true : false;

	bpp = dsc_en ?

		DSC_BPP(dp_mode->timing.comp_info.dsc_info.config)

		: dp_mode->timing.bpp;