Commit bd7b8501 authored by Dnyaneshwar Bhadane's avatar Dnyaneshwar Bhadane Committed by Radhakrishna Sripada
Browse files

drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines 



Follow consistent naming convention. Replace CML with
COMETLAKE.

Signed-off-by: default avatarDnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarRadhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230801135344.3797924-7-dnyaneshwar.bhadane@intel.com
parent ac8140db

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

+2 −2
Original line number Diff line number Diff line
@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) 
			encoder->get_buf_trans = icl_get_mg_buf_trans;

	} else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) {

		encoder->get_buf_trans = bxt_get_buf_trans;

	} else if (IS_CML_ULX(i915) || IS_COFFEELAKE_ULX(i915) || IS_KABYLAKE_ULX(i915)) {

	} else if (IS_COMETLAKE_ULX(i915) || IS_COFFEELAKE_ULX(i915) || IS_KABYLAKE_ULX(i915)) {

		encoder->get_buf_trans = kbl_y_get_buf_trans;

	} else if (IS_CML_ULT(i915) || IS_COFFEELAKE_ULT(i915) || IS_KABYLAKE_ULT(i915)) {

	} else if (IS_COMETLAKE_ULT(i915) || IS_COFFEELAKE_ULT(i915) || IS_KABYLAKE_ULT(i915)) {

		encoder->get_buf_trans = kbl_u_get_buf_trans;

	} else if (IS_COMETLAKE(i915) || IS_COFFEELAKE(i915) || IS_KABYLAKE(i915)) {

		encoder->get_buf_trans = kbl_get_buf_trans;

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -635,11 +635,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_COFFEELAKE_GT3(i915)	(IS_COFFEELAKE(i915) && \

				 INTEL_INFO(i915)->gt == 3)



#define IS_CML_ULT(i915) \

#define IS_COMETLAKE_ULT(i915) \

	IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULT)

#define IS_CML_ULX(i915) \

#define IS_COMETLAKE_ULX(i915) \

	IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULX)

#define IS_CML_GT2(i915)	(IS_COMETLAKE(i915) && \

#define IS_COMETLAKE_GT2(i915)	(IS_COMETLAKE(i915) && \

				 INTEL_INFO(i915)->gt == 2)



#define IS_ICL_WITH_PORT_F(i915) \