Commit 4ebf43d0 authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915: Eliminate has_4tile feature flag 



We don't really need a feature flag for has_4tile since there's a
well-defined cutover point (DG2) at which all new platforms started
using Tile4 as their Y-major tiling layout.  The GT side of the code
already handles Tile4 vs legacy TileY with checks on the IP version
rather than looking at the feature flag, and we can simplify the display
code similarly (which will also make it more self-contained for re-use
in the Xe driver).

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarHaridhar Kalvala <haridhar.kalvala@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230810234618.3738870-4-matthew.d.roper@intel.com
parent 3d623691

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct drm_printer; 
	func(overlay_needs_physical); \

	func(supports_tv);



#define HAS_4TILE(i915)			(IS_DG2(i915) || DISPLAY_VER(i915) >= 14)

#define HAS_ASYNC_FLIPS(i915)		(DISPLAY_VER(i915) >= 5)

#define HAS_CDCLK_CRAWL(i915)		(DISPLAY_INFO(i915)->has_cdclk_crawl)

#define HAS_CDCLK_SQUASH(i915)		(DISPLAY_INFO(i915)->has_cdclk_squash)

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -733,7 +733,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define CMDPARSER_USES_GGTT(i915) (GRAPHICS_VER(i915) == 7)



#define HAS_LLC(i915)	(INTEL_INFO(i915)->has_llc)

#define HAS_4TILE(i915)	(INTEL_INFO(i915)->has_4tile)

#define HAS_SNOOP(i915)	(INTEL_INFO(i915)->has_snoop)

#define HAS_EDRAM(i915)	((i915)->edram_size_mb)

#define HAS_SECURE_BATCHES(i915) (GRAPHICS_VER(i915) < 6)

drivers/gpu/drm/i915/i915_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -713,7 +713,6 @@ static const struct intel_device_info adl_p_info = { 
	.has_3d_pipeline = 1, \

	.has_64bit_reloc = 1, \

	.has_flat_ccs = 1, \

	.has_4tile = 1, \

	.has_global_mocs = 1, \

	.has_gt_uc = 1, \

	.has_llc = 1, \

drivers/gpu/drm/i915/intel_device_info.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ enum intel_ppgtt_type { 
	func(gpu_reset_clobbers_display); \

	func(has_reset_engine); \

	func(has_3d_pipeline); \

	func(has_4tile); \

	func(has_flat_ccs); \

	func(has_global_mocs); \

	func(has_gmd_id); \