Commit 0372264a authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter

drm/i915: pass intel_crtc as argument for intel_enable_pipe

We want to remove those 3 boolean arguments. This is the first step.
The "pipe" passed as the argument is always intel_crtc->pipe.

Also adjust the function documentation.
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3fddd407
...@@ -1746,21 +1746,20 @@ static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv) ...@@ -1746,21 +1746,20 @@ static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv)
/** /**
* intel_enable_pipe - enable a pipe, asserting requirements * intel_enable_pipe - enable a pipe, asserting requirements
* @dev_priv: i915 private structure * @crtc: crtc responsible for the pipe
* @pipe: pipe to enable
* @pch_port: on ILK+, is this pipe driving a PCH port or not * @pch_port: on ILK+, is this pipe driving a PCH port or not
* @dsi: output type is DSI
* @wait_for_vblank: whether we should for a vblank or not after enabling it
* *
* Enable @pipe, making sure that various hardware specific requirements * Enable @crtc's pipe, making sure that various hardware specific requirements
* are met, if applicable, e.g. PLL enabled, LVDS pairs enabled, etc. * are met, if applicable, e.g. PLL enabled, LVDS pairs enabled, etc.
*
* @pipe should be %PIPE_A or %PIPE_B.
*
* Will wait until the pipe is actually running (i.e. first vblank) before
* returning.
*/ */
static void intel_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, static void intel_enable_pipe(struct intel_crtc *crtc,
bool pch_port, bool dsi, bool wait_for_vblank) bool pch_port, bool dsi, bool wait_for_vblank)
{ {
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
enum pipe pipe = crtc->pipe;
enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv,
pipe); pipe);
enum pipe pch_transcoder; enum pipe pch_transcoder;
...@@ -3600,8 +3599,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) ...@@ -3600,8 +3599,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
intel_crtc_load_lut(crtc); intel_crtc_load_lut(crtc);
intel_update_watermarks(crtc); intel_update_watermarks(crtc);
intel_enable_pipe(dev_priv, pipe, intel_enable_pipe(intel_crtc, intel_crtc->config.has_pch_encoder, false,
intel_crtc->config.has_pch_encoder, false, true); true);
intel_enable_primary_plane(dev_priv, plane, pipe); intel_enable_primary_plane(dev_priv, plane, pipe);
intel_enable_planes(crtc); intel_enable_planes(crtc);
intel_crtc_update_cursor(crtc, true); intel_crtc_update_cursor(crtc, true);
...@@ -3746,8 +3745,8 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) ...@@ -3746,8 +3745,8 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
intel_ddi_enable_transcoder_func(crtc); intel_ddi_enable_transcoder_func(crtc);
intel_update_watermarks(crtc); intel_update_watermarks(crtc);
intel_enable_pipe(dev_priv, pipe, intel_enable_pipe(intel_crtc, intel_crtc->config.has_pch_encoder, false,
intel_crtc->config.has_pch_encoder, false, false); false);
if (intel_crtc->config.has_pch_encoder) if (intel_crtc->config.has_pch_encoder)
lpt_pch_enable(crtc); lpt_pch_enable(crtc);
...@@ -4172,7 +4171,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc) ...@@ -4172,7 +4171,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
intel_crtc_load_lut(crtc); intel_crtc_load_lut(crtc);
intel_update_watermarks(crtc); intel_update_watermarks(crtc);
intel_enable_pipe(dev_priv, pipe, false, is_dsi, true); intel_enable_pipe(intel_crtc, false, is_dsi, true);
intel_set_cpu_fifo_underrun_reporting(dev, pipe, true); intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);
intel_enable_primary_plane(dev_priv, plane, pipe); intel_enable_primary_plane(dev_priv, plane, pipe);
intel_enable_planes(crtc); intel_enable_planes(crtc);
...@@ -4211,7 +4210,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) ...@@ -4211,7 +4210,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
intel_crtc_load_lut(crtc); intel_crtc_load_lut(crtc);
intel_update_watermarks(crtc); intel_update_watermarks(crtc);
intel_enable_pipe(dev_priv, pipe, false, false, true); intel_enable_pipe(intel_crtc, false, false, true);
intel_set_cpu_fifo_underrun_reporting(dev, pipe, true); intel_set_cpu_fifo_underrun_reporting(dev, pipe, true);
intel_enable_primary_plane(dev_priv, plane, pipe); intel_enable_primary_plane(dev_priv, plane, pipe);
intel_enable_planes(crtc); intel_enable_planes(crtc);
......
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