Commit c8fc8346 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: rename IS_DISPLAY_IP_RANGE() to IS_DISPLAY_VER_FULL() 



Unify macro naming. Be more in line with DISPLAY_VER() and
IS_DISPLAY_VER().

Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/adb43f45ad0b1846c2cb9a5861ba1f727c41ae83.1724180287.git.jani.nikula@intel.com


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

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

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ enum intel_display_subplatform { 
#define SUPPORTS_TV(i915)		(DISPLAY_INFO(i915)->supports_tv)



/* Check that device has a display IP version within the specific range. */

#define IS_DISPLAY_IP_RANGE(__i915, from, until) ( \

#define IS_DISPLAY_VER_FULL(__i915, from, until) ( \

	BUILD_BUG_ON_ZERO((from) < IP_VER(2, 0)) + \

	(DISPLAY_VER_FULL(__i915) >= (from) && \

	 DISPLAY_VER_FULL(__i915) <= (until)))
@@ -182,7 +182,7 @@ enum intel_display_subplatform { 
 * stepping bound for the specified IP version.

 */

#define IS_DISPLAY_IP_STEP(__i915, ipver, from, until) \

	(IS_DISPLAY_IP_RANGE((__i915), (ipver), (ipver)) && \

	(IS_DISPLAY_VER_FULL((__i915), (ipver), (ipver)) && \

	 IS_DISPLAY_STEP((__i915), (from), (until)))



#define DISPLAY_INFO(i915)		(__to_intel_display(i915)->info.__device_info)

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

+1 −1
Original line number Diff line number Diff line
@@ -1684,7 +1684,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv, 
		intel_dmc_load_program(dev_priv);



	/* Wa_14011508470:tgl,dg1,rkl,adl-s,adl-p,dg2 */

	if (IS_DISPLAY_IP_RANGE(dev_priv, IP_VER(12, 0), IP_VER(13, 0)))

	if (IS_DISPLAY_VER_FULL(dev_priv, IP_VER(12, 0), IP_VER(13, 0)))

		intel_de_rmw(dev_priv, GEN11_CHICKEN_DCPR_2, 0,

			     DCPR_CLEAR_MEMSTAT_DIS | DCPR_SEND_RESP_IMM |

			     DCPR_MASK_LPMODE | DCPR_MASK_MAXLATENCY_MEMUP_CLR);