Commit 886e5b6e authored by Matt Roper's avatar Matt Roper
Browse files

drm/xe: Make display part of Wa_22019338487 a device workaround 



The display part of Wa_22019338487 (i.e., avoiding use of stolen memory)
is using a platform test rather than an graphics/media IP test.  Since
this workaround is focused on non-GT uses of stolen memory, it makes
sense that we'd want to still apply the workaround on affected platforms
even if the GTs themselves are disabled via configfs.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/20251013200944.2499947-38-matthew.d.roper@intel.com


Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
parent d0ff153c

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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "xe_ttm_stolen_mgr.h"

#include "xe_wa.h"



#include <generated/xe_wa_oob.h>

#include <generated/xe_device_wa_oob.h>



struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

					       struct drm_fb_helper_surface_size *sizes)
@@ -41,7 +41,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
	size = PAGE_ALIGN(size);

	obj = ERR_PTR(-ENODEV);



	if (!IS_DGFX(xe) && !XE_GT_WA(xe_root_mmio_gt(xe), 22019338487_display)) {

	if (!IS_DGFX(xe) && !XE_DEVICE_WA(xe, 22019338487_display)) {

		obj = xe_bo_create_pin_map_novm(xe, xe_device_get_root_tile(xe),

						size,

						ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |

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

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "xe_vram_types.h"

#include "xe_wa.h"



#include <generated/xe_wa_oob.h>

#include <generated/xe_device_wa_oob.h>



void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)

{
@@ -123,7 +123,7 @@ initial_plane_bo(struct xe_device *xe, 
		phys_base = base;

		flags |= XE_BO_FLAG_STOLEN;



		if (XE_GT_WA(xe_root_mmio_gt(xe), 22019338487_display))

		if (XE_DEVICE_WA(xe, 22019338487_display))

			return NULL;



		/*

drivers/gpu/drm/xe/xe_device_wa_oob.rules

+1 −0
Original line number Diff line number Diff line 
15015404425     PLATFORM(LUNARLAKE)

		PLATFORM(PANTHERLAKE)

22019338487_display	PLATFORM(LUNARLAKE)

drivers/gpu/drm/xe/xe_wa_oob.rules

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
22019338487	MEDIA_VERSION(2000)

		GRAPHICS_VERSION(2001), FUNC(xe_rtp_match_not_sriov_vf)

		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)

22019338487_display	PLATFORM(LUNARLAKE)

16023588340	GRAPHICS_VERSION(2001), FUNC(xe_rtp_match_not_sriov_vf)

14019789679	GRAPHICS_VERSION(1255)

		GRAPHICS_VERSION_RANGE(1270, 2004)