Merge branch 'viafb-pll' into viafb-next

git-mirror · Mar 12, 2011 · 2563afa · 2563afa
2 parents bf5ea02 + e4fcaef
commit 2563afa
Show file tree

Hide file tree

Showing 7 changed files with 479 additions and 747 deletions.
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
@@ -195,7 +195,9 @@ void viafb_dvi_set_mode(struct VideoModeTable *mode, int mode_bpp,
 	struct crt_mode_table *pDviTiming;
 	unsigned long desirePixelClock, maxPixelClock;
 	pDviTiming = mode->crtc;
-	desirePixelClock = pDviTiming->clk / 1000000;
+	desirePixelClock = pDviTiming->refresh_rate
+		* pDviTiming->crtc.hor_total * pDviTiming->crtc.ver_total
+		/ 1000000;
 	maxPixelClock = (unsigned long)viaparinfo->
 		tmds_setting_info->max_pixel_clock;