From: Daniel Vetter Subject: Re: [PATCH 3/9] drm/i915: MIPI Port Ctrl related changes for dual link configuration Date: Tue, 21 Oct 2014 14:12:54 +0200 Message-ID: <20141021121254.GD26941@phenom.ffwll.local> References: <1411548418-26525-1-git-send-email-gaurav.k.singh@intel.com> <1411548418-26525-4-git-send-email-gaurav.k.singh@intel.com> <87d2almkpz.fsf@intel.com> <5445FD86.4060300@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTP id EB82489B48 for ; Tue, 21 Oct 2014 05:12:49 -0700 (PDT) Received: by mail-wg0-f52.google.com with SMTP id a1so1184442wgh.35 for ; Tue, 21 Oct 2014 05:12:49 -0700 (PDT) Content-Disposition: inline In-Reply-To: <5445FD86.4060300@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "Singh, Gaurav K" Cc: Shobhit Kumar , intel-gfx List-Id: intel-gfx@lists.freedesktop.org On Tue, Oct 21, 2014 at 12:00:30PM +0530, Singh, Gaurav K wrote: > > On 9/24/2014 2:57 PM, Jani Nikula wrote: > >On Wed, 24 Sep 2014, Gaurav K Singh wrote: > >>Signed-off-by: Gaurav K Singh > >>Signed-off-by: Shobhit Kumar > >>--- > >> drivers/gpu/drm/i915/i915_reg.h | 1 + > >> drivers/gpu/drm/i915/intel_dsi.c | 53 ++++++++++++++++++++++------ > >> drivers/gpu/drm/i915/intel_dsi.h | 1 + > >> drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 1 + > >> 4 files changed, 45 insertions(+), 11 deletions(-) > >> > >>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > >>index ad8179b..922d807 100644 > >>--- a/drivers/gpu/drm/i915/i915_reg.h > >>+++ b/drivers/gpu/drm/i915/i915_reg.h > >>@@ -6215,6 +6215,7 @@ enum punit_power_well { > >> #define DPI_ENABLE (1 << 31) /* A + B */ > >> #define MIPIA_MIPI4DPHY_DELAY_COUNT_SHIFT 27 > >> #define MIPIA_MIPI4DPHY_DELAY_COUNT_MASK (0xf << 27) > >>+#define DUAL_LINK_MODE_SHIFT 26 > >> #define DUAL_LINK_MODE_MASK (1 << 26) > >> #define DUAL_LINK_MODE_FRONT_BACK (0 << 26) > >> #define DUAL_LINK_MODE_PIXEL_ALTERNATIVE (1 << 26) > >>diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > >>index e456ca9..3b1890e 100644 > >>--- a/drivers/gpu/drm/i915/intel_dsi.c > >>+++ b/drivers/gpu/drm/i915/intel_dsi.c > >>@@ -109,13 +109,31 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder) > >> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > >> struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); > >> enum pipe pipe = intel_crtc->pipe; > >>- u32 temp; > >>- > >>- /* assert ip_tg_enable signal */ > >>- temp = I915_READ(MIPI_PORT_CTRL(pipe)) & ~LANE_CONFIGURATION_MASK; > >>- temp = temp | intel_dsi->port_bits; > >>- I915_WRITE(MIPI_PORT_CTRL(pipe), temp | DPI_ENABLE); > >>- POSTING_READ(MIPI_PORT_CTRL(pipe)); > >>+ u32 temp, port_control = 0; > >>+ > >>+ if (intel_dsi->dual_link) { > >>+ port_control = (intel_dsi->dual_link - 1) > >>+ << DUAL_LINK_MODE_SHIFT; > >>+ port_control |= pipe ? LANE_CONFIGURATION_DUAL_LINK_B : > >>+ LANE_CONFIGURATION_DUAL_LINK_A; > >>+ /*For Port A */ > >>+ temp = I915_READ(MIPI_PORT_CTRL(0)); > >>+ temp = temp | port_control; > >>+ I915_WRITE(MIPI_PORT_CTRL(0), temp | DPI_ENABLE); > >>+ POSTING_READ(MIPI_PORT_CTRL(0)); > >>+ > >>+ /* For Port C */ > >>+ temp = I915_READ(MIPI_PORT_CTRL(1)); > >>+ I915_WRITE(MIPI_PORT_CTRL(1), temp | DPI_ENABLE); > >>+ POSTING_READ(MIPI_PORT_CTRL(1)); > >This calls for a cleanup in i915_reg.h for per port vs. per transcoder > >registers. MIPI_PORT_CTRL(1) uses _TRANSCODER macro. We also have enum > >port with PORT_C == 2. This gets confusing. > > Are you suggesting to use _PORT macro instead of _TRANSCODER macro? I think so, and given that we already have some offenders the existing code should be converted with a prep patch first. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch