|
@@ -1822,15 +1822,15 @@ void intel_flush_primary_plane(struct drm_i915_private *dev_priv,
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * intel_enable_plane - enable a display plane on a given pipe
|
|
|
+ * intel_enable_primary_plane - enable the primary plane on a given pipe
|
|
|
* @dev_priv: i915 private structure
|
|
|
* @plane: plane to enable
|
|
|
* @pipe: pipe being fed
|
|
|
*
|
|
|
* Enable @plane on @pipe, making sure that @pipe is running first.
|
|
|
*/
|
|
|
-static void intel_enable_plane(struct drm_i915_private *dev_priv,
|
|
|
- enum plane plane, enum pipe pipe)
|
|
|
+static void intel_enable_primary_plane(struct drm_i915_private *dev_priv,
|
|
|
+ enum plane plane, enum pipe pipe)
|
|
|
{
|
|
|
struct intel_crtc *intel_crtc =
|
|
|
to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
|
|
@@ -1853,15 +1853,15 @@ static void intel_enable_plane(struct drm_i915_private *dev_priv,
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * intel_disable_plane - disable a display plane
|
|
|
+ * intel_disable_primary_plane - disable the primary plane
|
|
|
* @dev_priv: i915 private structure
|
|
|
* @plane: plane to disable
|
|
|
* @pipe: pipe consuming the data
|
|
|
*
|
|
|
* Disable @plane; should be an independent operation.
|
|
|
*/
|
|
|
-static void intel_disable_plane(struct drm_i915_private *dev_priv,
|
|
|
- enum plane plane, enum pipe pipe)
|
|
|
+static void intel_disable_primary_plane(struct drm_i915_private *dev_priv,
|
|
|
+ enum plane plane, enum pipe pipe)
|
|
|
{
|
|
|
struct intel_crtc *intel_crtc =
|
|
|
to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
|
|
@@ -3451,7 +3451,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
|
|
|
intel_update_watermarks(crtc);
|
|
|
intel_enable_pipe(dev_priv, pipe,
|
|
|
intel_crtc->config.has_pch_encoder, false);
|
|
|
- intel_enable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_enable_primary_plane(dev_priv, plane, pipe);
|
|
|
intel_enable_planes(crtc);
|
|
|
intel_crtc_update_cursor(crtc, true);
|
|
|
|
|
@@ -3493,7 +3493,7 @@ static void haswell_crtc_enable_planes(struct drm_crtc *crtc)
|
|
|
int pipe = intel_crtc->pipe;
|
|
|
int plane = intel_crtc->plane;
|
|
|
|
|
|
- intel_enable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_enable_primary_plane(dev_priv, plane, pipe);
|
|
|
intel_enable_planes(crtc);
|
|
|
intel_crtc_update_cursor(crtc, true);
|
|
|
|
|
@@ -3523,7 +3523,7 @@ static void haswell_crtc_disable_planes(struct drm_crtc *crtc)
|
|
|
|
|
|
intel_crtc_update_cursor(crtc, false);
|
|
|
intel_disable_planes(crtc);
|
|
|
- intel_disable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_disable_primary_plane(dev_priv, plane, pipe);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -3662,7 +3662,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
|
|
|
|
|
|
intel_crtc_update_cursor(crtc, false);
|
|
|
intel_disable_planes(crtc);
|
|
|
- intel_disable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_disable_primary_plane(dev_priv, plane, pipe);
|
|
|
|
|
|
if (intel_crtc->config.has_pch_encoder)
|
|
|
intel_set_pch_fifo_underrun_reporting(dev, pipe, false);
|
|
@@ -3870,7 +3870,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
|
|
|
|
|
|
intel_update_watermarks(crtc);
|
|
|
intel_enable_pipe(dev_priv, pipe, false, is_dsi);
|
|
|
- intel_enable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_enable_primary_plane(dev_priv, plane, pipe);
|
|
|
intel_enable_planes(crtc);
|
|
|
intel_crtc_update_cursor(crtc, true);
|
|
|
|
|
@@ -3908,7 +3908,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
|
|
|
|
|
|
intel_update_watermarks(crtc);
|
|
|
intel_enable_pipe(dev_priv, pipe, false, false);
|
|
|
- intel_enable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_enable_primary_plane(dev_priv, plane, pipe);
|
|
|
intel_enable_planes(crtc);
|
|
|
/* The fixup needs to happen before cursor is enabled */
|
|
|
if (IS_G4X(dev))
|
|
@@ -3964,7 +3964,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
|
|
|
intel_crtc_dpms_overlay(intel_crtc, false);
|
|
|
intel_crtc_update_cursor(crtc, false);
|
|
|
intel_disable_planes(crtc);
|
|
|
- intel_disable_plane(dev_priv, plane, pipe);
|
|
|
+ intel_disable_primary_plane(dev_priv, plane, pipe);
|
|
|
|
|
|
intel_disable_pipe(dev_priv, pipe);
|
|
|
|