Commit 0a4d0b2d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-2024-10-17' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next 



UAPI Changes:
- (Implicit) Fix the exec unnecessary implicit fencing (Matt Brost)

Driver Changes:
- Fix an inverted if statement (Colin)
- Fixes around display d3cold vs non-d3cold runtime pm (Imre)
- A couple of scheduling fixes (Matt Brost)
- Increase a query timestamp witdh (Lucas)
- Move a timestamp read (Lucas)
- Tidy some code using multiple put_user() (Lucas)
- Fix an ufence signaling error (Nirmoy)
- Initialize the ufence.signalled field (Matt Auld)
- Display fb alignement work (Juha-Pekka)
- Disallow horisontal flip with tile4 + display20 (Juha-Pekka)
- Extend a workaround (Shekhar)
- Enlarge the global invalidation timeout (Shuicheng)

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZxDZaRRQAzrG1uir@fedora
parents c3912203 2eb460ab

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

+13 −0
Original line number Diff line number Diff line
@@ -519,6 +519,19 @@ bool intel_fb_needs_64k_phys(u64 modifier) 
				      INTEL_PLANE_CAP_NEED64K_PHYS);

}



/**

 * intel_fb_is_tile4_modifier: Check if a modifier is a tile4 modifier type

 * @modifier: Modifier to check

 *

 * Returns:

 * Returns %true if @modifier is a tile4 modifier.

 */

bool intel_fb_is_tile4_modifier(u64 modifier)

{

	return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,

				      INTEL_PLANE_CAP_TILING_4);

}



static bool check_modifier_display_ver_range(const struct intel_modifier_desc *md,

					     u8 display_ver_from, u8 display_ver_until)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ bool intel_fb_is_ccs_modifier(u64 modifier); 
bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);

bool intel_fb_is_mc_ccs_modifier(u64 modifier);

bool intel_fb_needs_64k_phys(u64 modifier);

bool intel_fb_is_tile4_modifier(u64 modifier);



bool intel_fb_is_ccs_aux_plane(const struct drm_framebuffer *fb, int color_plane);

int intel_fb_rc_ccs_cc_plane(const struct drm_framebuffer *fb);

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

+11 −0
Original line number Diff line number Diff line
@@ -1618,6 +1618,17 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, 
		return -EINVAL;

	}



	/*

	 * Display20 onward tile4 hflip is not supported

	 */

	if (rotation & DRM_MODE_REFLECT_X &&

	    intel_fb_is_tile4_modifier(fb->modifier) &&

	    DISPLAY_VER(dev_priv) >= 20) {

		drm_dbg_kms(&dev_priv->drm,

			    "horizontal flip is not supported with tile4 surface formats\n");

		return -EINVAL;

	}



	if (drm_rotation_90_or_270(rotation)) {

		if (!intel_fb_supports_90_270_rotation(to_intel_framebuffer(fb))) {

			drm_dbg_kms(&dev_priv->drm,

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, 


	bo = xe_bo_create_locked_range(xe, xe_device_get_root_tile(xe),

				       NULL, size, start, end,

				       ttm_bo_type_kernel, flags);

				       ttm_bo_type_kernel, flags, 0);

	if (IS_ERR(bo)) {

		err = PTR_ERR(bo);

		bo = NULL;

drivers/gpu/drm/xe/display/xe_display.c

+15 −5
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ static void __xe_display_pm_suspend(struct xe_device *xe, bool runtime) 
	intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);



	intel_dmc_suspend(display);



	if (runtime && has_display(xe))

		intel_hpd_poll_enable(xe);

}



void xe_display_pm_suspend(struct xe_device *xe)
@@ -387,8 +390,10 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe) 
	if (!xe->info.probe_display)

		return;



	if (xe->d3cold.allowed)

	if (xe->d3cold.allowed) {

		__xe_display_pm_suspend(xe, true);

		return;

	}



	intel_hpd_poll_enable(xe);

}
@@ -453,9 +458,11 @@ static void __xe_display_pm_resume(struct xe_device *xe, bool runtime) 
		intel_display_driver_resume(xe);

		drm_kms_helper_poll_enable(&xe->drm);

		intel_display_driver_enable_user_access(xe);

		intel_hpd_poll_disable(xe);

	}



	if (has_display(xe))

		intel_hpd_poll_disable(xe);



	intel_opregion_resume(display);



	if (!runtime)
@@ -474,10 +481,13 @@ void xe_display_pm_runtime_resume(struct xe_device *xe) 
	if (!xe->info.probe_display)

		return;



	intel_hpd_poll_disable(xe);



	if (xe->d3cold.allowed)

	if (xe->d3cold.allowed) {

		__xe_display_pm_resume(xe, true);

		return;

	}



	intel_hpd_init(xe);

	intel_hpd_poll_disable(xe);

}