---

yaml
---
r: 37247
b: refs/heads/master
c: 399fb43
h: refs/heads/master
i:
  37245: 95986a3
  37243: cf0d16d
  37239: 5bc37cb
  37231: b48256d
  37215: 7affdda
  37183: beeb425
  37119: 59353a1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183b1214402a205bf6eea2030686249c7d365fd1
+refs/heads/master: 399fb4316ab4fe4c46d1e4ed8b12d56c94b4c251

trunk/drivers/video/intelfb/intelfb.h

@@ -119,6 +119,24 @@
 /* Intel agpgart driver */
 #define AGP_PHYSICAL_MEMORY     2
 
+/* these are outputs from the chip - integrated only
+   external chips are via DVO or SDVO output */
+#define INTELFB_OUTPUT_UNUSED 0
+#define INTELFB_OUTPUT_ANALOG 1
+#define INTELFB_OUTPUT_DVO 2
+#define INTELFB_OUTPUT_SDVO 3
+#define INTELFB_OUTPUT_LVDS 4
+#define INTELFB_OUTPUT_TVOUT 5
+
+#define INTELFB_DVO_CHIP_NONE 0
+#define INTELFB_DVO_CHIP_LVDS 1
+#define INTELFB_DVO_CHIP_TMDS 2
+#define INTELFB_DVO_CHIP_TVOUT 4
+
+#define INTELFB_OUTPUT_PIPE_NC  0
+#define INTELFB_OUTPUT_PIPE_A   1
+#define INTELFB_OUTPUT_PIPE_B   2
+
 /*** Data Types ***/
 
 /* supported chipsets */
@@ -221,6 +239,17 @@ struct intelfb_i2c_chan {
 };
 #endif
 
+struct intelfb_output_rec {
+    int type;
+    int pipe;
+    int flags;
+
+#ifdef CONFIG_FB_INTEL_I2C
+    struct intelfb_i2c_chan i2c_bus;
+    struct intelfb_i2c_chan ddc_bus;
+#endif
+};
+
 struct intelfb_vsync {
 	wait_queue_head_t wait;
 	unsigned int count;