PM demand feature introduces a new way to set bw, power and performance requirements to pcode from display version 14 onwards. Use an identifiable name as a macro to distinguish the pm demand specific changes in the code.
Signed-off-by: Vinod Govindapillai <[email protected]> --- drivers/gpu/drm/i915/display/intel_bw.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display_device.h | 1 + drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +- drivers/gpu/drm/i915/display/intel_display_power.c | 4 ++-- drivers/gpu/drm/i915/display/intel_pmdemand.c | 12 ++++++------ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c index 9c3a9bbb49f6..d99e921df0b9 100644 --- a/drivers/gpu/drm/i915/display/intel_bw.c +++ b/drivers/gpu/drm/i915/display/intel_bw.c @@ -181,7 +181,7 @@ static int icl_pcode_restrict_qgv_points(struct intel_display *display, { int ret; - if (DISPLAY_VER(display) >= 14) + if (HAS_PMDEMAND(display)) return 0; /* bspec says to keep retrying for at least 1 ms */ @@ -1206,7 +1206,7 @@ static int intel_bw_check_qgv_points(struct intel_display *display, data_rate = DIV_ROUND_UP(data_rate, 1000); - if (DISPLAY_VER(display) >= 14) + if (HAS_PMDEMAND(display)) return mtl_find_qgv_points(display, data_rate, num_active_planes, new_bw_state); else diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h index 074e3ba8fb77..65283286771a 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.h +++ b/drivers/gpu/drm/i915/display/intel_display_device.h @@ -194,6 +194,7 @@ struct intel_display_platforms { #define HAS_OVERLAY(__display) (DISPLAY_INFO(__display)->has_overlay) #define HAS_PIPEDMC(__display) (DISPLAY_VER(__display) >= 12) #define HAS_PIXEL_NORMALIZER(__display) (DISPLAY_VER(__display) >= 35) +#define HAS_PMDEMAND(__display) (DISPLAY_VER(__display) >= 14) #define HAS_PSR(__display) (DISPLAY_INFO(__display)->has_psr) #define HAS_PSR_HW_TRACKING(__display) (DISPLAY_INFO(__display)->has_psr_hw_tracking) #define HAS_PSR2_SEL_FETCH(__display) (DISPLAY_VER(__display) >= 12) diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c index 70c1bba7c0a8..69bc9101d21d 100644 --- a/drivers/gpu/drm/i915/display/intel_display_irq.c +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c @@ -1260,7 +1260,7 @@ gen8_de_misc_irq_handler(struct intel_display *display, u32 iir) } } - if (DISPLAY_VER(display) >= 14) { + if (HAS_PMDEMAND(display)) { if (iir & (XELPDP_PMDEMAND_RSP | XELPDP_PMDEMAND_RSPTOUT_ERR)) { if (iir & XELPDP_PMDEMAND_RSPTOUT_ERR) diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 80ecf373fb19..94e025e231d5 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -1122,7 +1122,7 @@ static void gen9_dbuf_enable(struct intel_display *display) slices_mask = BIT(DBUF_S1) | display->dbuf.enabled_slices; - if (DISPLAY_VER(display) >= 14) + if (HAS_PMDEMAND(display)) intel_pmdemand_program_dbuf(display, slices_mask); /* @@ -1136,7 +1136,7 @@ static void gen9_dbuf_disable(struct intel_display *display) { gen9_dbuf_slices_update(display, 0); - if (DISPLAY_VER(display) >= 14) + if (HAS_PMDEMAND(display)) intel_pmdemand_program_dbuf(display, 0); } diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c b/drivers/gpu/drm/i915/display/intel_pmdemand.c index 7819b724795b..3a2e7825eb52 100644 --- a/drivers/gpu/drm/i915/display/intel_pmdemand.c +++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c @@ -152,7 +152,7 @@ intel_pmdemand_update_phys_mask(struct intel_display *display, { enum phy phy; - if (DISPLAY_VER(display) < 14) + if (!HAS_PMDEMAND(display)) return; if (!encoder) @@ -174,7 +174,7 @@ intel_pmdemand_update_port_clock(struct intel_display *display, struct intel_pmdemand_state *pmdemand_state, enum pipe pipe, int port_clock) { - if (DISPLAY_VER(display) < 14) + if (!HAS_PMDEMAND(display)) return; pmdemand_state->ddi_clocks[pipe] = port_clock; @@ -326,7 +326,7 @@ int intel_pmdemand_atomic_check(struct intel_atomic_state *state) const struct intel_dbuf_state *new_dbuf_state; struct intel_pmdemand_state *new_pmdemand_state; - if (DISPLAY_VER(display) < 14) + if (!HAS_PMDEMAND(display)) return 0; if (!intel_pmdemand_needs_update(state)) @@ -406,7 +406,7 @@ intel_pmdemand_init_pmdemand_params(struct intel_display *display, { u32 reg1, reg2; - if (DISPLAY_VER(display) < 14) + if (!HAS_PMDEMAND(display)) return; mutex_lock(&display->pmdemand.lock); @@ -639,7 +639,7 @@ void intel_pmdemand_pre_plane_update(struct intel_atomic_state *state) const struct intel_pmdemand_state *old_pmdemand_state = intel_atomic_get_old_pmdemand_state(state); - if (DISPLAY_VER(display) < 14) + if (!HAS_PMDEMAND(display)) return; if (!new_pmdemand_state || @@ -662,7 +662,7 @@ void intel_pmdemand_post_plane_update(struct intel_atomic_state *state) const struct intel_pmdemand_state *old_pmdemand_state = intel_atomic_get_old_pmdemand_state(state); - if (DISPLAY_VER(display) < 14) + if (!HAS_PMDEMAND(display)) return; if (!new_pmdemand_state || -- 2.43.0
