Skip to content

Commit bd7b850

Browse files
bhadanednyaneshwarRadhakrishna Sripada
authored andcommitted
drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines
Follow consistent naming convention. Replace CML with COMETLAKE. Signed-off-by: Dnyaneshwar Bhadane <[email protected]> Reviewed-by: Anusha Srivatsa <[email protected]> Acked-by: Jani Nikula <[email protected]> Signed-off-by: Radhakrishna Sripada <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ac8140d commit bd7b850

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder)
17401740
encoder->get_buf_trans = icl_get_mg_buf_trans;
17411741
} else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) {
17421742
encoder->get_buf_trans = bxt_get_buf_trans;
1743-
} else if (IS_CML_ULX(i915) || IS_COFFEELAKE_ULX(i915) || IS_KABYLAKE_ULX(i915)) {
1743+
} else if (IS_COMETLAKE_ULX(i915) || IS_COFFEELAKE_ULX(i915) || IS_KABYLAKE_ULX(i915)) {
17441744
encoder->get_buf_trans = kbl_y_get_buf_trans;
1745-
} else if (IS_CML_ULT(i915) || IS_COFFEELAKE_ULT(i915) || IS_KABYLAKE_ULT(i915)) {
1745+
} else if (IS_COMETLAKE_ULT(i915) || IS_COFFEELAKE_ULT(i915) || IS_KABYLAKE_ULT(i915)) {
17461746
encoder->get_buf_trans = kbl_u_get_buf_trans;
17471747
} else if (IS_COMETLAKE(i915) || IS_COFFEELAKE(i915) || IS_KABYLAKE(i915)) {
17481748
encoder->get_buf_trans = kbl_get_buf_trans;

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,11 +635,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
635635
#define IS_COFFEELAKE_GT3(i915) (IS_COFFEELAKE(i915) && \
636636
INTEL_INFO(i915)->gt == 3)
637637

638-
#define IS_CML_ULT(i915) \
638+
#define IS_COMETLAKE_ULT(i915) \
639639
IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULT)
640-
#define IS_CML_ULX(i915) \
640+
#define IS_COMETLAKE_ULX(i915) \
641641
IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULX)
642-
#define IS_CML_GT2(i915) (IS_COMETLAKE(i915) && \
642+
#define IS_COMETLAKE_GT2(i915) (IS_COMETLAKE(i915) && \
643643
INTEL_INFO(i915)->gt == 2)
644644

645645
#define IS_ICL_WITH_PORT_F(i915) \

0 commit comments

Comments
 (0)