4 files changed, 104 insertions, 6 deletions

diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h
index f0736cff2ca..55f534491a3 100644
--- a/include/video/s1d13xxxfb.h
+++ b/include/video/s1d13xxxfb.h
@@ -136,12 +136,6 @@
 #define S1DREG_DELAYOFF                 0xFFFE
 #define S1DREG_DELAYON                  0xFFFF
 
-#define BBLT_FIFO_EMPTY                 0x00
-#define BBLT_FIFO_NOT_EMPTY             0x40
-#define BBLT_FIFO_NOT_FULL              0x30
-#define BBLT_FIFO_HALF_FULL             0x20
-#define BBLT_FIFO_FULL                  0x10
-
 #define BBLT_SOLID_FILL                 0x0c
 
 
diff --git a/include/video/sh_mipi_dsi.h b/include/video/sh_mipi_dsi.h
index 18bca08f9f5..6cb95c977de 100644
--- a/include/video/sh_mipi_dsi.h
+++ b/include/video/sh_mipi_dsi.h
@@ -27,9 +27,15 @@ enum sh_mipi_dsi_data_fmt {
 
 struct sh_mobile_lcdc_chan_cfg;
 
+#define SH_MIPI_DSI_HSABM       (1 << 0)
+#define SH_MIPI_DSI_HSPBM       (1 << 1)
+
 struct sh_mipi_dsi_info {
         enum sh_mipi_dsi_data_fmt       data_format;
         struct sh_mobile_lcdc_chan_cfg  *lcd_chan;
+        unsigned long                   flags;
+        u32                             clksrc;
+        unsigned int                    vsynw_offset;
 };
 
 #endif
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 1e1aa54ab2e..b56932927d0 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -13,6 +13,7 @@
 
 struct sh_mobile_lcdc_chan_cfg;
 struct device;
+struct clk;
 
 /*
  * flags format
@@ -33,6 +34,8 @@ struct sh_mobile_hdmi_info {
         struct sh_mobile_lcdc_chan_cfg  *lcd_chan;
         struct device                   *lcd_dev;
         unsigned int                     flags;
+        long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,
+                                    unsigned long *parent_freq);
 };
 
 #endif
diff --git a/include/video/udlfb.h b/include/video/udlfb.h
new file mode 100644
index 00000000000..69d485a4a02
--- /dev/null
+++ b/include/video/udlfb.h
@@ -0,0 +1,95 @@
+#ifndef UDLFB_H
+#define UDLFB_H
+
+/*
+ * TODO: Propose standard fb.h ioctl for reporting damage,
+ * using _IOWR() and one of the existing area structs from fb.h
+ * Consider these ioctls deprecated, but they're still used by the
+ * DisplayLink X server as yet - need both to be modified in tandem
+ * when new ioctl(s) are ready.
+ */
+#define DLFB_IOCTL_RETURN_EDID   0xAD
+#define DLFB_IOCTL_REPORT_DAMAGE 0xAA
+struct dloarea {
+        int x, y;
+        int w, h;
+        int x2, y2;
+};
+
+struct urb_node {
+        struct list_head entry;
+        struct dlfb_data *dev;
+        struct delayed_work release_urb_work;
+        struct urb *urb;
+};
+
+struct urb_list {
+        struct list_head list;
+        spinlock_t lock;
+        struct semaphore limit_sem;
+        int available;
+        int count;
+        size_t size;
+};
+
+struct dlfb_data {
+        struct usb_device *udev;
+        struct device *gdev; /* &udev->dev */
+        struct fb_info *info;
+        struct urb_list urbs;
+        struct kref kref;
+        char *backing_buffer;
+        int fb_count;
+        bool virtualized; /* true when physical usb device not present */
+        struct delayed_work free_framebuffer_work;
+        atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */
+        atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */
+        char *edid; /* null until we read edid from hw or get from sysfs */
+        size_t edid_size;
+        int sku_pixel_limit;
+        int base16;
+        int base8;
+        u32 pseudo_palette[256];
+        /* blit-only rendering path metrics, exposed through sysfs */
+        atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
+        atomic_t bytes_identical; /* saved effort with backbuffer comparison */
+        atomic_t bytes_sent; /* to usb, after compression including overhead */
+        atomic_t cpu_kcycles_used; /* transpired during pixel processing */
+};
+
+#define NR_USB_REQUEST_I2C_SUB_IO 0x02
+#define NR_USB_REQUEST_CHANNEL 0x12
+
+/* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */
+#define BULK_SIZE 512
+#define MAX_TRANSFER (PAGE_SIZE*16 - BULK_SIZE)
+#define WRITES_IN_FLIGHT (4)
+
+#define MAX_VENDOR_DESCRIPTOR_SIZE 256
+
+#define GET_URB_TIMEOUT HZ
+#define FREE_URB_TIMEOUT (HZ*2)
+
+#define BPP                     2
+#define MAX_CMD_PIXELS          255
+
+#define RLX_HEADER_BYTES        7
+#define MIN_RLX_PIX_BYTES       4
+#define MIN_RLX_CMD_BYTES       (RLX_HEADER_BYTES + MIN_RLX_PIX_BYTES)
+
+#define RLE_HEADER_BYTES        6
+#define MIN_RLE_PIX_BYTES       3
+#define MIN_RLE_CMD_BYTES       (RLE_HEADER_BYTES + MIN_RLE_PIX_BYTES)
+
+#define RAW_HEADER_BYTES        6
+#define MIN_RAW_PIX_BYTES       2
+#define MIN_RAW_CMD_BYTES       (RAW_HEADER_BYTES + MIN_RAW_PIX_BYTES)
+
+#define DL_DEFIO_WRITE_DELAY    5 /* fb_deferred_io.delay in jiffies */
+#define DL_DEFIO_WRITE_DISABLE  (HZ*60) /* "disable" with long delay */
+
+/* remove these once align.h patch is taken into kernel */
+#define DL_ALIGN_UP(x, a) ALIGN(x, a)
+#define DL_ALIGN_DOWN(x, a) ALIGN(x-(a-1), a)
+
+#endif