Merge "drm/msm/dsi-staging: handoff backlight level for cont splash" into dev/msm-4.14-display (2293c404) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -3995,6 +3995,9 @@ int dsi_display_cont_splash_config(void *dsi_display)
		dsi_config_host_engine_state_for_cont_splash(display);
		mutex_unlock(&display->display_lock);

		/* Set the current brightness level */
		dsi_panel_bl_handoff(display->panel);

		return rc;

		clks_disabled:

+34 −0

Original line number	Diff line number	Diff line
		@@ -644,6 +644,40 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
		return rc;
		}

		static u32 dsi_panel_get_brightness(struct dsi_backlight_config *bl)
		{
		u32 cur_bl_level;
		struct backlight_device *bd = bl->raw_bd;

		/* default the brightness level to 50% */
		cur_bl_level = bl->bl_max_level >> 1;

		switch (bl->type) {
		case DSI_BACKLIGHT_WLED:
		/* Try to query the backlight level from the backlight device */
		if (bd->ops && bd->ops->get_brightness)
		cur_bl_level = bd->ops->get_brightness(bd);
		break;
		case DSI_BACKLIGHT_DCS:
		default:
		/*
		* Ideally, we should read the backlight level from the
		* panel. For now, just set it default value.
		*/
		break;
		}

		pr_debug("cur_bl_level=%d\n", cur_bl_level);
		return cur_bl_level;
		}

		void dsi_panel_bl_handoff(struct dsi_panel *panel)
		{
		struct dsi_backlight_config *bl = &panel->bl_config;

		bl->bl_level = dsi_panel_get_brightness(bl);
		}

		static int dsi_panel_bl_register(struct dsi_panel *panel)
		{
		int rc = 0;

+2 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,8 @@ int dsi_panel_post_switch(struct dsi_panel *panel);

		void dsi_dsc_pclk_param_calc(struct msm_display_dsc_info *dsc, int intf_width);

		void dsi_panel_bl_handoff(struct dsi_panel *panel);

		struct dsi_panel dsi_panel_ext_bridge_get(struct device parent,
		struct device_node *of_node,
		int topology_override);