aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/intel_dsi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index ef3df5e3d819..10ab68457ca8 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -360,12 +360,11 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder)
360 I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_ENTER); 360 I915_WRITE(MIPI_DEVICE_READY(port), ULPS_STATE_ENTER);
361 usleep_range(2500, 3000); 361 usleep_range(2500, 3000);
362 362
363 val = I915_READ(MIPI_PORT_CTRL(port));
364
365 /* Enable MIPI PHY transparent latch 363 /* Enable MIPI PHY transparent latch
366 * Common bit for both MIPI Port A & MIPI Port C 364 * Common bit for both MIPI Port A & MIPI Port C
367 * No similar bit in MIPI Port C reg 365 * No similar bit in MIPI Port C reg
368 */ 366 */
367 val = I915_READ(MIPI_PORT_CTRL(PORT_A));
369 I915_WRITE(MIPI_PORT_CTRL(PORT_A), val | LP_OUTPUT_HOLD); 368 I915_WRITE(MIPI_PORT_CTRL(PORT_A), val | LP_OUTPUT_HOLD);
370 usleep_range(1000, 1500); 369 usleep_range(1000, 1500);
371 370
@@ -543,10 +542,10 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
543 == 0x00000), 30)) 542 == 0x00000), 30))
544 DRM_ERROR("DSI LP not going Low\n"); 543 DRM_ERROR("DSI LP not going Low\n");
545 544
546 val = I915_READ(MIPI_PORT_CTRL(port));
547 /* Disable MIPI PHY transparent latch 545 /* Disable MIPI PHY transparent latch
548 * Common bit for both MIPI Port A & MIPI Port C 546 * Common bit for both MIPI Port A & MIPI Port C
549 */ 547 */
548 val = I915_READ(MIPI_PORT_CTRL(PORT_A));
550 I915_WRITE(MIPI_PORT_CTRL(PORT_A), val & ~LP_OUTPUT_HOLD); 549 I915_WRITE(MIPI_PORT_CTRL(PORT_A), val & ~LP_OUTPUT_HOLD);
551 usleep_range(1000, 1500); 550 usleep_range(1000, 1500);
552 551