1 files changed, 16 insertions, 53 deletions

diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h
index 8fe2064dd804..2784ac442368 100644
--- a/drivers/gpu/drm/i915/intel_dsi.h
+++ b/drivers/gpu/drm/i915/intel_dsi.h
@@ -26,6 +26,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_mipi_dsi.h>
 #include "intel_drv.h"
 
 /* Dual Link support */
@@ -33,53 +34,13 @@
 #define DSI_DUAL_LINK_FRONT_BACK        1
 #define DSI_DUAL_LINK_PIXEL_ALT         2
 
-struct intel_dsi_device {
-        unsigned int panel_id;
-        const char *name;
-        const struct intel_dsi_dev_ops *dev_ops;
-        void *dev_priv;
-};
-
-struct intel_dsi_dev_ops {
-        bool (*init)(struct intel_dsi_device *dsi);
-
-        void (*panel_reset)(struct intel_dsi_device *dsi);
-
-        void (*disable_panel_power)(struct intel_dsi_device *dsi);
-
-        /* one time programmable commands if needed */
-        void (*send_otp_cmds)(struct intel_dsi_device *dsi);
-
-        /* This callback must be able to assume DSI commands can be sent */
-        void (*enable)(struct intel_dsi_device *dsi);
-
-        /* This callback must be able to assume DSI commands can be sent */
-        void (*disable)(struct intel_dsi_device *dsi);
-
-        int (*mode_valid)(struct intel_dsi_device *dsi,
-                          struct drm_display_mode *mode);
-
-        bool (*mode_fixup)(struct intel_dsi_device *dsi,
-                           const struct drm_display_mode *mode,
-                           struct drm_display_mode *adjusted_mode);
-
-        void (*mode_set)(struct intel_dsi_device *dsi,
-                         struct drm_display_mode *mode,
-                         struct drm_display_mode *adjusted_mode);
-
-        enum drm_connector_status (*detect)(struct intel_dsi_device *dsi);
-
-        bool (*get_hw_state)(struct intel_dsi_device *dev);
-
-        struct drm_display_mode *(*get_modes)(struct intel_dsi_device *dsi);
-
-        void (*destroy) (struct intel_dsi_device *dsi);
-};
+struct intel_dsi_host;
 
 struct intel_dsi {
         struct intel_encoder base;
 
-        struct intel_dsi_device dev;
+        struct drm_panel *panel;
+        struct intel_dsi_host *dsi_hosts[I915_MAX_PORTS];
 
         struct intel_connector *attached_connector;
 
@@ -137,16 +98,18 @@ struct intel_dsi {
         u16 panel_pwr_cycle_delay;
 };
 
-/* XXX: Transitional before dual port configuration */
-static inline enum port intel_dsi_pipe_to_port(enum pipe pipe)
-{
-        if (pipe == PIPE_A)
-                return PORT_A;
-        else if (pipe == PIPE_B)
-                return PORT_C;
+struct intel_dsi_host {
+        struct mipi_dsi_host base;
+        struct intel_dsi *intel_dsi;
+        enum port port;
+
+        /* our little hack */
+        struct mipi_dsi_device *device;
+};
 
-        WARN(1, "DSI on pipe %c, assuming port C\n", pipe_name(pipe));
-        return PORT_C;
+static inline struct intel_dsi_host *to_intel_dsi_host(struct mipi_dsi_host *h)
+{
+        return container_of(h, struct intel_dsi_host, base);
 }
 
 #define for_each_dsi_port(__port, __ports_mask) \
@@ -162,6 +125,6 @@ extern void vlv_enable_dsi_pll(struct intel_encoder *encoder);
 extern void vlv_disable_dsi_pll(struct intel_encoder *encoder);
 extern u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp);
 
-extern struct intel_dsi_dev_ops vbt_generic_dsi_display_ops;
+struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id);
 
 #endif /* _INTEL_DSI_H */