Commit 7f3de833 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Align intel_dsi*.c files a bit

I'm not really that insisting on checkpath compliance, but ragged
function paramter alignment does get me. Please adjust your editor to
just do this for you.

Cc: Shobhit Kumar <shobhit.kumar@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7f0c8605
...@@ -184,7 +184,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder) ...@@ -184,7 +184,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
/* update the hw state for DPLL */ /* update the hw state for DPLL */
intel_crtc->config.dpll_hw_state.dpll = DPLL_INTEGRATED_CLOCK_VLV | intel_crtc->config.dpll_hw_state.dpll = DPLL_INTEGRATED_CLOCK_VLV |
DPLL_REFA_CLK_ENABLE_VLV; DPLL_REFA_CLK_ENABLE_VLV;
tmp = I915_READ(DSPCLK_GATE_D); tmp = I915_READ(DSPCLK_GATE_D);
tmp |= DPOUNIT_CLOCK_GATE_DISABLE; tmp |= DPOUNIT_CLOCK_GATE_DISABLE;
...@@ -259,8 +259,8 @@ static void intel_dsi_disable(struct intel_encoder *encoder) ...@@ -259,8 +259,8 @@ static void intel_dsi_disable(struct intel_encoder *encoder)
temp = I915_READ(MIPI_CTRL(pipe)); temp = I915_READ(MIPI_CTRL(pipe));
temp &= ~ESCAPE_CLOCK_DIVIDER_MASK; temp &= ~ESCAPE_CLOCK_DIVIDER_MASK;
I915_WRITE(MIPI_CTRL(pipe), temp | I915_WRITE(MIPI_CTRL(pipe), temp |
intel_dsi->escape_clk_div << intel_dsi->escape_clk_div <<
ESCAPE_CLOCK_DIVIDER_SHIFT); ESCAPE_CLOCK_DIVIDER_SHIFT);
I915_WRITE(MIPI_EOT_DISABLE(pipe), CLOCKSTOP); I915_WRITE(MIPI_EOT_DISABLE(pipe), CLOCKSTOP);
...@@ -297,7 +297,7 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) ...@@ -297,7 +297,7 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
usleep_range(2000, 2500); usleep_range(2000, 2500);
if (wait_for(((I915_READ(MIPI_PORT_CTRL(pipe)) & AFE_LATCHOUT) if (wait_for(((I915_READ(MIPI_PORT_CTRL(pipe)) & AFE_LATCHOUT)
== 0x00000), 30)) == 0x00000), 30))
DRM_ERROR("DSI LP not going Low\n"); DRM_ERROR("DSI LP not going Low\n");
val = I915_READ(MIPI_PORT_CTRL(pipe)); val = I915_READ(MIPI_PORT_CTRL(pipe));
...@@ -427,7 +427,7 @@ static u16 txbyteclkhs(u16 pixels, int bpp, int lane_count, ...@@ -427,7 +427,7 @@ static u16 txbyteclkhs(u16 pixels, int bpp, int lane_count,
u16 burst_mode_ratio) u16 burst_mode_ratio)
{ {
return DIV_ROUND_UP(DIV_ROUND_UP(pixels * bpp * burst_mode_ratio, return DIV_ROUND_UP(DIV_ROUND_UP(pixels * bpp * burst_mode_ratio,
8 * 100), lane_count); 8 * 100), lane_count);
} }
static void set_dsi_timings(struct drm_encoder *encoder, static void set_dsi_timings(struct drm_encoder *encoder,
...@@ -454,10 +454,10 @@ static void set_dsi_timings(struct drm_encoder *encoder, ...@@ -454,10 +454,10 @@ static void set_dsi_timings(struct drm_encoder *encoder,
/* horizontal values are in terms of high speed byte clock */ /* horizontal values are in terms of high speed byte clock */
hactive = txbyteclkhs(hactive, bpp, lane_count, hactive = txbyteclkhs(hactive, bpp, lane_count,
intel_dsi->burst_mode_ratio); intel_dsi->burst_mode_ratio);
hfp = txbyteclkhs(hfp, bpp, lane_count, intel_dsi->burst_mode_ratio); hfp = txbyteclkhs(hfp, bpp, lane_count, intel_dsi->burst_mode_ratio);
hsync = txbyteclkhs(hsync, bpp, lane_count, hsync = txbyteclkhs(hsync, bpp, lane_count,
intel_dsi->burst_mode_ratio); intel_dsi->burst_mode_ratio);
hbp = txbyteclkhs(hbp, bpp, lane_count, intel_dsi->burst_mode_ratio); hbp = txbyteclkhs(hbp, bpp, lane_count, intel_dsi->burst_mode_ratio);
I915_WRITE(MIPI_HACTIVE_AREA_COUNT(pipe), hactive); I915_WRITE(MIPI_HACTIVE_AREA_COUNT(pipe), hactive);
...@@ -582,7 +582,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) ...@@ -582,7 +582,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
* XXX: write MIPI_STOP_STATE_STALL? * XXX: write MIPI_STOP_STATE_STALL?
*/ */
I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe), I915_WRITE(MIPI_HIGH_LOW_SWITCH_COUNT(pipe),
intel_dsi->hs_to_lp_count); intel_dsi->hs_to_lp_count);
/* XXX: low power clock equivalence in terms of byte clock. the number /* XXX: low power clock equivalence in terms of byte clock. the number
* of byte clocks occupied in one low power clock. based on txbyteclkhs * of byte clocks occupied in one low power clock. based on txbyteclkhs
...@@ -607,10 +607,10 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) ...@@ -607,10 +607,10 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
* 64 like 1366 x 768. Enable RANDOM resolution support for such * 64 like 1366 x 768. Enable RANDOM resolution support for such
* panels by default */ * panels by default */
I915_WRITE(MIPI_VIDEO_MODE_FORMAT(pipe), I915_WRITE(MIPI_VIDEO_MODE_FORMAT(pipe),
intel_dsi->video_frmt_cfg_bits | intel_dsi->video_frmt_cfg_bits |
intel_dsi->video_mode_format | intel_dsi->video_mode_format |
IP_TG_CONFIG | IP_TG_CONFIG |
RANDOM_DPI_DISPLAY_RESOLUTION); RANDOM_DPI_DISPLAY_RESOLUTION);
} }
static void intel_dsi_pre_pll_enable(struct intel_encoder *encoder) static void intel_dsi_pre_pll_enable(struct intel_encoder *encoder)
......
...@@ -430,7 +430,7 @@ void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi) ...@@ -430,7 +430,7 @@ void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi)
u32 mask; u32 mask;
mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY | mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |
LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY; LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;
if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 100)) if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(pipe)) & mask) == mask, 100))
DRM_ERROR("DPI FIFOs are not empty\n"); DRM_ERROR("DPI FIFOs are not empty\n");
......
...@@ -190,7 +190,7 @@ static int dsi_calc_mnp(u32 dsi_clk, struct dsi_mnp *dsi_mnp) ...@@ -190,7 +190,7 @@ static int dsi_calc_mnp(u32 dsi_clk, struct dsi_mnp *dsi_mnp)
for (m = 62; m <= 92; m++) { for (m = 62; m <= 92; m++) {
for (p = 2; p <= 6; p++) { for (p = 2; p <= 6; p++) {
/* Find the optimal m and p divisors /* Find the optimal m and p divisors
with minimal error +/- the required clock */ with minimal error +/- the required clock */
calc_dsi_clk = (m * ref_clk) / p; calc_dsi_clk = (m * ref_clk) / p;
if (calc_dsi_clk == target_dsi_clk) { if (calc_dsi_clk == target_dsi_clk) {
calc_m = m; calc_m = m;
...@@ -233,7 +233,7 @@ static void vlv_configure_dsi_pll(struct intel_encoder *encoder) ...@@ -233,7 +233,7 @@ static void vlv_configure_dsi_pll(struct intel_encoder *encoder)
u32 dsi_clk; u32 dsi_clk;
dsi_clk = dsi_clk_from_pclk(intel_dsi->pclk, intel_dsi->pixel_format, dsi_clk = dsi_clk_from_pclk(intel_dsi->pclk, intel_dsi->pixel_format,
intel_dsi->lane_count); intel_dsi->lane_count);
ret = dsi_calc_mnp(dsi_clk, &dsi_mnp); ret = dsi_calc_mnp(dsi_clk, &dsi_mnp);
if (ret) { if (ret) {
...@@ -315,8 +315,8 @@ static void assert_bpp_mismatch(int pixel_format, int pipe_bpp) ...@@ -315,8 +315,8 @@ static void assert_bpp_mismatch(int pixel_format, int pipe_bpp)
} }
WARN(bpp != pipe_bpp, WARN(bpp != pipe_bpp,
"bpp match assertion failure (expected %d, current %d)\n", "bpp match assertion failure (expected %d, current %d)\n",
bpp, pipe_bpp); bpp, pipe_bpp);
} }
u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp) u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment