[Intel-gfx] [PATCH]drm-next: fix a miss merge

Shaohua Li shaohua.li at intel.com
Fri Apr 3 09:24:43 CEST 2009


when merge IGD patch, .find_pll is missed.

Signed-off-by: Shaohua Li<shaohua.li at intel.com>

Index: linux/drivers/gpu/drm/i915/intel_display.c
===================================================================
--- linux.orig/drivers/gpu/drm/i915/intel_display.c	2009-04-03 15:04:23.000000000 +0800
+++ linux/drivers/gpu/drm/i915/intel_display.c	2009-04-03 15:04:46.000000000 +0800
@@ -367,6 +367,7 @@ static const intel_limit_t intel_limits[
         .p1  = { .min = I9XX_P1_MIN,		.max = I9XX_P1_MAX },
 	.p2  = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_SDVO_DAC_SLOW,	.p2_fast = I9XX_P2_SDVO_DAC_FAST },
+	.find_pll = intel_find_best_PLL,
     },
     { /* INTEL_LIMIT_IGD_LVDS */
         .dot = { .min = I9XX_DOT_MIN,		.max = I9XX_DOT_MAX },
@@ -380,6 +381,7 @@ static const intel_limit_t intel_limits[
 	/* IGD only supports single-channel mode. */
 	.p2  = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
 		 .p2_slow = I9XX_P2_LVDS_SLOW,	.p2_fast = I9XX_P2_LVDS_SLOW },
+	.find_pll = intel_find_best_PLL,
     },
 
 };





More information about the Intel-gfx mailing list