[PATCH 2.6.17-rc6-mm2 5/8] intelfb: RESEND - add preliminary i2c support

[PATCH 2.6.17-rc6-mm2 5/8] intelfb: RESEND - add preliminary i2c support

[Dennis Munsie]

From: Dennis Munsie <dmunsie@cecropia.com>

[05/07] intelfb: add output fields to dinfo.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>

---

 drivers/video/intelfb/intelfb.h |    9 +++++++++
 1 file changed, 9 insertions(+)

diff -Naurp -X linux-2.6.17-rc6-patched/Documentation/dontdiff linux-2.6.17-rc6-patched/drivers/video/intelfb/intelfb.h linux/drivers/video/intelfb/intelfb.h
--- linux-2.6.17-rc6-patched/drivers/video/intelfb/intelfb.h	2006-06-14 12:34:07.000000000 -0500
+++ linux/drivers/video/intelfb/intelfb.h	2006-06-14 12:34:55.000000000 -0500
@@ -119,6 +119,11 @@
 /* Intel agpgart driver */
 #define AGP_PHYSICAL_MEMORY     2
 
+/* store information about an Ixxx DVO */
+/* The i830->i865 use multiple DVOs with multiple i2cs */
+/* the i915, i945 have a single sDVO i2c bus - which is different */
+#define MAX_OUTPUTS 6
+
 /* these are outputs from the chip - integrated only 
    external chips are via DVO or SDVO output */
 #define INTELFB_OUTPUT_UNUSED 0
@@ -344,6 +349,10 @@ struct intelfb_info {
 	
 	/* index into plls */
 	int pll_index;
+
+	/* outputs */
+	int num_outputs;
+	struct intelfb_output_rec output[MAX_OUTPUTS];
 };
 
 #define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))