fixup! drm: apple: set timestamps for 120hz

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

drivers/gpu/drm/apple/dcp-internal.h

@@ -184,7 +184,7 @@ struct apple_dcp {
 	/* Current display mode */
 	bool during_modeset;
 	bool valid_mode;
-	s64 precise_sync_rate;
+	bool use_timestamps;
 	struct dcp_set_digital_out_mode_req mode;
 
 	/* completion for active turning true */

drivers/gpu/drm/apple/iomfb_template.c

@@ -1210,17 +1210,17 @@ int DCP_FW_NAME(iomfb_modeset)(struct apple_dcp *dcp,
 	if (cmode)
 		dev_info(dcp->dev,
 			"set_digital_out_mode() color mode depth:%hhu format:%u "
-			"colorimetry:%u eotf:%u range:%u\n", cmode->depth,
+			"colorimetry:%u eotf:%u range:%u vrr:%u\n", cmode->depth,
 			cmode->format, cmode->colorimetry, cmode->eotf,
-			cmode->range);
+			cmode->range, mode->vrr);
 
 	dcp->mode = (struct dcp_set_digital_out_mode_req){
 		.color_mode_id = mode->color_mode_id,
 		.timing_mode_id = mode->timing_mode_id
 	};
 
-	/* keep around to fake timestamps in dcp_swap_submit */
-	dcp->precise_sync_rate = mode->precise_sync_rate;
+	/* Keep track of suspected vrr modes */
+	dcp->use_timestamps = mode->vrr;
 
 	cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
 	if (!cookie) {
@@ -1411,7 +1411,7 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
 		req->clear = 1;
 	}
 
-	if (has_surface && dcp->main_display && (dcp->precise_sync_rate >> 16) == 120) {
+	if (has_surface && dcp->use_timestamps) {
 		/*
 		 * Fake timstamps to get 120hz refresh rate. It looks
 		 * like the actual value does not matter, as long  as it is non zero.

drivers/gpu/drm/apple/parser.c

@@ -499,6 +499,18 @@ static int parse_mode(struct dcp_parse_ctx *handle,
 	if (is_virtual)
 		return -EINVAL;
 
+	/*
+	* HACK:
+	* Mark the 120 Hz mode on j314/j316 (identified by resolution) as vrr.
+	* We still do not know how to drive VRR but at least seetinng timestamps
+	* in the the swap_surface message to non-zero values drives the display
+	* at 120 fps.
+	*/
+	if (vert.precise_sync_rate >> 16 == 120 &&
+	    ((horiz.active == 3024 && vert.active == 1964) ||
+	     (horiz.active == 3456 && vert.active == 2234)))
+		out->vrr = true;
+
 	vert.active -= notch_height;
 	vert.sync_width += notch_height;
 
@@ -526,7 +538,6 @@ static int parse_mode(struct dcp_parse_ctx *handle,
 
 	out->timing_mode_id = id;
 	out->color_mode_id = best_color_mode;
-	out->precise_sync_rate = vert.precise_sync_rate;
 
 	trace_iomfb_timing_mode(handle->dcp, id, *score, horiz.active,
 				vert.active, vert.precise_sync_rate,

drivers/gpu/drm/apple/parser.h

@@ -87,11 +87,11 @@ struct dcp_display_mode {
 	struct drm_display_mode mode;
 	u32 color_mode_id;
 	u32 timing_mode_id;
-	s64 precise_sync_rate;
 	struct dcp_color_mode sdr_rgb;
 	struct dcp_color_mode sdr_444;
 	struct dcp_color_mode sdr;
 	struct dcp_color_mode best;
+	bool vrr;
 };
 
 struct dimension {