> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Kahola, > Mika > Sent: Thursday, March 2, 2023 1:40 AM > To: Murthy, Arun R <arun.r.murthy@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Roper, Matthew D <matthew.d.roper@xxxxxxxxx>; De Marchi, Lucas > <lucas.demarchi@xxxxxxxxx> > Subject: Re: [PATCH v4 07/22] drm/i915/mtl: Add support for PM > DEMAND > > > -----Original Message----- > > From: Murthy, Arun R <arun.r.murthy@xxxxxxxxx> > > Sent: Thursday, March 2, 2023 10:50 AM > > To: Kahola, Mika <mika.kahola@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > Cc: De Marchi, Lucas <lucas.demarchi@xxxxxxxxx>; Roper, Matthew D > > <matthew.d.roper@xxxxxxxxx> > > Subject: RE: [PATCH v4 07/22] drm/i915/mtl: Add support for PM > > DEMAND > > > > > -----Original Message----- > > > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of > > > Mika Kahola > > > Sent: Friday, February 24, 2023 3:44 PM > > > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > > Cc: De Marchi, Lucas <lucas.demarchi@xxxxxxxxx>; Roper, Matthew D > > > <matthew.d.roper@xxxxxxxxx> > > > Subject: [PATCH v4 07/22] drm/i915/mtl: Add support for PM > > > DEMAND > > > > > > Display14 introduces a new way to instruct the PUnit with power and > > > bandwidth requirements of DE. Add the functionality to program the > > > registers and handle waits using interrupts. > > > The current wait time for timeouts is programmed for 10 msecs to > > > factor in the worst case scenarios. Changes made to use REG_BIT for a > > > register that we touched(GEN8_DE_MISC_IER _MMIO). > > > > > > v2: > > > - Removed repeated definition of dbuf, which has been moved to struct > > > intel_display. (Gustavo) > > > - s/dev_priv->dbuf/dev_priv->display.dbuf/ (Gustavo) > > > > > > Bspec: 66451, 64636, 64602, 64603 > > > Cc: Matt Atwood <matthew.s.atwood@xxxxxxxxx> > > > Cc: Matt Roper <matthew.d.roper@xxxxxxxxx> > > > Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> > > > Cc: Gustavo Sousa <gustavo.sousa@xxxxxxxxx> > > > Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx> > > > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx> > > > Link: > > > https://patchwork.freedesktop.org/patch/msgid/20221014124740.774835- > 8- > > > mika.kahola@xxxxxxxxx > > > --- > > > drivers/gpu/drm/i915/display/intel_bw.c | 4 +- > > > drivers/gpu/drm/i915/display/intel_bw.h | 2 + > > > drivers/gpu/drm/i915/display/intel_display.c | 14 + > > > .../drm/i915/display/intel_display_power.c | 8 + > > > drivers/gpu/drm/i915/i915_drv.h | 6 + > > > drivers/gpu/drm/i915/i915_irq.c | 22 +- > > > drivers/gpu/drm/i915/i915_reg.h | 33 +- > > > drivers/gpu/drm/i915/intel_pm.c | 286 ++++++++++++++++++ > > > drivers/gpu/drm/i915/intel_pm.h | 35 +++ > > > 9 files changed, 405 insertions(+), 5 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c > > > b/drivers/gpu/drm/i915/display/intel_bw.c > > > index 202321ffbe2a..87c20bf52123 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_bw.c > > > +++ b/drivers/gpu/drm/i915/display/intel_bw.c > > > @@ -746,8 +746,8 @@ static unsigned int > > > intel_bw_num_active_planes(struct drm_i915_private *dev_priv > > > return num_active_planes; > > > } > > > > > > -static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, > > > - const struct intel_bw_state *bw_state) > > > +unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, > > > + const struct intel_bw_state *bw_state) > > > { > > > unsigned int data_rate = 0; > > > enum pipe pipe; > > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.h > > > b/drivers/gpu/drm/i915/display/intel_bw.h > > > index f20292143745..17fc0b61db04 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_bw.h > > > +++ b/drivers/gpu/drm/i915/display/intel_bw.h > > > @@ -62,6 +62,8 @@ int intel_bw_init(struct drm_i915_private > > > *dev_priv); int intel_bw_atomic_check(struct intel_atomic_state > > > *state); void intel_bw_crtc_update(struct intel_bw_state *bw_state, > > > const struct intel_crtc_state *crtc_state); > > > +unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, > > > + const struct intel_bw_state *bw_state); > > > int icl_pcode_restrict_qgv_points(struct drm_i915_private *dev_priv, > > > u32 points_mask); > > > int intel_bw_calc_min_cdclk(struct intel_atomic_state *state, diff > > > --git a/drivers/gpu/drm/i915/display/intel_display.c > > > b/drivers/gpu/drm/i915/display/intel_display.c > > > index 8030968e7008..676bf512b9ce 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -959,6 +959,9 @@ intel_get_crtc_new_encoder(const struct > > > intel_atomic_state *state, > > > num_encoders++; > > > } > > > > > > + if (!encoder) > > > + return NULL; > > > + > > > drm_WARN(encoder->base.dev, num_encoders != 1, > > > "%d encoders for pipe %c\n", > > > num_encoders, pipe_name(master_crtc->pipe)); @@ - > > > 6823,6 +6826,10 @@ int intel_atomic_check(struct drm_device *dev, > > > ret = intel_modeset_calc_cdclk(state); > > > if (ret) > > > return ret; > > > + > > > + ret = intel_pmdemand_atomic_check(state); > > > + if (ret) > > > + goto fail; > > > } > > > > > > ret = intel_atomic_check_crtcs(state); @@ -7439,6 +7446,7 @@ static > > > void intel_atomic_commit_tail(struct intel_atomic_state *state) > > > } > > > > > > intel_sagv_pre_plane_update(state); > > > + intel_pmdemand_pre_plane_update(state); > > > > > > /* Complete the events for pipes that have now been disabled */ > > > for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > > > @@ -7551,6 +7559,7 @@ static void intel_atomic_commit_tail(struct > > > intel_atomic_state *state) > > > intel_verify_planes(state); > > > > > > intel_sagv_post_plane_update(state); > > > + intel_pmdemand_post_plane_update(state); > > > > > > drm_atomic_helper_commit_hw_done(&state->base); > > > > > > @@ -8282,6 +8291,7 @@ void intel_init_display_hooks(struct > > > drm_i915_private *dev_priv) > > > intel_color_init_hooks(dev_priv); > > > intel_init_cdclk_hooks(dev_priv); > > > intel_audio_hooks_init(dev_priv); > > > + intel_init_pmdemand(dev_priv); > > > > > > intel_dpll_init_clock_hook(dev_priv); > > > > > > @@ -8508,6 +8518,10 @@ int intel_modeset_init_noirq(struct > > > drm_i915_private *i915) > > > if (ret) > > > goto cleanup_vga_client_pw_domain_dmc; > > > > > > + ret = intel_pmdemand_init(i915); > > > + if (ret) > > > + goto cleanup_vga_client_pw_domain_dmc; > > > + > > > init_llist_head(&i915->display.atomic_helper.free_list); > > > INIT_WORK(&i915->display.atomic_helper.free_work, > > > intel_atomic_helper_free_state_worker); > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c > > > b/drivers/gpu/drm/i915/display/intel_display_power.c > > > index 87c7e082a3b4..ce2386f12f8b 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > > > @@ -19,6 +19,7 @@ > > > #include "intel_mchbar_regs.h" > > > #include "intel_pch_refclk.h" > > > #include "intel_pcode.h" > > > +#include "intel_pm.h" > > > #include "intel_snps_phy.h" > > > #include "skl_watermark.h" > > > #include "vlv_sideband.h" > > > @@ -1081,6 +1082,10 @@ static void gen9_dbuf_enable(struct > > > drm_i915_private *dev_priv) > > > dev_priv->display.dbuf.enabled_slices = > > > intel_enabled_dbuf_slices_mask(dev_priv); > > > > > > + if (DISPLAY_VER(dev_priv) >= 14) > > Other places where pmdemand functions are called, this check is not added, > > instead this check is being done inside the pmdemand function. So it would be > > good to main it the same way here as well. Just call the > > program_dbuf_pmdemant function and inside this have a check for > > DISPLAY_VER 14 and return if not. > > Ok. I will move this check into intel_program_dbuf_pmdemand() function. > > > > > > + intel_program_dbuf_pmdemand(dev_priv, BIT(DBUF_S1) | > > > + dev_priv- > > > >display.dbuf.enabled_slices); > > > + > > > /* > > > * Just power up at least 1 slice, we will > > > * figure out later which slices we have and what we need. > > > @@ -1092,6 +1097,9 @@ static void gen9_dbuf_enable(struct > > > drm_i915_private *dev_priv) static void gen9_dbuf_disable(struct > > > drm_i915_private *dev_priv) { > > > gen9_dbuf_slices_update(dev_priv, 0); > > > + > > > + if (DISPLAY_VER(dev_priv) >= 14) > > > + intel_program_dbuf_pmdemand(dev_priv, 0); > > > } > > > > > > static void gen12_dbuf_slices_config(struct drm_i915_private > > > *dev_priv) diff --git a/drivers/gpu/drm/i915/i915_drv.h > > > b/drivers/gpu/drm/i915/i915_drv.h index 6254aa977398..df3b6742d980 > > > 100644 > > > --- a/drivers/gpu/drm/i915/i915_drv.h > > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > > @@ -250,6 +250,12 @@ struct drm_i915_private { > > > unsigned int hpll_freq; > > > unsigned int czclk_freq; > > > > > > + struct { > > > + wait_queue_head_t waitqueue; > > > + struct mutex lock; > > > + struct intel_global_obj obj; > > > + } pmdemand; > > > + > > > /** > > > * wq - Driver workqueue for GEM. > > > * > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c > > > b/drivers/gpu/drm/i915/i915_irq.c index 417c981e4968..a0d0dd84c429 > > > 100644 > > > --- a/drivers/gpu/drm/i915/i915_irq.c > > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > > @@ -1911,6 +1911,11 @@ static u32 gen8_de_pipe_fault_mask(struct > > > drm_i915_private *dev_priv) > > > return GEN8_DE_PIPE_IRQ_FAULT_ERRORS; } > > > > > > +static void intel_pmdemand_irq_handler(struct drm_i915_private > > > +*dev_priv) { > > > + wake_up_all(&dev_priv->pmdemand.waitqueue); > > > +} > > > + > > > static void > > > gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir) > > > { @@ -1947,6 +1952,18 @@ gen8_de_misc_irq_handler(struct > > > drm_i915_private *dev_priv, u32 iir) > > > } > > > } > > > > > > + if (iir & XELPDP_PMDEMAND_RSPTOUT_ERR) { > > > + drm_dbg(&dev_priv->drm, > > > + "Error waiting for Punit PM Demand Response\n"); > > > + intel_pmdemand_irq_handler(dev_priv); > > > + found = true; > > > + } > > > + > > > + if (iir & XELPDP_PMDEMAND_RSP) { > > > + intel_pmdemand_irq_handler(dev_priv); > > > + found = true; > > > + } > > > + > > > if (!found) > > > drm_err(&dev_priv->drm, "Unexpected DE Misc interrupt\n"); } > > @@ > > > -3313,7 +3330,10 @@ static void gen8_de_irq_postinstall(struct > > > drm_i915_private *dev_priv) > > > if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) > > > de_port_masked |= BXT_DE_PORT_GMBUS; > > > > > > - if (DISPLAY_VER(dev_priv) >= 11) { > > > + if (DISPLAY_VER(dev_priv) >= 14) > > > + de_misc_masked |= XELPDP_PMDEMAND_RSPTOUT_ERR | > > > + XELPDP_PMDEMAND_RSP; > > > + else if (DISPLAY_VER(dev_priv) >= 11) { > > > enum port port; > > > > > > if (intel_bios_is_dsi_present(dev_priv, &port)) diff --git > > > a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > > index 681a301bb65f..d4706ec3cbb7 100644 > > > --- a/drivers/gpu/drm/i915/i915_reg.h > > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > > @@ -5496,8 +5496,10 @@ > > > #define GEN8_DE_MISC_IMR _MMIO(0x44464) #define > GEN8_DE_MISC_IIR > > > _MMIO(0x44468) #define GEN8_DE_MISC_IER _MMIO(0x4446c) > > > -#define GEN8_DE_MISC_GSE (1 << 27) > > > -#define GEN8_DE_EDP_PSR (1 << 19) > > > +#define XELPDP_PMDEMAND_RSPTOUT_ERR REG_BIT(27) > > > +#define GEN8_DE_MISC_GSE REG_BIT(27) > > > +#define GEN8_DE_EDP_PSR REG_BIT(19) > > > +#define XELPDP_PMDEMAND_RSP REG_BIT(3) > > > > > > #define GEN8_PCU_ISR _MMIO(0x444e0) > > > #define GEN8_PCU_IMR _MMIO(0x444e4) > > > @@ -5560,6 +5562,33 @@ > > > #define GEN11_HOTPLUG_CTL_SHORT_DETECT(hpd_pin) (1 << > > > (_HPD_PIN_TC(hpd_pin) * 4)) > > > #define GEN11_HOTPLUG_CTL_NO_DETECT(hpd_pin) (0 << > > > (_HPD_PIN_TC(hpd_pin) * 4)) > > > > > > +#define XELPDP_INITIATE_PMDEMAND_REQUEST(dword) > > > _MMIO(0x45230 + 4 * (dword)) > > > +#define XELPDP_PMDEMAND_QCLK_GV_BW_MASK > > > REG_GENMASK(31, 16) > > > +#define XELPDP_PMDEMAND_QCLK_GV_BW(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_QCLK_GV_BW_MASK, x) > > > +#define XELPDP_PMDEMAND_VOLTAGE_INDEX_MASK > > > REG_GENMASK(14, 12) > > > +#define XELPDP_PMDEMAND_VOLTAGE_INDEX(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_VOLTAGE_INDEX_MASK, x) > > > +#define XELPDP_PMDEMAND_QCLK_GV_INDEX_MASK > > > REG_GENMASK(11, 8) > > > +#define XELPDP_PMDEMAND_QCLK_GV_INDEX(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_QCLK_GV_INDEX_MASK, x) > > > +#define XELPDP_PMDEMAND_PIPES_MASK > > > REG_GENMASK(7, 6) > > > +#define XELPDP_PMDEMAND_PIPES(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_PIPES_MASK, x) > > > +#define XELPDP_PMDEMAND_DBUFS_MASK > > > REG_GENMASK(5, 4) > > > +#define XELPDP_PMDEMAND_DBUFS(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_DBUFS_MASK, x) > > > +#define XELPDP_PMDEMAND_PHYS_MASK > > > REG_GENMASK(2, 0) > > > +#define XELPDP_PMDEMAND_PHYS(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_PHYS_MASK, x) > > > + > > > +#define XELPDP_PMDEMAND_REQ_ENABLE > REG_BIT(31) > > > +#define XELPDP_PMDEMAND_CDCLK_FREQ_MASK > > > REG_GENMASK(30, 20) > > > +#define XELPDP_PMDEMAND_CDCLK_FREQ(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_CDCLK_FREQ_MASK, x) > > > +#define XELPDP_PMDEMAND_DDICLK_FREQ_MASK > > > REG_GENMASK(18, 8) > > > +#define XELPDP_PMDEMAND_DDICLK_FREQ(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_DDICLK_FREQ_MASK, x) > > > +#define XELPDP_PMDEMAND_SCALERS_MASK > > > REG_GENMASK(6, 4) > > > +#define XELPDP_PMDEMAND_SCALERS(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_SCALERS_MASK, x) > > > +#define XELPDP_PMDEMAND_PLLS_MASK > > > REG_GENMASK(2, 0) > > > +#define XELPDP_PMDEMAND_PLLS(x) > > > REG_FIELD_PREP(XELPDP_PMDEMAND_PLLS_MASK, x) > > > + > > > +#define GEN12_DCPR_STATUS_1 > > > _MMIO(0x46440) > > > +#define XELPDP_PMDEMAND_INFLIGHT_STATUS REG_BIT(26) > > > + > > > #define ILK_DISPLAY_CHICKEN2 _MMIO(0x42004) > > > /* Required on all Ironlake and Sandybridge according to the B-Spec. */ > > > #define ILK_ELPIN_409_SELECT (1 << 25) > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > > > b/drivers/gpu/drm/i915/intel_pm.c index ddf004e5bb4b..8bed6406c66e > > > 100644 > > > --- a/drivers/gpu/drm/i915/intel_pm.c > > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > > @@ -25,6 +25,11 @@ > > > * > > > */ > > > > > > +#include <linux/bitops.h> > > > + > > > +#include "display/intel_bw.h" > > > +#include "display/intel_cdclk.h" > > > +#include "display/intel_cx0_phy.h" > > > #include "display/intel_de.h" > > > #include "display/intel_display.h" > > > #include "display/intel_display_trace.h" > > > @@ -124,6 +129,287 @@ static void glk_init_clock_gating(struct > > > drm_i915_private *dev_priv) > > > PWM1_GATING_DIS | PWM2_GATING_DIS); } > > > > > > +static struct intel_global_state > > > +*intel_pmdemand_duplicate_state(struct > > > +intel_global_obj *obj) { > > > + struct intel_pmdemand_state *pmdmnd_state; > > > + > > > + pmdmnd_state = kmemdup(obj->state, sizeof(*pmdmnd_state), > > > GFP_KERNEL); > > > + if (!pmdmnd_state) > > > + return NULL; > > > + > > > + return &pmdmnd_state->base; > > > +} > > > + > > > +static void intel_pmdemand_destroy_state(struct intel_global_obj *obj, > > > + struct intel_global_state *state) { > > > + kfree(state); > > > +} > > > + > > > +static const struct intel_global_state_funcs intel_pmdemand_funcs = { > > > + .atomic_duplicate_state = intel_pmdemand_duplicate_state, > > > + .atomic_destroy_state = intel_pmdemand_destroy_state, }; > > > + > > > +struct intel_pmdemand_state * > > > +intel_atomic_get_pmdemand_state(struct intel_atomic_state *state) { > > > + struct drm_i915_private *dev_priv = to_i915(state->base.dev); > > > + struct intel_global_state *pmdemand_state; > > > + > > > + pmdemand_state = intel_atomic_get_global_obj_state(state, > > > &dev_priv->pmdemand.obj); > > > + if (IS_ERR(pmdemand_state)) > > > + return ERR_CAST(pmdemand_state); > > > + > > > + return to_intel_pmdemand_state(pmdemand_state); > > > +} > > > + > > > +int intel_pmdemand_init(struct drm_i915_private *dev_priv) { > > > + struct intel_pmdemand_state *pmdemand_state; > > > + > > > + pmdemand_state = kzalloc(sizeof(*pmdemand_state), GFP_KERNEL); > > > + if (!pmdemand_state) > > > + return -ENOMEM; > > > + > > > + intel_atomic_global_obj_init(dev_priv, &dev_priv->pmdemand.obj, > > > + &pmdemand_state->base, > > > &intel_pmdemand_funcs); > > > + > > > + return 0; > > > +} > > > + > > > +void intel_init_pmdemand(struct drm_i915_private *dev_priv) { > > > + mutex_init(&dev_priv->pmdemand.lock); > > > + init_waitqueue_head(&dev_priv->pmdemand.waitqueue); > > > +} > > > + > > > +int intel_pmdemand_atomic_check(struct intel_atomic_state *state) { > > > + struct drm_i915_private *dev_priv = to_i915(state->base.dev); > > > + struct intel_pmdemand_state *new_pmdemand_state = NULL; > > > + struct intel_crtc_state *old_crtc_state, *new_crtc_state; > > > + struct intel_crtc *crtc; > > > + struct intel_encoder *encoder; > > > + struct intel_bw_state *new_bw_state; > > > + const struct intel_dbuf_state *new_dbuf_state; > > > + const struct intel_cdclk_state *new_cdclk_state; > > > + int port_clock = 0; > > > + unsigned int data_rate; > > > + enum phy phy; > > > + int i, ret; > > > + > > > + if (DISPLAY_VER(dev_priv) < 14) > > > + return 0; > > > + > > > + new_pmdemand_state = intel_atomic_get_pmdemand_state(state); > > > + if (IS_ERR(new_pmdemand_state)) > > > + return PTR_ERR(new_pmdemand_state); > > > + > > > + ret = intel_atomic_lock_global_state(&new_pmdemand_state- > > > >base); > > > + if (ret) > > > + return ret; > > > + > > > + /* Punit figures out the voltage index based on bandwidth*/ > > > + new_bw_state = intel_atomic_get_bw_state(state); > > > + if (IS_ERR(new_bw_state)) > > > + return PTR_ERR(new_bw_state); > > > + > > > + /* firmware will calculate the qclck_gc_index, requirement is set to > > > +0 > > > */ > > > + new_pmdemand_state->qclk_gv_index = 0; > > > + > > > + data_rate = intel_bw_data_rate(dev_priv, new_bw_state); > > > + /* To MBs then to multiples of 100MBs */ > > > + data_rate = DIV_ROUND_UP(data_rate, 1000); > > > + data_rate = DIV_ROUND_UP(data_rate, 100); > > > + new_pmdemand_state->qclk_gv_bw = data_rate; > > > + > > > + new_dbuf_state = intel_atomic_get_dbuf_state(state); > > > + if (IS_ERR(new_dbuf_state)) > > > + return PTR_ERR(new_dbuf_state); > > > + > > > + i = hweight8(new_dbuf_state->active_pipes); > > > + new_pmdemand_state->active_pipes = min(i, 3); > > > + > > > + new_cdclk_state = intel_atomic_get_cdclk_state(state); > > > + if (IS_ERR(new_cdclk_state)) > > > + return PTR_ERR(new_cdclk_state); > > > + > > > + new_pmdemand_state->voltage_index = new_cdclk_state- > > > >logical.voltage_level; > > > + /* KHz to MHz */ > > > + new_pmdemand_state->cdclk_freq_mhz = > > > +DIV_ROUND_UP(new_cdclk_state->logical.cdclk, 1000); > > > + > > > + new_pmdemand_state->active_phys_plls_mask = 0; > > > + > > > + for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, > > > new_crtc_state, i) { > > > + if (!new_crtc_state->hw.active) > > > + continue; > > > + > > > + encoder = intel_get_crtc_new_encoder(state, > > > new_crtc_state); > > > + if (!encoder) > > > + continue; > > > + > > > + phy = intel_port_to_phy(dev_priv, encoder->port); > > > + > > > + if (intel_is_c10phy(dev_priv, phy)) > > > + new_pmdemand_state->active_phys_plls_mask |= > > > BIT(phy); > > Is this not required for C20 phy? > I think this would be required for C20 as well. I will check this but I think this > intel_is_c10phy() check could be removed. Bspec: 64995 Mentions that while programming active phy's and pll's type-c/tbt phy/pll's should not be counted. -Radhakrishna(RK) Sripada > > Thanks for the review & comments! > > -Mika- > > > > > Thanks and Regards, > > Arun R Murthy > > -------------------- > > > + > > > + port_clock = max(port_clock, new_crtc_state->port_clock); > > > + } > > > + > > > + /* To MHz */ > > > + new_pmdemand_state->ddiclk_freq_mhz = > > > DIV_ROUND_UP(port_clock, 1000); > > > + > > > + /* > > > + * Setting scalers to max as it can not be calculated during flips and > > > + * fastsets without taking global states locks. > > > + */ > > > + new_pmdemand_state->scalers = 7; > > > + > > > + return 0; > > > +} > > > + > > > +static bool intel_pmdemand_check_prev_transaction(struct > > > +drm_i915_private *dev_priv) { > > > + return !((intel_de_read(dev_priv, > > > XELPDP_INITIATE_PMDEMAND_REQUEST(1)) & > > > XELPDP_PMDEMAND_REQ_ENABLE) || > > > + (intel_de_read(dev_priv, GEN12_DCPR_STATUS_1) & > > > +XELPDP_PMDEMAND_INFLIGHT_STATUS)); > > > +} > > > + > > > +static bool intel_pmdemand_req_complete(struct drm_i915_private > > > +*dev_priv) { > > > + return !(intel_de_read(dev_priv, > > > XELPDP_INITIATE_PMDEMAND_REQUEST(1)) > > > +& XELPDP_PMDEMAND_REQ_ENABLE); } > > > + > > > +static int intel_pmdemand_wait(struct drm_i915_private *dev_priv) { > > > + DEFINE_WAIT(wait); > > > + int ret; > > > + const unsigned int timeout_ms = 10; > > > + > > > + add_wait_queue(&dev_priv->pmdemand.waitqueue, &wait); > > > + > > > + ret = wait_event_timeout(dev_priv->pmdemand.waitqueue, > > > + intel_pmdemand_req_complete(dev_priv), > > > + msecs_to_jiffies_timeout(timeout_ms)); > > > + if (ret < 0) > > > + drm_err(&dev_priv->drm, > > > + "timed out waiting for Punit PM Demand > > > Response\n"); > > > + > > > + remove_wait_queue(&dev_priv->pmdemand.waitqueue, &wait); > > > + > > > + return ret; > > > +} > > > + > > > +/* Required to be programmed during Display Init Sequences. */ void > > > +intel_program_dbuf_pmdemand(struct drm_i915_private *dev_priv, > > > + u8 dbuf_slices) > > > +{ > > > + mutex_lock(&dev_priv->pmdemand.lock); > > > + if (drm_WARN_ON(&dev_priv->drm, > > > + > > > !intel_pmdemand_check_prev_transaction(dev_priv))) > > > + goto unlock; > > > + > > > + intel_de_rmw(dev_priv, XELPDP_INITIATE_PMDEMAND_REQUEST(0), > > > + XELPDP_PMDEMAND_DBUFS_MASK, > > > + XELPDP_PMDEMAND_DBUFS(hweight32(dbuf_slices))); > > > + intel_de_rmw(dev_priv, XELPDP_INITIATE_PMDEMAND_REQUEST(1), > > > 0, > > > + XELPDP_PMDEMAND_REQ_ENABLE); > > > + > > > + intel_pmdemand_wait(dev_priv); > > > +unlock: > > > + mutex_unlock(&dev_priv->pmdemand.lock); > > > +} > > > + > > > +static void intel_program_pmdemand(struct drm_i915_private *dev_priv, > > > + const struct intel_pmdemand_state *new, > > > + const struct intel_pmdemand_state *old) { > > > + u32 val, tmp; > > > + > > > +#define UPDATE_PMDEMAND_VAL(val, F, f) do { \ > > > + val &= (~(XELPDP_PMDEMAND_##F##_MASK)); \ > > > + val |= (XELPDP_PMDEMAND_##F((u32)(old ? max(old->f, new->f) : > > > +new->f))); \ } while (0) > > > + > > > + mutex_lock(&dev_priv->pmdemand.lock); > > > + if (drm_WARN_ON(&dev_priv->drm, > > > + > > > !intel_pmdemand_check_prev_transaction(dev_priv))) > > > + goto unlock; > > > + > > > + /* > > > + * TODO: Update programming PM Demand for > > > + * PHYS, PLLS, DDI_CLKFREQ, SCALARS > > > + */ > > Why this TODO, I see the updates being done below. > > > > > + val = intel_de_read(dev_priv, > > > XELPDP_INITIATE_PMDEMAND_REQUEST(0)); > > > + UPDATE_PMDEMAND_VAL(val, QCLK_GV_INDEX, qclk_gv_index); > > > + UPDATE_PMDEMAND_VAL(val, QCLK_GV_BW, qclk_gv_bw); > > > + UPDATE_PMDEMAND_VAL(val, VOLTAGE_INDEX, voltage_index); > > > + UPDATE_PMDEMAND_VAL(val, PIPES, active_pipes); > > > + UPDATE_PMDEMAND_VAL(val, DBUFS, dbufs); > > > + tmp = hweight32(new->active_phys_plls_mask); > > > + if (old) > > > + tmp = max(tmp, hweight32(old->active_phys_plls_mask)); > > > + val |= XELPDP_PMDEMAND_PHYS(tmp); > > > + > > > + intel_de_write(dev_priv, > > > XELPDP_INITIATE_PMDEMAND_REQUEST(0), val); > > > + > > > + val = intel_de_read(dev_priv, > > > XELPDP_INITIATE_PMDEMAND_REQUEST(1)); > > > + UPDATE_PMDEMAND_VAL(val, CDCLK_FREQ, cdclk_freq_mhz); > > > + UPDATE_PMDEMAND_VAL(val, DDICLK_FREQ, ddiclk_freq_mhz); > > > + UPDATE_PMDEMAND_VAL(val, SCALERS, scalers); > > > + /* > > > + * Active_PLLs starts with 1 because of CDCLK PLL. > > > + * TODO: Missing to account genlock filter when it gets used. > > > + */ > > > + val |= XELPDP_PMDEMAND_PLLS(tmp + 1); > > > + > > > + intel_de_write(dev_priv, > > > XELPDP_INITIATE_PMDEMAND_REQUEST(1), val); > > > + > > > +#undef UPDATE_PM_DEMAND_VAL > > > + > > > + intel_de_rmw(dev_priv, XELPDP_INITIATE_PMDEMAND_REQUEST(1), > > > 0, > > > +XELPDP_PMDEMAND_REQ_ENABLE); > > > + > > > + intel_pmdemand_wait(dev_priv); > > > +unlock: > > > + mutex_unlock(&dev_priv->pmdemand.lock); > > > +} > > > + > > > +void intel_pmdemand_pre_plane_update(struct intel_atomic_state > > > +*state) { > > > + struct drm_i915_private *dev_priv = to_i915(state->base.dev); > > > + const struct intel_pmdemand_state *new_pmdmnd_state = > > > + intel_atomic_get_new_pmdemand_state(state); > > > + const struct intel_pmdemand_state *old_pmdmnd_state = > > > + intel_atomic_get_old_pmdemand_state(state); > > > + > > > + if (DISPLAY_VER(dev_priv) < 14) > > > + return; > > > + > > > + if (!new_pmdmnd_state || > > > + memcmp(new_pmdmnd_state, old_pmdmnd_state, > > > sizeof(*new_pmdmnd_state)) == 0) > > > + return; > > > + > > > + intel_program_pmdemand(dev_priv, new_pmdmnd_state, > > > old_pmdmnd_state); > > > +} > > > + > > > +void intel_pmdemand_post_plane_update(struct intel_atomic_state > > > +*state) { > > > + struct drm_i915_private *dev_priv = to_i915(state->base.dev); > > > + const struct intel_pmdemand_state *new_pmdmnd_state = > > > + intel_atomic_get_new_pmdemand_state(state); > > > + const struct intel_pmdemand_state *old_pmdmnd_state = > > > + intel_atomic_get_old_pmdemand_state(state); > > > + > > > + if (DISPLAY_VER(dev_priv) < 14) > > > + return; > > > + > > > + if (!new_pmdmnd_state || > > > + memcmp(new_pmdmnd_state, old_pmdmnd_state, > > > sizeof(*new_pmdmnd_state)) == 0) > > > + return; > > > + > > > + intel_program_pmdemand(dev_priv, new_pmdmnd_state, NULL); } > > > + > > > static void ibx_init_clock_gating(struct drm_i915_private *dev_priv) { > > > /* > > > diff --git a/drivers/gpu/drm/i915/intel_pm.h > > > b/drivers/gpu/drm/i915/intel_pm.h index eab60df0c6bb..db5763ace31a > > > 100644 > > > --- a/drivers/gpu/drm/i915/intel_pm.h > > > +++ b/drivers/gpu/drm/i915/intel_pm.h > > > @@ -8,13 +8,48 @@ > > > > > > #include <linux/types.h> > > > > > > +#include "display/intel_global_state.h" > > > + > > > struct drm_i915_private; > > > struct intel_crtc_state; > > > struct intel_plane_state; > > > > > > void intel_init_clock_gating(struct drm_i915_private *dev_priv); > > > void intel_suspend_hw(struct drm_i915_private *dev_priv); > > > +void intel_init_pmdemand(struct drm_i915_private *dev_priv); > > > void intel_init_clock_gating_hooks(struct drm_i915_private > > > *dev_priv); void intel_pm_setup(struct drm_i915_private *dev_priv); > > > > > > +struct intel_pmdemand_state { > > > + struct intel_global_state base; > > > + > > > + u16 qclk_gv_bw; > > > + u8 voltage_index; > > > + u8 qclk_gv_index; > > > + u8 active_pipes; > > > + u8 dbufs; > > > + u8 active_phys_plls_mask; > > > + u16 cdclk_freq_mhz; > > > + u16 ddiclk_freq_mhz; > > > + u8 scalers; > > > +}; > > > + > > > +int intel_pmdemand_init(struct drm_i915_private *dev_priv); > > > + > > > +struct intel_pmdemand_state * > > > +intel_atomic_get_pmdemand_state(struct intel_atomic_state *state); > > > + > > > +#define to_intel_pmdemand_state(x) container_of((x), struct > > > +intel_pmdemand_state, base) #define > > > intel_atomic_get_old_pmdemand_state(state) \ > > > + > > > to_intel_pmdemand_state(intel_atomic_get_old_global_obj_state(st > > > ate, > > > +&to_i915(state->base.dev)->pmdemand.obj)) > > > +#define intel_atomic_get_new_pmdemand_state(state) \ > > > + > > > to_intel_pmdemand_state(intel_atomic_get_new_global_obj_state(s > > > tate, > > > +&to_i915(state->base.dev)->pmdemand.obj)) > > > + > > > +int intel_pmdemand_init(struct drm_i915_private *dev_priv); void > > > +intel_program_dbuf_pmdemand(struct drm_i915_private *dev_priv, > > > + u8 dbuf_slices); > > > +void intel_pmdemand_pre_plane_update(struct intel_atomic_state > > > +*state); void intel_pmdemand_post_plane_update(struct > > > +intel_atomic_state *state); int intel_pmdemand_atomic_check(struct > > > +intel_atomic_state *state); > > > + > > > #endif /* __INTEL_PM_H__ */ > > > -- > > > 2.34.1
