Merge "disp: msm: remove use of drm_display_mode vrefresh" into display-kernel.lnx.5.10

msm/dp/dp_debug.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/debugfs.h>
@@ -994,7 +994,7 @@ static ssize_t dp_debug_read_edid_modes(struct file *file,
 	list_for_each_entry(mode, &connector->modes, head) {
 		ret = snprintf(buf + len, max_size,
 		"%s %d %d %d %d %d 0x%x\n",
-		mode->name, mode->vrefresh, mode->picture_aspect_ratio,
+		mode->name, drm_mode_vrefresh(mode), mode->picture_aspect_ratio,
 		mode->htotal, mode->vtotal, mode->clock, mode->flags);
 		if (dp_debug_check_buffer_overflow(ret, &max_size, &len))
 			break;
@@ -1069,7 +1069,7 @@ static ssize_t dp_debug_read_edid_modes_mst(struct file *file,
 	list_for_each_entry(mode, &connector->modes, head) {
 		ret = snprintf(buf + len, max_size,
 				"%s %d %d %d %d %d 0x%x\n",
-				mode->name, mode->vrefresh,
+				mode->name, drm_mode_vrefresh(mode),
 				mode->picture_aspect_ratio, mode->htotal,
 				mode->vtotal, mode->clock, mode->flags);
 		if (dp_debug_check_buffer_overflow(ret, &max_size, &len))

msm/dp/dp_display.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -2824,7 +2824,7 @@ static void dp_display_validate_mst_connectors(struct dp_debug *debug,
 
 		_hdis = mode->hdisplay;
 		_vdis = mode->vdisplay;
-		_vref = mode->vrefresh;
+		_vref = drm_mode_vrefresh(mode);
 		_ar = mode->picture_aspect_ratio;
 
 		if (hdis == _hdis && vdis == _vdis && vref == _vref &&
@@ -2912,7 +2912,7 @@ static enum drm_mode_status dp_display_validate_mode(
 
 	if (debug->debug_en && (mode->hdisplay != debug->hdisplay ||
 			mode->vdisplay != debug->vdisplay ||
-			mode->vrefresh != debug->vrefresh ||
+			drm_mode_vrefresh(mode) != debug->vrefresh ||
 			mode->picture_aspect_ratio != debug->aspect_ratio))
 		goto end;
 

msm/dp/dp_drm.c

@@ -40,8 +40,8 @@ void convert_to_drm_mode(const struct dp_display_mode *dp_mode,
 			      dp_mode->timing.v_sync_width;
 	drm_mode->vtotal = drm_mode->vsync_end + dp_mode->timing.v_back_porch;
 
-	drm_mode->vrefresh = dp_mode->timing.refresh_rate;
-	drm_mode->clock = dp_mode->timing.pixel_clk_khz;
+	drm_mode->clock = drm_mode->htotal * drm_mode->vtotal * dp_mode->timing.refresh_rate;
+	drm_mode->clock /= 1000;
 
 	if (dp_mode->timing.h_active_low)
 		flags |= DRM_MODE_FLAG_NHSYNC;
@@ -423,7 +423,7 @@ int dp_connector_get_mode_info(struct drm_connector *connector,
 	topology->num_enc = no_enc;
 	topology->num_intf = single_intf;
 
-	mode_info->frame_rate = drm_mode->vrefresh;
+	mode_info->frame_rate = drm_mode_vrefresh(drm_mode);
 	mode_info->vtotal = drm_mode->vtotal;
 
 	mode_info->wide_bus_en = dp_panel->widebus_en;
@@ -671,7 +671,6 @@ enum drm_mode_status dp_connector_mode_valid(struct drm_connector *connector,
 	}
 
 	dp_disp = display;
-	mode->vrefresh = drm_mode_vrefresh(mode);
 
 	rc = dp_disp->get_available_dp_resources(dp_disp, avail_res,
 			&avail_dp_res);

msm/dp/dp_mst_drm.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
  */
 
 /*
@@ -1074,7 +1074,7 @@ static void dp_mst_bridge_pre_enable(struct drm_bridge *drm_bridge)
 
 	DP_MST_INFO("conn:%d mode:%s fps:%d dsc:%d vcpi:%d slots:%d to %d\n",
 			DP_MST_CONN_ID(bridge), bridge->drm_mode.name,
-			bridge->drm_mode.vrefresh,
+			drm_mode_vrefresh(&bridge->drm_mode),
 			bridge->dp_mode.timing.comp_info.comp_ratio,
 			bridge->vcpi, bridge->start_slot,
 			bridge->start_slot + bridge->num_slots);

msm/dp/dp_panel.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
  */
 
 #include "dp_panel.h"
@@ -2944,8 +2944,7 @@ static void dp_panel_convert_to_dp_mode(struct dp_panel *dp_panel,
 	dp_mode->timing.v_front_porch = drm_mode->vsync_start -
 					 drm_mode->vdisplay;
 
-	dp_mode->timing.refresh_rate = drm_mode->vrefresh;
-
+	dp_mode->timing.refresh_rate = drm_mode_vrefresh(drm_mode);
 	dp_mode->timing.pixel_clk_khz = drm_mode->clock;
 
 	dp_mode->timing.v_active_low =