Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[firefly-linux-kernel-4.4.55.git] / drivers / video / via / dvi.c

diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
index 9138e517267c1e67cfeed4db7ad111dd379eb426..6be72f0ba21d16a7d23b8bb2b0d465d7efd50027 100644 (file)
--- a/drivers/video/via/dvi.c
+++ b/drivers/video/via/dvi.c
@@ -172,10 +172,11 @@ static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)
 }
 
 /* DVI Set Mode */
-void viafb_dvi_set_mode(const struct fb_var_screeninfo *var, int iga)
+void viafb_dvi_set_mode(const struct fb_var_screeninfo *var,
+       u16 cxres, u16 cyres, int iga)
 {
        struct fb_var_screeninfo dvi_var = *var;
-       struct crt_mode_table *rb_mode;
+       const struct fb_videomode *rb_mode;
        int maxPixelClock;
 
        maxPixelClock = viaparinfo->shared->tmds_setting_info.max_pixel_clock;
@@ -185,7 +186,7 @@ void viafb_dvi_set_mode(const struct fb_var_screeninfo *var, int iga)
                        viafb_fill_var_timing_info(&dvi_var, rb_mode);
        }
 
-       viafb_fill_crtc_timing(&dvi_var, iga);
+       viafb_fill_crtc_timing(&dvi_var, cxres, cyres, iga);
 }
 
 /* Sense DVI Connector */