Commit 06f4d328 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: remove IS_LP() 



The .is_lp member of struct intel_device_info and its wrapper IS_LP()
are used to identify just four platforms, VLV/CHV/BXT/GLK. It didn't
become as important as it was perhaps originally planned. Just remove
it, and replace with exact platform identification. In a few places this
becomes slightly verbose, but in many places it improves clarity to
immediately see the exact platforms.

Additionally, this lets us remove the xe compat macro.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930124056.3541988-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 8c827853

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

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ enum intel_display_subplatform { 
#define HAS_PSR(i915)			(DISPLAY_INFO(i915)->has_psr)

#define HAS_PSR_HW_TRACKING(i915)	(DISPLAY_INFO(i915)->has_psr_hw_tracking)

#define HAS_PSR2_SEL_FETCH(i915)	(DISPLAY_VER(i915) >= 12)

#define HAS_SAGV(i915)			(DISPLAY_VER(i915) >= 9 && !IS_LP(i915))

#define HAS_SAGV(i915)			(DISPLAY_VER(i915) >= 9 && !IS_BROXTON(i915) && !IS_GEMINILAKE(i915))

#define HAS_TRANSCODER(i915, trans)	((DISPLAY_RUNTIME_INFO(i915)->cpu_transcoder_mask & \

					  BIT(trans)) != 0)

#define HAS_UNCOMPRESSED_JOINER(i915)	(DISPLAY_VER(i915) >= 13)

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

+5 −2
Original line number Diff line number Diff line
@@ -589,11 +589,14 @@ static bool intel_pll_is_valid(struct drm_i915_private *dev_priv, 
	if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1)

		return false;



	if (!IS_PINEVIEW(dev_priv) && !IS_LP(dev_priv))

	if (!IS_PINEVIEW(dev_priv) &&

	    !IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&

	    !IS_BROXTON(dev_priv) && !IS_GEMINILAKE(dev_priv))

		if (clock->m1 <= clock->m2)

			return false;



	if (!IS_LP(dev_priv)) {

	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&

	    !IS_BROXTON(dev_priv) && !IS_GEMINILAKE(dev_priv)) {

		if (clock->p < limit->p.min || limit->p.max < clock->p)

			return false;

		if (clock->m < limit->m.min || limit->m.max < clock->m)

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static int init_reserved_stolen(struct drm_i915_private *i915) 
		icl_get_stolen_reserved(i915, uncore,

					&reserved_base, &reserved_size);

	} else if (GRAPHICS_VER(i915) >= 8) {

		if (IS_LP(i915))

		if (IS_CHERRYVIEW(i915) || IS_BROXTON(i915) || IS_GEMINILAKE(i915))

			chv_get_stolen_reserved(i915, uncore,

						&reserved_base, &reserved_size);

		else

drivers/gpu/drm/i915/i915_drv.h

+2 −3
Original line number Diff line number Diff line
@@ -612,9 +612,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_TIGERLAKE_UY(i915) \

	IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY)



#define IS_LP(i915)		(INTEL_INFO(i915)->is_lp)

#define IS_GEN9_LP(i915)	(GRAPHICS_VER(i915) == 9 && IS_LP(i915))

#define IS_GEN9_BC(i915)	(GRAPHICS_VER(i915) == 9 && !IS_LP(i915))

#define IS_GEN9_LP(i915)	(IS_BROXTON(i915) || IS_GEMINILAKE(i915))

#define IS_GEN9_BC(i915)	(GRAPHICS_VER(i915) == 9 && !IS_GEN9_LP(i915))



#define __HAS_ENGINE(engine_mask, id) ((engine_mask) & BIT(id))

#define HAS_ENGINE(gt, id) __HAS_ENGINE((gt)->info.engine_mask, id)

drivers/gpu/drm/i915/i915_pci.c

+0 −3
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ static const struct intel_device_info ivb_q_info = { 
static const struct intel_device_info vlv_info = {

	PLATFORM(INTEL_VALLEYVIEW),

	GEN(7),

	.is_lp = 1,

	.has_runtime_pm = 1,

	.has_rc6 = 1,

	.has_reset_engine = true,
@@ -451,7 +450,6 @@ static const struct intel_device_info bdw_gt3_info = { 
static const struct intel_device_info chv_info = {

	PLATFORM(INTEL_CHERRYVIEW),

	GEN(8),

	.is_lp = 1,

	.platform_engine_mask = BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0),

	.has_64bit_reloc = 1,

	.has_runtime_pm = 1,
@@ -512,7 +510,6 @@ static const struct intel_device_info skl_gt4_info = { 


#define GEN9_LP_FEATURES \

	GEN(9), \

	.is_lp = 1, \

	.platform_engine_mask = BIT(RCS0) | BIT(VCS0) | BIT(BCS0) | BIT(VECS0), \

	.has_3d_pipeline = 1, \

	.has_64bit_reloc = 1, \