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

Commit baeac68a authored by Shashank Sharma's avatar Shashank Sharma Committed by Daniel Vetter
Browse files

drm/i915/bxt: get_hw_state for BXT 



Pick appropriate port control register (BXT or VLV), based on device.
Get the current hw state wrt Mipi port.

v2: Rebased on latest drm nightly branch.

v3: Removed the GET_DSI_PORT_CTRL Macro for consistency with earlier
    implementations as per Jani's suggestion.

Signed-off-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b389a45c

drivers/gpu/drm/i915/intel_dsi.c

+4 −3
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, 
	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct drm_device *dev = encoder->base.dev;

	enum intel_display_power_domain power_domain;

	u32 dpi_enabled, func;

	u32 dpi_enabled, func, ctrl_reg;

	enum port port;



	DRM_DEBUG_KMS("\n");
@@ -668,8 +668,9 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, 
	/* XXX: this only works for one DSI output */

	for_each_dsi_port(port, intel_dsi->ports) {

		func = I915_READ(MIPI_DSI_FUNC_PRG(port));

		dpi_enabled = I915_READ(MIPI_PORT_CTRL(port)) &

							DPI_ENABLE;

		ctrl_reg = IS_BROXTON(dev) ? BXT_MIPI_PORT_CTRL(port) :

						MIPI_PORT_CTRL(port);

		dpi_enabled = I915_READ(ctrl_reg) & DPI_ENABLE;



		/* Due to some hardware limitations on BYT, MIPI Port C DPI

		 * Enable bit does not get set. To check whether DSI Port C