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

Commit b7979fa7 authored by Ping Li's avatar Ping Li
Browse files

drm/msm/sde: Update AD backlight scale property name 



Update AD backlight scale property name to be sunlight visibility
backlight scale, so that it can be used by either AD or LTM based
on the HW availability.

Change-Id: I488620bd2e83d7587ba63b0f90a36c9cd13fa485
Signed-off-by: default avatarPing Li <pingli@codeaurora.org>
parent 0a40fdf3

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+5 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int dsi_display_set_backlight(struct drm_connector *connector, 
{

	struct dsi_display *dsi_display = display;

	struct dsi_panel *panel;

	u32 bl_scale, bl_scale_ad;

	u32 bl_scale, bl_scale_sv;

	u64 bl_temp;

	int rc = 0;
@@ -193,12 +193,11 @@ int dsi_display_set_backlight(struct drm_connector *connector, 
	bl_scale = panel->bl_config.bl_scale;

	bl_temp = bl_lvl * bl_scale / MAX_BL_SCALE_LEVEL;



	bl_scale_ad = panel->bl_config.bl_scale_ad;

	bl_temp = (u32)bl_temp * bl_scale_ad / MAX_AD_BL_SCALE_LEVEL;



	pr_debug("bl_scale = %u, bl_scale_ad = %u, bl_lvl = %u\n",

		bl_scale, bl_scale_ad, (u32)bl_temp);

	bl_scale_sv = panel->bl_config.bl_scale_sv;

	bl_temp = (u32)bl_temp * bl_scale_sv / MAX_SV_BL_SCALE_LEVEL;



	pr_debug("bl_scale = %u, bl_scale_sv = %u, bl_lvl = %u\n",

		bl_scale, bl_scale_sv, (u32)bl_temp);

	rc = dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,

			DSI_CORE_CLK, DSI_CLK_ON);

	if (rc) {

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -2032,7 +2032,7 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel) 
	}



	panel->bl_config.bl_scale = MAX_BL_SCALE_LEVEL;

	panel->bl_config.bl_scale_ad = MAX_AD_BL_SCALE_LEVEL;

	panel->bl_config.bl_scale_sv = MAX_SV_BL_SCALE_LEVEL;



	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-min-level", &val);

	if (rc) {

drivers/gpu/drm/msm/dsi-staging/dsi_panel.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#define MAX_BL_LEVEL 4096

#define MAX_BL_SCALE_LEVEL 1024

#define MAX_AD_BL_SCALE_LEVEL 65535

#define MAX_SV_BL_SCALE_LEVEL 65535

#define DSI_CMD_PPS_SIZE 135



#define DSI_MODE_MAX 5
@@ -90,7 +90,7 @@ struct dsi_backlight_config { 
	u32 brightness_max_level;

	u32 bl_level;

	u32 bl_scale;

	u32 bl_scale_ad;

	u32 bl_scale_sv;



	int en_gpio;

	/* PWM params */

drivers/gpu/drm/msm/msm_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ enum msm_mdp_conn_property { 
	CONNECTOR_PROP_DST_H,

	CONNECTOR_PROP_ROI_V1,

	CONNECTOR_PROP_BL_SCALE,

	CONNECTOR_PROP_AD_BL_SCALE,

	CONNECTOR_PROP_SV_BL_SCALE,



	/* enum/bitmask properties */

	CONNECTOR_PROP_TOPOLOGY_NAME,

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

+2 −2
Original line number Diff line number Diff line
@@ -2160,7 +2160,7 @@ static void sde_cp_ad_interrupt_cb(void *arg, int irq_idx) 
static void sde_cp_notify_ad_event(struct drm_crtc *crtc_drm, void *arg)

{

	uint32_t input_bl = 0, output_bl = 0;

	uint32_t scale = MAX_AD_BL_SCALE_LEVEL;

	uint32_t scale = MAX_SV_BL_SCALE_LEVEL;

	struct sde_hw_mixer *hw_lm = NULL;

	struct sde_hw_dspp *hw_dspp = NULL;

	u32 num_mixers;
@@ -2208,7 +2208,7 @@ static void sde_cp_notify_ad_event(struct drm_crtc *crtc_drm, void *arg) 
	if (!input_bl || input_bl < output_bl)

		return;



	scale = (output_bl * MAX_AD_BL_SCALE_LEVEL) / input_bl;

	scale = (output_bl * MAX_SV_BL_SCALE_LEVEL) / input_bl;

	event.length = sizeof(u32);

	event.type = DRM_EVENT_AD_BACKLIGHT;

	msm_mode_object_event_notify(&crtc_drm->base, crtc_drm->dev,