Commit df4b2233 authored by Lucas Stach's avatar Lucas Stach Committed by Philipp Zabel

drm/imx: fold ipu_plane_disable into ipu_disable_plane

ipu_disable_plane is the only left caller of ipu_plane_disable.
Having those 2 similar named functions is confusing and superfluous,
so fold them into 1.
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 8e3b16e2
...@@ -213,8 +213,12 @@ static void ipu_plane_enable(struct ipu_plane *ipu_plane) ...@@ -213,8 +213,12 @@ static void ipu_plane_enable(struct ipu_plane *ipu_plane)
ipu_dp_enable_channel(ipu_plane->dp); ipu_dp_enable_channel(ipu_plane->dp);
} }
static void ipu_plane_disable(struct ipu_plane *ipu_plane) static int ipu_disable_plane(struct drm_plane *plane)
{ {
struct ipu_plane *ipu_plane = to_ipu_plane(plane);
DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
ipu_idmac_wait_busy(ipu_plane->ipu_ch, 50); ipu_idmac_wait_busy(ipu_plane->ipu_ch, 50);
if (ipu_plane->dp) if (ipu_plane->dp)
...@@ -223,15 +227,6 @@ static void ipu_plane_disable(struct ipu_plane *ipu_plane) ...@@ -223,15 +227,6 @@ static void ipu_plane_disable(struct ipu_plane *ipu_plane)
ipu_dmfc_disable_channel(ipu_plane->dmfc); ipu_dmfc_disable_channel(ipu_plane->dmfc);
if (ipu_plane->dp) if (ipu_plane->dp)
ipu_dp_disable(ipu_plane->ipu); ipu_dp_disable(ipu_plane->ipu);
}
static int ipu_disable_plane(struct drm_plane *plane)
{
struct ipu_plane *ipu_plane = to_ipu_plane(plane);
DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
ipu_plane_disable(ipu_plane);
return 0; return 0;
} }
......
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