drm/omap: remove omap_overlay & omap_overlay_manager

Structs omap_overlay and omap_overlay_manager are not used, remove them.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 3cf42e5ddf3ee1c0abbffc4c2dac12d019446925..2768dc353ca26af7c57dda5549a6c000fb3ad965 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -59,7 +59,6 @@
 #define DISPC_IRQ_FRAMEDONE3           (1 << 30)
 
 struct omap_dss_device;
-struct omap_overlay_manager;
 struct dss_lcd_mgr_config;
 struct snd_aes_iec958;
 struct snd_cea_861_aud_if;
@@ -186,10 +185,6 @@ enum omap_overlay_caps {
        OMAP_DSS_OVL_CAP_REPLICATION = 1 << 5,
 };
 
-enum omap_overlay_manager_caps {
-       OMAP_DSS_DUMMY_VALUE, /* add a dummy value to prevent compiler error */
-};
-
 enum omap_dss_clk_source {
        OMAP_DSS_CLK_SRC_FCK = 0,               /* OMAP2/3: DSS1_ALWON_FCLK
                                                 * OMAP4: DSS_FCLK */
@@ -306,48 +301,6 @@ struct omap_overlay_info {
        u8 zorder;
 };
 
-struct omap_overlay {
-       struct kobject kobj;
-       struct list_head list;
-
-       /* static fields */
-       const char *name;
-       enum omap_plane_id id;
-       enum omap_color_mode supported_modes;
-       enum omap_overlay_caps caps;
-
-       /* dynamic fields */
-       struct omap_overlay_manager *manager;
-
-       /*
-        * The following functions do not block:
-        *
-        * is_enabled
-        * set_overlay_info
-        * get_overlay_info
-        *
-        * The rest of the functions may block and cannot be called from
-        * interrupt context
-        */
-
-       int (*enable)(struct omap_overlay *ovl);
-       int (*disable)(struct omap_overlay *ovl);
-       bool (*is_enabled)(struct omap_overlay *ovl);
-
-       int (*set_manager)(struct omap_overlay *ovl,
-               struct omap_overlay_manager *mgr);
-       int (*unset_manager)(struct omap_overlay *ovl);
-
-       int (*set_overlay_info)(struct omap_overlay *ovl,
-                       struct omap_overlay_info *info);
-       void (*get_overlay_info)(struct omap_overlay *ovl,
-                       struct omap_overlay_info *info);
-
-       int (*wait_for_go)(struct omap_overlay *ovl);
-
-       struct omap_dss_device *(*get_device)(struct omap_overlay *ovl);
-};
-
 struct omap_overlay_manager_info {
        u32 default_color;
 
@@ -361,47 +314,6 @@ struct omap_overlay_manager_info {
        struct omap_dss_cpr_coefs cpr_coefs;
 };
 
-struct omap_overlay_manager {
-       struct kobject kobj;
-
-       /* static fields */
-       const char *name;
-       enum omap_channel id;
-       enum omap_overlay_manager_caps caps;
-       struct list_head overlays;
-       enum omap_display_type supported_displays;
-       enum omap_dss_output_id supported_outputs;
-
-       /* dynamic fields */
-       struct omap_dss_device *output;
-
-       /*
-        * The following functions do not block:
-        *
-        * set_manager_info
-        * get_manager_info
-        * apply
-        *
-        * The rest of the functions may block and cannot be called from
-        * interrupt context
-        */
-
-       int (*set_output)(struct omap_overlay_manager *mgr,
-               struct omap_dss_device *output);
-       int (*unset_output)(struct omap_overlay_manager *mgr);
-
-       int (*set_manager_info)(struct omap_overlay_manager *mgr,
-                       struct omap_overlay_manager_info *info);
-       void (*get_manager_info)(struct omap_overlay_manager *mgr,
-                       struct omap_overlay_manager_info *info);
-
-       int (*apply)(struct omap_overlay_manager *mgr);
-       int (*wait_for_go)(struct omap_overlay_manager *mgr);
-       int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
-
-       struct omap_dss_device *(*get_device)(struct omap_overlay_manager *mgr);
-};
-
 /* 22 pins means 1 clk lane and 10 data lanes */
 #define OMAP_DSS_MAX_DSI_PINS 22
 
@@ -712,10 +624,8 @@ enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane_id plane
 
 
 int omap_dss_get_num_overlay_managers(void);
-struct omap_overlay_manager *omap_dss_get_overlay_manager(int num);
 
 int omap_dss_get_num_overlays(void);
-struct omap_overlay *omap_dss_get_overlay(int num);
 
 int omapdss_register_output(struct omap_dss_device *output);
 void omapdss_unregister_output(struct omap_dss_device *output);
@@ -727,7 +637,6 @@ int omapdss_output_set_device(struct omap_dss_device *out,
 int omapdss_output_unset_device(struct omap_dss_device *out);
 
 struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device *dssdev);
-struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev);
 
 void omapdss_default_get_timings(struct omap_dss_device *dssdev,
                                 struct videomode *vm);