Merge tag 'hardening-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / mediatek / mtk_drm_drv.h

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index 7b37b5c..eb2fd45 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -11,6 +11,8 @@
 
 #define MAX_CRTC       3
 #define MAX_CONNECTOR  2
+#define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
+#define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)
 
 struct device;
 struct device_node;
@@ -21,35 +23,33 @@ struct drm_property;
 struct regmap;
 
 struct mtk_mmsys_driver_data {
-       const resource_size_t io_start;
-       const enum mtk_ddp_comp_id *main_path;
+       const unsigned int *main_path;
        unsigned int main_len;
-       const enum mtk_ddp_comp_id *ext_path;
+       const unsigned int *ext_path;
        unsigned int ext_len;
-       const enum mtk_ddp_comp_id *third_path;
+       const unsigned int *third_path;
        unsigned int third_len;
 
        bool shadow_register;
-};
-
-struct mtk_mmsys_match_data {
-       unsigned short num_drv_data;
-       const struct mtk_mmsys_driver_data *drv_data[];
+       unsigned int mmsys_id;
+       unsigned int mmsys_dev_num;
 };
 
 struct mtk_drm_private {
        struct drm_device *drm;
        struct device *dma_dev;
-
-       unsigned int num_pipes;
-
+       bool mtk_drm_bound;
+       bool drm_master;
+       struct device *dev;
        struct device_node *mutex_node;
        struct device *mutex_dev;
        struct device *mmsys_dev;
-       struct device_node *comp_node[DDP_COMPONENT_ID_MAX];
-       struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_ID_MAX];
+       struct device_node *comp_node[DDP_COMPONENT_DRM_ID_MAX];
+       struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_DRM_ID_MAX];
        const struct mtk_mmsys_driver_data *data;
        struct drm_atomic_state *suspend_state;
+       unsigned int mbox_index;
+       struct mtk_drm_private **all_drm_private;
 };
 
 extern struct platform_driver mtk_disp_aal_driver;
@@ -57,10 +57,12 @@ extern struct platform_driver mtk_disp_ccorr_driver;
 extern struct platform_driver mtk_disp_color_driver;
 extern struct platform_driver mtk_disp_gamma_driver;
 extern struct platform_driver mtk_disp_merge_driver;
+extern struct platform_driver mtk_disp_ovl_adaptor_driver;
 extern struct platform_driver mtk_disp_ovl_driver;
 extern struct platform_driver mtk_disp_rdma_driver;
 extern struct platform_driver mtk_dpi_driver;
 extern struct platform_driver mtk_dsi_driver;
+extern struct platform_driver mtk_ethdr_driver;
 extern struct platform_driver mtk_mdp_rdma_driver;
 
 #endif /* MTK_DRM_DRV_H */