Commit f69f31e5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-10-16' of... 

Merge tag 'drm-intel-fixes-2025-10-16' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Skip GuC communication warning if reset is in progress (Zhanjun)
- Couple frontbuffer related fixes (Ville)
- Deactivate PSR only on LNL and when selective fetch enabled (Jouni)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/aPDoguxlhXlvjNAi@intel.com
parents 3a866087 95355766

drivers/gpu/drm/i915/display/intel_fb.c

+20 −18
Original line number Diff line number Diff line
@@ -2113,10 +2113,10 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb) 
	if (intel_fb_uses_dpt(fb))

		intel_dpt_destroy(intel_fb->dpt_vm);



	intel_frontbuffer_put(intel_fb->frontbuffer);



	intel_fb_bo_framebuffer_fini(intel_fb_bo(fb));



	intel_frontbuffer_put(intel_fb->frontbuffer);



	kfree(intel_fb);

}
@@ -2218,15 +2218,17 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
	int ret = -EINVAL;

	int i;



	/*

	 * intel_frontbuffer_get() must be done before

	 * intel_fb_bo_framebuffer_init() to avoid set_tiling vs. addfb race.

	 */

	intel_fb->frontbuffer = intel_frontbuffer_get(obj);

	if (!intel_fb->frontbuffer)

		return -ENOMEM;



	ret = intel_fb_bo_framebuffer_init(fb, obj, mode_cmd);

	if (ret)

		return ret;



	intel_fb->frontbuffer = intel_frontbuffer_get(obj);

	if (!intel_fb->frontbuffer) {

		ret = -ENOMEM;

		goto err;

	}

		goto err_frontbuffer_put;



	ret = -EINVAL;

	if (!drm_any_plane_has_format(display->drm,
@@ -2235,7 +2237,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
		drm_dbg_kms(display->drm,

			    "unsupported pixel format %p4cc / modifier 0x%llx\n",

			    &mode_cmd->pixel_format, mode_cmd->modifier[0]);

		goto err_frontbuffer_put;

		goto err_bo_framebuffer_fini;

	}



	max_stride = intel_fb_max_stride(display, mode_cmd->pixel_format,
@@ -2246,7 +2248,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
			    mode_cmd->modifier[0] != DRM_FORMAT_MOD_LINEAR ?

			    "tiled" : "linear",

			    mode_cmd->pitches[0], max_stride);

		goto err_frontbuffer_put;

		goto err_bo_framebuffer_fini;

	}



	/* FIXME need to adjust LINOFF/TILEOFF accordingly. */
@@ -2254,7 +2256,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
		drm_dbg_kms(display->drm,

			    "plane 0 offset (0x%08x) must be 0\n",

			    mode_cmd->offsets[0]);

		goto err_frontbuffer_put;

		goto err_bo_framebuffer_fini;

	}



	drm_helper_mode_fill_fb_struct(display->drm, fb, info, mode_cmd);
@@ -2264,7 +2266,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 


		if (mode_cmd->handles[i] != mode_cmd->handles[0]) {

			drm_dbg_kms(display->drm, "bad plane %d handle\n", i);

			goto err_frontbuffer_put;

			goto err_bo_framebuffer_fini;

		}



		stride_alignment = intel_fb_stride_alignment(fb, i);
@@ -2272,7 +2274,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
			drm_dbg_kms(display->drm,

				    "plane %d pitch (%d) must be at least %u byte aligned\n",

				    i, fb->pitches[i], stride_alignment);

			goto err_frontbuffer_put;

			goto err_bo_framebuffer_fini;

		}



		if (intel_fb_is_gen12_ccs_aux_plane(fb, i)) {
@@ -2282,7 +2284,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
				drm_dbg_kms(display->drm,

					    "ccs aux plane %d pitch (%d) must be %d\n",

					    i, fb->pitches[i], ccs_aux_stride);

				goto err_frontbuffer_put;

				goto err_bo_framebuffer_fini;

			}

		}
@@ -2291,7 +2293,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 


	ret = intel_fill_fb_info(display, intel_fb);

	if (ret)

		goto err_frontbuffer_put;

		goto err_bo_framebuffer_fini;



	if (intel_fb_uses_dpt(fb)) {

		struct i915_address_space *vm;
@@ -2317,10 +2319,10 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 
err_free_dpt:

	if (intel_fb_uses_dpt(fb))

		intel_dpt_destroy(intel_fb->dpt_vm);

err_bo_framebuffer_fini:

	intel_fb_bo_framebuffer_fini(obj);

err_frontbuffer_put:

	intel_frontbuffer_put(intel_fb->frontbuffer);

err:

	intel_fb_bo_framebuffer_fini(obj);

	return ret;

}

drivers/gpu/drm/i915/display/intel_frontbuffer.c

+9 −1
Original line number Diff line number Diff line
@@ -270,6 +270,8 @@ static void frontbuffer_release(struct kref *ref) 
	spin_unlock(&display->fb_tracking.lock);



	i915_active_fini(&front->write);



	drm_gem_object_put(obj);

	kfree_rcu(front, rcu);

}
@@ -287,6 +289,8 @@ intel_frontbuffer_get(struct drm_gem_object *obj) 
	if (!front)

		return NULL;



	drm_gem_object_get(obj);



	front->obj = obj;

	kref_init(&front->ref);

	atomic_set(&front->bits, 0);
@@ -299,8 +303,12 @@ intel_frontbuffer_get(struct drm_gem_object *obj) 
	spin_lock(&display->fb_tracking.lock);

	cur = intel_bo_set_frontbuffer(obj, front);

	spin_unlock(&display->fb_tracking.lock);

	if (cur != front)



	if (cur != front) {

		drm_gem_object_put(obj);

		kfree(front);

	}



	return cur;

}

drivers/gpu/drm/i915/display/intel_psr.c

+10 −2
Original line number Diff line number Diff line
@@ -3402,6 +3402,7 @@ static void _psr_flush_handle(struct intel_dp *intel_dp) 
	struct intel_display *display = to_intel_display(intel_dp);



	if (DISPLAY_VER(display) < 20 && intel_dp->psr.psr2_sel_fetch_enabled) {

		/* Selective fetch prior LNL */

		if (intel_dp->psr.psr2_sel_fetch_cff_enabled) {

			/* can we turn CFF off? */

			if (intel_dp->psr.busy_frontbuffer_bits == 0)
@@ -3420,12 +3421,19 @@ static void _psr_flush_handle(struct intel_dp *intel_dp) 
		intel_psr_configure_full_frame_update(intel_dp);



		intel_psr_force_update(intel_dp);

	} else if (!intel_dp->psr.psr2_sel_fetch_enabled) {

		/*

		 * PSR1 on all platforms

		 * PSR2 HW tracking

		 * Panel Replay Full frame update

		 */

		intel_psr_force_update(intel_dp);

	} else {

		/* Selective update LNL onwards */

		intel_psr_exit(intel_dp);

	}



	if ((!intel_dp->psr.psr2_sel_fetch_enabled || DISPLAY_VER(display) >= 20) &&

	    !intel_dp->psr.busy_frontbuffer_bits)

	if (!intel_dp->psr.active && !intel_dp->psr.busy_frontbuffer_bits)

		queue_work(display->wq.unordered, &intel_dp->psr.work);

}

drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h

+0 −2
Original line number Diff line number Diff line
@@ -89,12 +89,10 @@ i915_gem_object_set_frontbuffer(struct drm_i915_gem_object *obj, 


	if (!front) {

		RCU_INIT_POINTER(obj->frontbuffer, NULL);

		drm_gem_object_put(intel_bo_to_drm_bo(obj));

	} else if (rcu_access_pointer(obj->frontbuffer)) {

		cur = rcu_dereference_protected(obj->frontbuffer, true);

		kref_get(&cur->ref);

	} else {

		drm_gem_object_get(intel_bo_to_drm_bo(obj));

		rcu_assign_pointer(obj->frontbuffer, front);

	}

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c

+8 −1
Original line number Diff line number Diff line
@@ -1325,9 +1325,16 @@ static int ct_receive(struct intel_guc_ct *ct) 


static void ct_try_receive_message(struct intel_guc_ct *ct)

{

	struct intel_guc *guc = ct_to_guc(ct);

	int ret;



	if (GEM_WARN_ON(!ct->enabled))

	if (!ct->enabled) {

		GEM_WARN_ON(!guc_to_gt(guc)->uc.reset_in_progress);

		return;

	}



	/* When interrupt disabled, message handling is not expected */

	if (!guc->interrupts.enabled)

		return;



	ret = ct_receive(ct);