Merge tag 'drm-intel-fixes-2025-02-06' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

- Fix the build error with clamp after WARN_ON on gcc 13.x+ (Guenter) - HDCP related fixes (Suraj) - PMU fix zero delta busyness issue (Umesh) - Fix page cleanup on DMA remap failure (Brian) - Drop 64bpp YUV formats from ICL+ SDR planes (Ville) - GuC log related fix (Daniele) - DisplayPort related fixes (Ankit, Jani) Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 1 year ago

Commit 4f6993b2 parents 7fa68b9 069504f7 files · +57 −25Browse files

Unified · Split

7 files

drivers/gpu/drm/i915/display/intel_backlight.c +3 −2
drivers/gpu/drm/i915/display/intel_dp.c +5 −7
drivers/gpu/drm/i915/display/intel_dp_mst.c +4 −0
drivers/gpu/drm/i915/display/intel_hdcp.c +14 −1
drivers/gpu/drm/i915/display/skl_universal_plane.c +0 −4
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +1 −5
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +30 −6

drivers/gpu/drm/i915/display/intel_backlight.c+3−2

@@ -41,8 +41,9 @@ static u32 scale(u32 source_val, · 40 unmodified lines
41	{	41	{
42	u64 target_val;	42	u64 target_val;
43		43
44	WARN_ON(source_min > source_max);	44	if (WARN_ON(source_min >= source_max) \|\|
45	WARN_ON(target_min > target_max);	45	WARN_ON(target_min > target_max))
		46	return target_min;
46		47
47	/* defensive */	48	/* defensive */
48	source_val = clamp(source_val, source_min, source_max);	49	source_val = clamp(source_val, source_min, source_max);

drivers/gpu/drm/i915/display/intel_dp.c+5−7

 	if (DISPLAY_VER(display) == 11)
 		return 10;
-	return 0;
+	return intel_dp_dsc_min_src_input_bpc();
 }
 int intel_dp_dsc_compute_max_bpp(const struct intel_connector *connector,
 	/* Compressed BPP should be less than the Input DSC bpp */
 	dsc_max_bpp = min(dsc_max_bpp, pipe_bpp - 1);
-	for (i = 0; i < ARRAY_SIZE(valid_dsc_bpp); i++) {
+	for (i = ARRAY_SIZE(valid_dsc_bpp) - 1; i >= 0; i--) {
-		if (valid_dsc_bpp[i] < dsc_min_bpp)
+		if (valid_dsc_bpp[i] < dsc_min_bpp ||
+		    valid_dsc_bpp[i] > dsc_max_bpp)
 			continue;
-		if (valid_dsc_bpp[i] > dsc_max_bpp)
-			break;
 		ret = dsc_compute_link_config(intel_dp,
 					      pipe_config,
 	crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC);
-	/* Currently only DP_AS_SDP_AVT_FIXED_VTOTAL mode supported */
 	as_sdp->sdp_type = DP_SDP_ADAPTIVE_SYNC;
 	as_sdp->length = 0x9;
 	as_sdp->duration_incr_ms = 0;
 		as_sdp->target_rr = drm_mode_vrefresh(adjusted_mode);
 		as_sdp->target_rr_divider = true;
 	} else {
-		as_sdp->mode = DP_AS_SDP_AVT_FIXED_VTOTAL;
+		as_sdp->mode = DP_AS_SDP_AVT_DYNAMIC_VTOTAL;
 		as_sdp->vtotal = adjusted_mode->vtotal;
 		as_sdp->target_rr = 0;
 	}

drivers/gpu/drm/i915/display/intel_dp_mst.c+4−0

@@ -341,6 +341,10 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp, · 340 unmodified lines
341		341
342	break;	342	break;
343	}	343	}
		344
		345	/* Allow using zero step to indicate one try */
		346	if (!step)
		347	break;
344	}	348	}
345		349
346	if (slots < 0) {	350	if (slots < 0) {

drivers/gpu/drm/i915/display/intel_hdcp.c+14−1

 	u32 rekey_bit = 0;
 	/* Here we assume HDMI is in TMDS mode of operation */
-	if (encoder->type != INTEL_OUTPUT_HDMI)
+	if (!intel_encoder_is_hdmi(encoder))
 		return;
 	if (DISPLAY_VER(display) >= 30) {
 		drm_dbg_kms(display->drm,
 			    "HDCP2.2 Downstream topology change\n");
+		ret = hdcp2_authenticate_repeater_topology(connector);
+		if (!ret) {
+			intel_hdcp_update_value(connector,
+						DRM_MODE_CONTENT_PROTECTION_ENABLED,
+						true);
+			goto out;
+		}
+		drm_dbg_kms(display->drm,
+			    "[CONNECTOR:%d:%s] Repeater topology auth failed.(%d)\n",
+			    connector->base.base.id, connector->base.name,
+			    ret);
 	} else {
 		drm_dbg_kms(display->drm,
 			    "[CONNECTOR:%d:%s] HDCP2.2 link failed, retrying auth\n",

drivers/gpu/drm/i915/display/skl_universal_plane.c+0−4

 	DRM_FORMAT_Y216,
 	DRM_FORMAT_XYUV8888,
 	DRM_FORMAT_XVYU2101010,
-	DRM_FORMAT_XVYU12_16161616,
-	DRM_FORMAT_XVYU16161616,
 };
 static const u32 icl_sdr_uv_plane_formats[] = {
 	DRM_FORMAT_Y216,
 	DRM_FORMAT_XYUV8888,
 	DRM_FORMAT_XVYU2101010,
-	DRM_FORMAT_XVYU12_16161616,
-	DRM_FORMAT_XVYU16161616,
 };
 static const u32 icl_hdr_plane_formats[] = {

drivers/gpu/drm/i915/gem/i915_gem_shmem.c+1−5

 	struct address_space *mapping = obj->base.filp->f_mapping;
 	unsigned int max_segment = i915_sg_segment_size(i915->drm.dev);
 	struct sg_table *st;
-	struct sgt_iter sgt_iter;
-	struct page *page;
 	int ret;
 	/*
 		 * for PAGE_SIZE chunks instead may be helpful.
 		 */
 		if (max_segment > PAGE_SIZE) {
-			for_each_sgt_page(page, sgt_iter, st)
+			shmem_sg_free_table(st, mapping, false, false);
-				put_page(page);
-			sg_free_table(st);
 			kfree(st);
 			max_segment = PAGE_SIZE;

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+30−6

 	spin_unlock_irqrestore(&guc->timestamp.lock, flags);
 }
+static void __update_guc_busyness_running_state(struct intel_guc *guc)
+{
+	struct intel_gt *gt = guc_to_gt(guc);
+	struct intel_engine_cs *engine;
+	enum intel_engine_id id;
+	unsigned long flags;
+	spin_lock_irqsave(&guc->timestamp.lock, flags);
+	for_each_engine(engine, gt, id)
+		engine->stats.guc.running = false;
+	spin_unlock_irqrestore(&guc->timestamp.lock, flags);
+}
 static void __update_guc_busyness_stats(struct intel_guc *guc)
 {
 	struct intel_gt *gt = guc_to_gt(guc);
 	if (!guc_submission_initialized(guc))
 		return;
+	/* Assume no engines are running and set running state to false */
+	__update_guc_busyness_running_state(guc);
 	/*
 	 * There is a race with suspend flow where the worker runs after suspend
 	 * and causes an unclaimed register access warning. Cancel the worker
 {
 	drm_printf(p, "GuC lrc descriptor %u:\n", ce->guc_id.id);
 	drm_printf(p, "\tHW Context Desc: 0x%08x\n", ce->lrc.lrca);
-	drm_printf(p, "\t\tLRC Head: Internal %u, Memory %u\n",
+	if (intel_context_pin_if_active(ce)) {
-		   ce->ring->head,
+		drm_printf(p, "\t\tLRC Head: Internal %u, Memory %u\n",
-		   ce->lrc_reg_state[CTX_RING_HEAD]);
+			   ce->ring->head,
-	drm_printf(p, "\t\tLRC Tail: Internal %u, Memory %u\n",
+			   ce->lrc_reg_state[CTX_RING_HEAD]);
-		   ce->ring->tail,
+		drm_printf(p, "\t\tLRC Tail: Internal %u, Memory %u\n",
-		   ce->lrc_reg_state[CTX_RING_TAIL]);
+			   ce->ring->tail,
+			   ce->lrc_reg_state[CTX_RING_TAIL]);
+		intel_context_unpin(ce);
+	} else {
+		drm_printf(p, "\t\tLRC Head: Internal %u, Memory not pinned\n",
+			   ce->ring->head);
+		drm_printf(p, "\t\tLRC Tail: Internal %u, Memory not pinned\n",
+			   ce->ring->tail);
+	}
 	drm_printf(p, "\t\tContext Pin Count: %u\n",
 		   atomic_read(&ce->pin_count));
 	drm_printf(p, "\t\tGuC ID Ref Count: %u\n",

Merge tag 'drm-intel-fixes-2025-02-06' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code