Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[deliverable/linux.git] / drivers / gpu / drm / imx / ipuv3-plane.h

diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h
index 4448fd4ad4eb503422a750f374c6b20a64b9f643..338b88a74eb6e06fc94db173c7cac0be8700f758 100644 (file)
--- a/drivers/gpu/drm/imx/ipuv3-plane.h
+++ b/drivers/gpu/drm/imx/ipuv3-plane.h
@@ -23,17 +23,6 @@ struct ipu_plane {
 
        int                     dma;
        int                     dp_flow;
-
-       int                     x;
-       int                     y;
-       int                     w;
-       int                     h;
-
-       unsigned int            u_offset;
-       unsigned int            v_offset;
-       unsigned int            stride[2];
-
-       bool                    enabled;
 };
 
 struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
@@ -48,11 +37,6 @@ int ipu_plane_mode_set(struct ipu_plane *plane, struct drm_crtc *crtc,
                       uint32_t src_x, uint32_t src_y, uint32_t src_w,
                       uint32_t src_h, bool interlaced);
 
-void ipu_plane_enable(struct ipu_plane *plane);
-void ipu_plane_disable(struct ipu_plane *plane);
-int ipu_plane_set_base(struct ipu_plane *plane, struct drm_framebuffer *fb,
-                      int x, int y);
-
 int ipu_plane_get_resources(struct ipu_plane *plane);
 void ipu_plane_put_resources(struct ipu_plane *plane);