[Intel-gfx] [PATCH 1/2]i830_display.c:define related parameter and limit items for G4x platform

Ma Ling ling.ma at intel.com
Thu Mar 5 07:15:42 CET 2009


append additional limit items for SDVO, HDMI&DAC, Single LVDS and Dual LVDS under G4x platform.

---
 src/i830_display.c |  156 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 155 insertions(+), 1 deletions(-)

diff --git a/src/i830_display.c b/src/i830_display.c
index e243bfd..94f7c37 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -153,6 +153,88 @@ typedef struct {
 #define INTEL_LIMIT_I9XX_LVDS	    3
 #define INTEL_LIMIT_IGD_SDVO_DAC    4
 #define INTEL_LIMIT_IGD_LVDS	    5
+#define INTEL_LIMIT_IG4X_SDVO	    6
+#define INTEL_LIMIT_IG4X_HDMI_DAC   7
+#define INTEL_LIMIT_IG4X_SIN_LVDS   8
+#define INTEL_LIMIT_IG4X_DUA_LVDS   9
+
+/*The parameter is for SDVO on G4x platform*/
+#define IG4X_VCO_MIN                1750000
+#define IG4X_VCO_MAX                3500000
+#define IG4X_DOT_SDVO_MIN           25000
+#define IG4X_DOT_SDVO_MAX           270000
+#define IG4X_N_SDVO_MIN             1
+#define IG4X_N_SDVO_MAX             4
+#define IG4X_M_SDVO_MIN             104
+#define IG4X_M_SDVO_MAX             138
+#define IG4X_M1_SDVO_MIN            17
+#define IG4X_M1_SDVO_MAX            23
+#define IG4X_M2_SDVO_MIN            5
+#define IG4X_M2_SDVO_MAX            11
+#define IG4X_P_SDVO_MIN             10
+#define IG4X_P_SDVO_MAX             30
+#define IG4X_P1_SDVO_MIN            1
+#define IG4X_P1_SDVO_MAX            3
+#define IG4X_P2_SDVO_SLOW           10
+#define IG4X_P2_SDVO_FAST           10
+#define IG4X_P2_SDVO_LIMIT          270000
+
+/*The parameter is for HDMI_DAC on G4x platform*/
+#define IG4X_DOT_HDMI_DAC_MIN           20000
+#define IG4X_DOT_HDMI_DAC_MAX           400000
+#define IG4X_N_HDMI_DAC_MIN             1
+#define IG4X_N_HDMI_DAC_MAX             4
+#define IG4X_M_HDMI_DAC_MIN             104
+#define IG4X_M_HDMI_DAC_MAX             138
+#define IG4X_M1_HDMI_DAC_MIN            16
+#define IG4X_M1_HDMI_DAC_MAX            23
+#define IG4X_M2_HDMI_DAC_MIN            5
+#define IG4X_M2_HDMI_DAC_MAX            11
+#define IG4X_P_HDMI_DAC_MIN             5
+#define IG4X_P_HDMI_DAC_MAX             80
+#define IG4X_P1_HDMI_DAC_MIN            1
+#define IG4X_P1_HDMI_DAC_MAX            8
+#define IG4X_P2_HDMI_DAC_SLOW           10
+#define IG4X_P2_HDMI_DAC_FAST           5
+#define IG4X_P2_HDMI_DAC_LIMIT          165000
+
+/*The parameter is for SIN_LVDS on G4x platform*/
+#define IG4X_DOT_SIN_LVDS_MIN           20000
+#define IG4X_DOT_SIN_LVDS_MAX           115000
+#define IG4X_N_SIN_LVDS_MIN             1
+#define IG4X_N_SIN_LVDS_MAX             3
+#define IG4X_M_SIN_LVDS_MIN             104
+#define IG4X_M_SIN_LVDS_MAX             138
+#define IG4X_M1_SIN_LVDS_MIN            17
+#define IG4X_M1_SIN_LVDS_MAX            23
+#define IG4X_M2_SIN_LVDS_MIN            5
+#define IG4X_M2_SIN_LVDS_MAX            11
+#define IG4X_P_SIN_LVDS_MIN             28
+#define IG4X_P_SIN_LVDS_MAX             112
+#define IG4X_P1_SIN_LVDS_MIN            2
+#define IG4X_P1_SIN_LVDS_MAX            8
+#define IG4X_P2_SIN_LVDS_SLOW           14
+#define IG4X_P2_SIN_LVDS_FAST           14
+#define IG4X_P2_SIN_LVDS_LIMIT          0
+
+/*The parameter is for DUA_LVDS on G4x platform*/
+#define IG4X_DOT_DUA_LVDS_MIN           80000
+#define IG4X_DOT_DUA_LVDS_MAX           224000
+#define IG4X_N_DUA_LVDS_MIN             1
+#define IG4X_N_DUA_LVDS_MAX             3
+#define IG4X_M_DUA_LVDS_MIN             104
+#define IG4X_M_DUA_LVDS_MAX             138
+#define IG4X_M1_DUA_LVDS_MIN            17
+#define IG4X_M1_DUA_LVDS_MAX            23
+#define IG4X_M2_DUA_LVDS_MIN            5
+#define IG4X_M2_DUA_LVDS_MAX            11
+#define IG4X_P_DUA_LVDS_MIN             14
+#define IG4X_P_DUA_LVDS_MAX             42
+#define IG4X_P1_DUA_LVDS_MIN            2
+#define IG4X_P1_DUA_LVDS_MAX            6
+#define IG4X_P2_DUA_LVDS_SLOW           7
+#define IG4X_P2_DUA_LVDS_FAST           7
+#define IG4X_P2_DUA_LVDS_LIMIT          0
 
 static const intel_limit_t intel_limits[] = {
     { /* INTEL_LIMIT_I8XX_DVO_DAC */
@@ -231,6 +313,63 @@ static const intel_limit_t intel_limits[] = {
 	.p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_LVDS_SLOW,	.p2_fast = I9XX_P2_LVDS_SLOW },
     },
+    /* below parameter and function is for EagleLake and Cantig Chipset Family*/
+    { /* INTEL_LIMIT_EL_AND_CTG_SDVO */
+	.dot = { .min = IG4X_DOT_SDVO_MIN,	.max = IG4X_DOT_SDVO_MAX },
+	.vco = { .min = IG4X_VCO_MIN,	        .max = IG4X_VCO_MAX},
+	.n   = { .min = IG4X_N_SDVO_MIN,	.max = IG4X_N_SDVO_MAX },
+	.m   = { .min = IG4X_M_SDVO_MIN,	.max = IG4X_M_SDVO_MAX },
+	.m1  = { .min = IG4X_M1_SDVO_MIN,	.max = IG4X_M1_SDVO_MAX },
+	.m2  = { .min = IG4X_M2_SDVO_MIN,	.max = IG4X_M2_SDVO_MAX },
+	.p   = { .min = IG4X_P_SDVO_MIN,	.max = IG4X_P_SDVO_MAX },
+	.p1  = { .min = IG4X_P1_SDVO_MIN,	.max = IG4X_P1_SDVO_MAX},
+	.p2  = { .dot_limit = IG4X_P2_SDVO_LIMIT,
+	    .p2_slow = IG4X_P2_SDVO_SLOW,
+	    .p2_fast = IG4X_P2_SDVO_FAST
+	},
+    },
+    { /* INTEL_LIMIT_EL_AND_CTG_HDMI_DAC */
+	.dot = { .min = IG4X_DOT_HDMI_DAC_MIN,	.max = IG4X_DOT_HDMI_DAC_MAX },
+	.vco = { .min = IG4X_VCO_MIN,	        .max = IG4X_VCO_MAX},
+	.n   = { .min = IG4X_N_HDMI_DAC_MIN,	.max = IG4X_N_HDMI_DAC_MAX },
+	.m   = { .min = IG4X_M_HDMI_DAC_MIN,	.max = IG4X_M_HDMI_DAC_MAX },
+	.m1  = { .min = IG4X_M1_HDMI_DAC_MIN,	.max = IG4X_M1_HDMI_DAC_MAX },
+	.m2  = { .min = IG4X_M2_HDMI_DAC_MIN,	.max = IG4X_M2_HDMI_DAC_MAX },
+	.p   = { .min = IG4X_P_HDMI_DAC_MIN,	.max = IG4X_P_HDMI_DAC_MAX },
+	.p1  = { .min = IG4X_P1_HDMI_DAC_MIN,	.max = IG4X_P1_HDMI_DAC_MAX},
+	.p2  = { .dot_limit = IG4X_P2_HDMI_DAC_LIMIT,
+	    .p2_slow = IG4X_P2_HDMI_DAC_SLOW,
+	    .p2_fast = IG4X_P2_HDMI_DAC_FAST
+	},
+    },
+    { /* INTEL_LIMIT_EL_AND_CTG_SIN_LVDS */
+	.dot = { .min = IG4X_DOT_SIN_LVDS_MIN,	.max = IG4X_DOT_SIN_LVDS_MAX },
+	.vco = { .min = IG4X_VCO_MIN,	        .max = IG4X_VCO_MAX},
+	.n   = { .min = IG4X_N_SIN_LVDS_MIN,	.max = IG4X_N_SIN_LVDS_MAX },
+	.m   = { .min = IG4X_M_SIN_LVDS_MIN,	.max = IG4X_M_SIN_LVDS_MAX },
+	.m1  = { .min = IG4X_M1_SIN_LVDS_MIN,	.max = IG4X_M1_SIN_LVDS_MAX },
+	.m2  = { .min = IG4X_M2_SIN_LVDS_MIN,	.max = IG4X_M2_SIN_LVDS_MAX },
+	.p   = { .min = IG4X_P_SIN_LVDS_MIN,	.max = IG4X_P_SIN_LVDS_MAX },
+	.p1  = { .min = IG4X_P1_SIN_LVDS_MIN,	.max = IG4X_P1_SIN_LVDS_MAX},
+	.p2  = { .dot_limit = IG4X_P2_SIN_LVDS_LIMIT,
+	    .p2_slow = IG4X_P2_SIN_LVDS_SLOW,
+	    .p2_fast = IG4X_P2_SIN_LVDS_FAST
+	},
+    },
+    { /* INTEL_LIMIT_EL_AND_CTG_DUA_LVDS */
+	.dot = { .min = IG4X_DOT_DUA_LVDS_MIN,  .max = IG4X_DOT_DUA_LVDS_MAX },
+	.vco = { .min = IG4X_VCO_MIN,           .max = IG4X_VCO_MAX},
+	.n   = { .min = IG4X_N_DUA_LVDS_MIN,    .max = IG4X_N_DUA_LVDS_MAX },
+	.m   = { .min = IG4X_M_DUA_LVDS_MIN,    .max = IG4X_M_DUA_LVDS_MAX },
+	.m1  = { .min = IG4X_M1_DUA_LVDS_MIN,   .max = IG4X_M1_DUA_LVDS_MAX },
+	.m2  = { .min = IG4X_M2_DUA_LVDS_MIN,   .max = IG4X_M2_DUA_LVDS_MAX },
+	.p   = { .min = IG4X_P_DUA_LVDS_MIN,    .max = IG4X_P_DUA_LVDS_MAX },
+	.p1  = { .min = IG4X_P1_DUA_LVDS_MIN,   .max = IG4X_P1_DUA_LVDS_MAX},
+	.p2  = { .dot_limit = IG4X_P2_DUA_LVDS_LIMIT,
+	    .p2_slow = IG4X_P2_DUA_LVDS_SLOW,
+	    .p2_fast = IG4X_P2_DUA_LVDS_FAST
+	},
+     },
 };
 
 static const intel_limit_t *intel_limit (xf86CrtcPtr crtc)
@@ -239,7 +378,22 @@ static const intel_limit_t *intel_limit (xf86CrtcPtr crtc)
     I830Ptr	pI830 = I830PTR(pScrn);
     const intel_limit_t *limit;
 
-    if (IS_I9XX(pI830) && !IS_IGD(pI830)) {
+    if (IS_G4X(pI830)){
+	if (i830PipeHasType (crtc, I830_OUTPUT_LVDS)) {
+	    if ((INREG(LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP) {
+		/*LVDS with dual channel*/
+		limit = &intel_limits[INTEL_LIMIT_IG4X_DUA_LVDS];
+	    } else /*LVDS with single channel*/
+		limit = &intel_limits[INTEL_LIMIT_IG4X_SIN_LVDS];
+	} else if (i830PipeHasType (crtc, I830_OUTPUT_HDMI) ||
+		i830PipeHasType (crtc, I830_OUTPUT_ANALOG)) {
+	    limit = &intel_limits[INTEL_LIMIT_IG4X_HDMI_DAC];
+	} else if (i830PipeHasType (crtc, I830_OUTPUT_SDVO)) {
+	    limit = &intel_limits[INTEL_LIMIT_IG4X_SDVO];
+	} else /*The option is for other outputs*/
+	    limit = &intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC];
+
+    } else if (IS_I9XX(pI830) && !IS_IGD(pI830)) {
 	if (i830PipeHasType (crtc, I830_OUTPUT_LVDS))
 	    limit = &intel_limits[INTEL_LIMIT_I9XX_LVDS];
 	else
-- 
1.5.4.4






More information about the Intel-gfx mailing list