Merge drm/drm-next into drm-misc-next

[thirdparty/kernel/linux.git] / drivers / gpu / drm / panel / panel-novatek-nt36523.c

diff --git a/drivers/gpu/drm/panel/panel-novatek-nt36523.c b/drivers/gpu/drm/panel/panel-novatek-nt36523.c
index a189ce23632856a0492446bcc2759101fee8407c..d6fa76dbf94817100668931ffa55ccece456b9be 100644 (file)
--- a/drivers/gpu/drm/panel/panel-novatek-nt36523.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt36523.c
@@ -933,8 +933,7 @@ static int j606f_boe_init_sequence(struct panel_info *pinfo)
 
 static const struct drm_display_mode elish_boe_modes[] = {
        {
-               /* There is only one 120 Hz timing, but it doesn't work perfectly, 104 Hz preferred */
-               .clock = (1600 + 60 + 8 + 60) * (2560 + 26 + 4 + 168) * 104 / 1000,
+               .clock = (1600 + 60 + 8 + 60) * (2560 + 26 + 4 + 168) * 120 / 1000,
                .hdisplay = 1600,
                .hsync_start = 1600 + 60,
                .hsync_end = 1600 + 60 + 8,
@@ -948,8 +947,7 @@ static const struct drm_display_mode elish_boe_modes[] = {
 
 static const struct drm_display_mode elish_csot_modes[] = {
        {
-               /* There is only one 120 Hz timing, but it doesn't work perfectly, 104 Hz preferred */
-               .clock = (1600 + 200 + 40 + 52) * (2560 + 26 + 4 + 168) * 104 / 1000,
+               .clock = (1600 + 200 + 40 + 52) * (2560 + 26 + 4 + 168) * 120 / 1000,
                .hdisplay = 1600,
                .hsync_start = 1600 + 200,
                .hsync_end = 1600 + 200 + 40,