Commit 75217c2f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: use VBT backlight and CABC port definitions directly 



Drop the intermediate values stored in intel_dsi and use the VBT values
directly, now that they're conveniently stored in panel->vbt.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8b3765f1e1dc4d436b312016f72647e03ba49f94.1660664162.git.jani.nikula@intel.com
parent ab55165d

drivers/gpu/drm/i915/display/icl_dsi.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -2074,13 +2074,9 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) 
	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports))

	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports))

		intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports;

		intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports;





	intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports;



	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports))

	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports))

		intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;

		intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;





	intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports;



	for_each_dsi_port(port, intel_dsi->ports) {

	for_each_dsi_port(port, intel_dsi->ports) {

		struct intel_dsi_host *host;

		struct intel_dsi_host *host;

drivers/gpu/drm/i915/display/intel_dsi.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -89,9 +89,6 @@ struct intel_dsi { 
	u8 escape_clk_div;

	u8 escape_clk_div;

	u8 dual_link;

	u8 dual_link;





	u16 dcs_backlight_ports;

	u16 dcs_cabc_ports;



	/* RGB or BGR */

	/* RGB or BGR */

	bool bgr_enabled;

	bool bgr_enabled;

drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ static u32 dcs_get_backlight(struct intel_connector *connector, enum pipe unused 
	enum port port;

	enum port port;

	size_t len = panel->backlight.max > U8_MAX ? 2 : 1;

	size_t len = panel->backlight.max > U8_MAX ? 2 : 1;





	for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {

	for_each_dsi_port(port, panel->vbt.dsi.bl_ports) {

		dsi_device = intel_dsi->dsi_hosts[port]->device;

		dsi_device = intel_dsi->dsi_hosts[port]->device;

		mipi_dsi_dcs_read(dsi_device, MIPI_DCS_GET_DISPLAY_BRIGHTNESS,

		mipi_dsi_dcs_read(dsi_device, MIPI_DCS_GET_DISPLAY_BRIGHTNESS,

				  &data, len);

				  &data, len);
@@ -80,7 +80,7 @@ static void dcs_set_backlight(const struct drm_connector_state *conn_state, u32 
		data[1] = level;

		data[1] = level;

	}

	}





	for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {

	for_each_dsi_port(port, panel->vbt.dsi.bl_ports) {

		dsi_device = intel_dsi->dsi_hosts[port]->device;

		dsi_device = intel_dsi->dsi_hosts[port]->device;

		mode_flags = dsi_device->mode_flags;

		mode_flags = dsi_device->mode_flags;

		dsi_device->mode_flags &= ~MIPI_DSI_MODE_LPM;

		dsi_device->mode_flags &= ~MIPI_DSI_MODE_LPM;
@@ -93,12 +93,13 @@ static void dcs_set_backlight(const struct drm_connector_state *conn_state, u32 
static void dcs_disable_backlight(const struct drm_connector_state *conn_state, u32 level)

static void dcs_disable_backlight(const struct drm_connector_state *conn_state, u32 level)

{

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(conn_state->best_encoder));

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(conn_state->best_encoder));

	struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel;

	struct mipi_dsi_device *dsi_device;

	struct mipi_dsi_device *dsi_device;

	enum port port;

	enum port port;





	dcs_set_backlight(conn_state, 0);

	dcs_set_backlight(conn_state, 0);





	for_each_dsi_port(port, intel_dsi->dcs_cabc_ports) {

	for_each_dsi_port(port, panel->vbt.dsi.cabc_ports) {

		u8 cabc = POWER_SAVE_OFF;

		u8 cabc = POWER_SAVE_OFF;





		dsi_device = intel_dsi->dsi_hosts[port]->device;

		dsi_device = intel_dsi->dsi_hosts[port]->device;
@@ -106,7 +107,7 @@ static void dcs_disable_backlight(const struct drm_connector_state *conn_state, 
				   &cabc, sizeof(cabc));

				   &cabc, sizeof(cabc));

	}

	}





	for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {

	for_each_dsi_port(port, panel->vbt.dsi.bl_ports) {

		u8 ctrl = 0;

		u8 ctrl = 0;





		dsi_device = intel_dsi->dsi_hosts[port]->device;

		dsi_device = intel_dsi->dsi_hosts[port]->device;
@@ -127,10 +128,11 @@ static void dcs_enable_backlight(const struct intel_crtc_state *crtc_state, 
				 const struct drm_connector_state *conn_state, u32 level)

				 const struct drm_connector_state *conn_state, u32 level)

{

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(conn_state->best_encoder));

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(conn_state->best_encoder));

	struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel;

	struct mipi_dsi_device *dsi_device;

	struct mipi_dsi_device *dsi_device;

	enum port port;

	enum port port;





	for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {

	for_each_dsi_port(port, panel->vbt.dsi.bl_ports) {

		u8 ctrl = 0;

		u8 ctrl = 0;





		dsi_device = intel_dsi->dsi_hosts[port]->device;

		dsi_device = intel_dsi->dsi_hosts[port]->device;
@@ -146,7 +148,7 @@ static void dcs_enable_backlight(const struct intel_crtc_state *crtc_state, 
				   &ctrl, sizeof(ctrl));

				   &ctrl, sizeof(ctrl));

	}

	}





	for_each_dsi_port(port, intel_dsi->dcs_cabc_ports) {

	for_each_dsi_port(port, panel->vbt.dsi.cabc_ports) {

		u8 cabc = POWER_SAVE_MEDIUM;

		u8 cabc = POWER_SAVE_MEDIUM;





		dsi_device = intel_dsi->dsi_hosts[port]->device;

		dsi_device = intel_dsi->dsi_hosts[port]->device;

drivers/gpu/drm/i915/display/vlv_dsi.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1936,13 +1936,9 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) 
	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports))

	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports))

		intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports;

		intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports;





	intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports;



	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports))

	if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports))

		intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;

		intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;





	intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports;



	/* Create a DSI host (and a device) for each port. */

	/* Create a DSI host (and a device) for each port. */

	for_each_dsi_port(port, intel_dsi->ports) {

	for_each_dsi_port(port, intel_dsi->ports) {

		struct intel_dsi_host *host;

		struct intel_dsi_host *host;