niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/display/panel: use intel_de_rmw if possible in panel related code

Browse source 
The helper makes the code more compact and readable.

Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230105131046.2173431-7-andrzej.hajda@intel.com
This commit is contained in:
Andrzej Hajda 2023-01-05 14:10:44 +01:00 • committed by Jani Nikula
parent cd5103eed5
commit aa80b2b12b
3 changed files with 37 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
drivers/gpu/drm/i915/display/intel_backlight.c
View file

@ -349,8 +349,7 @@ static void lpt_disable_backlight(const struct drm_connector_state *old_conn_sta
intel_de_write(i915, BLC_PWM_CPU_CTL2, tmp & ~BLM_PWM_ENABLE); intel_de_write(i915, BLC_PWM_CPU_CTL2, tmp & ~BLM_PWM_ENABLE);
} }
tmp = intel_de_read(i915, BLC_PWM_PCH_CTL1); tmp = intel_de_rmw(i915, BLC_PWM_PCH_CTL1, BLM_PCH_PWM_ENABLE, 0);
intel_de_write(i915, BLC_PWM_PCH_CTL1, tmp & ~BLM_PCH_PWM_ENABLE);
} }
static void pch_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val) static void pch_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val)
@ -361,11 +360,9 @@ static void pch_disable_backlight(const struct drm_connector_state *old_conn_sta
intel_backlight_set_pwm_level(old_conn_state, val); intel_backlight_set_pwm_level(old_conn_state, val);
tmp = intel_de_read(i915, BLC_PWM_CPU_CTL2); intel_de_rmw(i915, BLC_PWM_CPU_CTL2, BLM_PWM_ENABLE, 0);
intel_de_write(i915, BLC_PWM_CPU_CTL2, tmp & ~BLM_PWM_ENABLE);
tmp = intel_de_read(i915, BLC_PWM_PCH_CTL1); tmp = intel_de_rmw(i915, BLC_PWM_PCH_CTL1, BLM_PCH_PWM_ENABLE, 0);
intel_de_write(i915, BLC_PWM_PCH_CTL1, tmp & ~BLM_PCH_PWM_ENABLE);
} }
static void i9xx_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val) static void i9xx_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val)
@ -380,8 +377,7 @@ static void i965_disable_backlight(const struct drm_connector_state *old_conn_st
intel_backlight_set_pwm_level(old_conn_state, val); intel_backlight_set_pwm_level(old_conn_state, val);
tmp = intel_de_read(i915, BLC_PWM_CTL2); tmp = intel_de_rmw(i915, BLC_PWM_CTL2, BLM_PWM_ENABLE, 0);
intel_de_write(i915, BLC_PWM_CTL2, tmp & ~BLM_PWM_ENABLE);
} }
static void vlv_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val) static void vlv_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val)
@ -393,8 +389,7 @@ static void vlv_disable_backlight(const struct drm_connector_state *old_conn_sta
intel_backlight_set_pwm_level(old_conn_state, val); intel_backlight_set_pwm_level(old_conn_state, val);
tmp = intel_de_read(i915, VLV_BLC_PWM_CTL2(pipe)); tmp = intel_de_rmw(i915, VLV_BLC_PWM_CTL2(pipe), BLM_PWM_ENABLE, 0);
intel_de_write(i915, VLV_BLC_PWM_CTL2(pipe), tmp & ~BLM_PWM_ENABLE);
} }
static void bxt_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val) static void bxt_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val)
@ -402,19 +397,14 @@ static void bxt_disable_backlight(const struct drm_connector_state *old_conn_sta
struct intel_connector *connector = to_intel_connector(old_conn_state->connector); struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
struct drm_i915_private *i915 = to_i915(connector->base.dev); struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel; struct intel_panel *panel = &connector->panel;
u32 tmp;
intel_backlight_set_pwm_level(old_conn_state, val); intel_backlight_set_pwm_level(old_conn_state, val);
tmp = intel_de_read(i915, BXT_BLC_PWM_CTL(panel->backlight.controller)); intel_de_rmw(i915, BXT_BLC_PWM_CTL(panel->backlight.controller),
intel_de_write(i915, BXT_BLC_PWM_CTL(panel->backlight.controller), BXT_BLC_PWM_ENABLE, 0);
tmp & ~BXT_BLC_PWM_ENABLE);
if (panel->backlight.controller == 1) { if (panel->backlight.controller == 1)
val = intel_de_read(i915, UTIL_PIN_CTL); intel_de_rmw(i915, UTIL_PIN_CTL, UTIL_PIN_ENABLE, 0);
val &= ~UTIL_PIN_ENABLE;
intel_de_write(i915, UTIL_PIN_CTL, val);
}
} }
static void cnp_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val) static void cnp_disable_backlight(const struct drm_connector_state *old_conn_state, u32 val)
@ -422,13 +412,11 @@ static void cnp_disable_backlight(const struct drm_connector_state *old_conn_sta
struct intel_connector *connector = to_intel_connector(old_conn_state->connector); struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
struct drm_i915_private *i915 = to_i915(connector->base.dev); struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel; struct intel_panel *panel = &connector->panel;
u32 tmp;
intel_backlight_set_pwm_level(old_conn_state, val); intel_backlight_set_pwm_level(old_conn_state, val);
tmp = intel_de_read(i915, BXT_BLC_PWM_CTL(panel->backlight.controller)); intel_de_rmw(i915, BXT_BLC_PWM_CTL(panel->backlight.controller),
intel_de_write(i915, BXT_BLC_PWM_CTL(panel->backlight.controller), BXT_BLC_PWM_ENABLE, 0);
tmp & ~BXT_BLC_PWM_ENABLE);
} }
static void ext_pwm_disable_backlight(const struct drm_connector_state *old_conn_state, u32 level) static void ext_pwm_disable_backlight(const struct drm_connector_state *old_conn_state, u32 level)
@ -478,7 +466,7 @@ static void lpt_enable_backlight(const struct intel_crtc_state *crtc_state,
struct intel_connector *connector = to_intel_connector(conn_state->connector); struct intel_connector *connector = to_intel_connector(conn_state->connector);
struct drm_i915_private *i915 = to_i915(connector->base.dev); struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct intel_panel *panel = &connector->panel; struct intel_panel *panel = &connector->panel;
u32 pch_ctl1, pch_ctl2, schicken; u32 pch_ctl1, pch_ctl2;
pch_ctl1 = intel_de_read(i915, BLC_PWM_PCH_CTL1); pch_ctl1 = intel_de_read(i915, BLC_PWM_PCH_CTL1);
if (pch_ctl1 & BLM_PCH_PWM_ENABLE) { if (pch_ctl1 & BLM_PCH_PWM_ENABLE) {
@ -487,21 +475,14 @@ static void lpt_enable_backlight(const struct intel_crtc_state *crtc_state,
intel_de_write(i915, BLC_PWM_PCH_CTL1, pch_ctl1); intel_de_write(i915, BLC_PWM_PCH_CTL1, pch_ctl1);
} }
if (HAS_PCH_LPT(i915)) { if (HAS_PCH_LPT(i915))
schicken = intel_de_read(i915, SOUTH_CHICKEN2); intel_de_rmw(i915, SOUTH_CHICKEN2, LPT_PWM_GRANULARITY,
if (panel->backlight.alternate_pwm_increment) panel->backlight.alternate_pwm_increment ?
schicken |= LPT_PWM_GRANULARITY; LPT_PWM_GRANULARITY : 0);
else else
schicken &= ~LPT_PWM_GRANULARITY; intel_de_rmw(i915, SOUTH_CHICKEN1, SPT_PWM_GRANULARITY,
intel_de_write(i915, SOUTH_CHICKEN2, schicken); panel->backlight.alternate_pwm_increment ?
} else { SPT_PWM_GRANULARITY : 0);
schicken = intel_de_read(i915, SOUTH_CHICKEN1);
if (panel->backlight.alternate_pwm_increment)
schicken |= SPT_PWM_GRANULARITY;
else
schicken &= ~SPT_PWM_GRANULARITY;
intel_de_write(i915, SOUTH_CHICKEN1, schicken);
}
pch_ctl2 = panel->backlight.pwm_level_max << 16; pch_ctl2 = panel->backlight.pwm_level_max << 16;
intel_de_write(i915, BLC_PWM_PCH_CTL2, pch_ctl2); intel_de_write(i915, BLC_PWM_PCH_CTL2, pch_ctl2);

14
drivers/gpu/drm/i915/display/intel_pps.c
View file

@ -1535,17 +1535,13 @@ static void pps_init_registers(struct intel_dp *intel_dp, bool force_disable_vdd
/* /*
* Compute the divisor for the pp clock, simply match the Bspec formula. * Compute the divisor for the pp clock, simply match the Bspec formula.
*/ */
if (i915_mmio_reg_valid(regs.pp_div)) { if (i915_mmio_reg_valid(regs.pp_div))
intel_de_write(dev_priv, regs.pp_div, intel_de_write(dev_priv, regs.pp_div,
REG_FIELD_PREP(PP_REFERENCE_DIVIDER_MASK, (100 * div) / 2 - 1) | REG_FIELD_PREP(PANEL_POWER_CYCLE_DELAY_MASK, DIV_ROUND_UP(seq->t11_t12, 1000))); REG_FIELD_PREP(PP_REFERENCE_DIVIDER_MASK, (100 * div) / 2 - 1) | REG_FIELD_PREP(PANEL_POWER_CYCLE_DELAY_MASK, DIV_ROUND_UP(seq->t11_t12, 1000)));
} else { else
u32 pp_ctl; intel_de_rmw(dev_priv, regs.pp_ctrl, BXT_POWER_CYCLE_DELAY_MASK,
REG_FIELD_PREP(BXT_POWER_CYCLE_DELAY_MASK,
pp_ctl = intel_de_read(dev_priv, regs.pp_ctrl); DIV_ROUND_UP(seq->t11_t12, 1000)));
pp_ctl &= ~BXT_POWER_CYCLE_DELAY_MASK;
pp_ctl |= REG_FIELD_PREP(BXT_POWER_CYCLE_DELAY_MASK, DIV_ROUND_UP(seq->t11_t12, 1000));
intel_de_write(dev_priv, regs.pp_ctrl, pp_ctl);
}
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n", "panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n",

40
drivers/gpu/drm/i915/display/intel_psr.c
View file

@ -152,7 +152,7 @@ static void psr_irq_control(struct intel_dp *intel_dp)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
i915_reg_t imr_reg; i915_reg_t imr_reg;
u32 mask, val; u32 mask;
if (DISPLAY_VER(dev_priv) >= 12) if (DISPLAY_VER(dev_priv) >= 12)
imr_reg = TRANS_PSR_IMR(intel_dp->psr.transcoder); imr_reg = TRANS_PSR_IMR(intel_dp->psr.transcoder);
@ -164,10 +164,7 @@ static void psr_irq_control(struct intel_dp *intel_dp)
mask |= psr_irq_post_exit_bit_get(intel_dp) | mask |= psr_irq_post_exit_bit_get(intel_dp) |
psr_irq_pre_entry_bit_get(intel_dp); psr_irq_pre_entry_bit_get(intel_dp);
val = intel_de_read(dev_priv, imr_reg); intel_de_rmw(dev_priv, imr_reg, psr_irq_mask_get(intel_dp), ~mask);
val &= ~psr_irq_mask_get(intel_dp);
val |= ~mask;
intel_de_write(dev_priv, imr_reg, val);
} }
static void psr_event_print(struct drm_i915_private *i915, static void psr_event_print(struct drm_i915_private *i915,
@ -245,8 +242,6 @@ void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir)
} }
if (psr_iir & psr_irq_psr_error_bit_get(intel_dp)) { if (psr_iir & psr_irq_psr_error_bit_get(intel_dp)) {
u32 val;
drm_warn(&dev_priv->drm, "[transcoder %s] PSR aux error\n", drm_warn(&dev_priv->drm, "[transcoder %s] PSR aux error\n",
transcoder_name(cpu_transcoder)); transcoder_name(cpu_transcoder));
@ -260,9 +255,7 @@ void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir)
* again so we don't care about unmask the interruption * again so we don't care about unmask the interruption
* or unset irq_aux_error. * or unset irq_aux_error.
*/ */
val = intel_de_read(dev_priv, imr_reg); intel_de_rmw(dev_priv, imr_reg, 0, psr_irq_psr_error_bit_get(intel_dp));
val |= psr_irq_psr_error_bit_get(intel_dp);
intel_de_write(dev_priv, imr_reg, val);
schedule_work(&intel_dp->psr.work); schedule_work(&intel_dp->psr.work);
} }
@ -631,13 +624,10 @@ static void psr2_program_idle_frames(struct intel_dp *intel_dp,
u32 idle_frames) u32 idle_frames)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
u32 val;
idle_frames <<= EDP_PSR2_IDLE_FRAME_SHIFT; idle_frames <<= EDP_PSR2_IDLE_FRAME_SHIFT;
val = intel_de_read(dev_priv, EDP_PSR2_CTL(intel_dp->psr.transcoder)); intel_de_rmw(dev_priv, EDP_PSR2_CTL(intel_dp->psr.transcoder),
val &= ~EDP_PSR2_IDLE_FRAME_MASK; EDP_PSR2_IDLE_FRAME_MASK, idle_frames);
val |= idle_frames;
intel_de_write(dev_priv, EDP_PSR2_CTL(intel_dp->psr.transcoder), val);
} }
static void tgl_psr2_enable_dc3co(struct intel_dp *intel_dp) static void tgl_psr2_enable_dc3co(struct intel_dp *intel_dp)
@ -1125,19 +1115,13 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
psr_irq_control(intel_dp); psr_irq_control(intel_dp);
if (intel_dp->psr.dc3co_exitline) { /*
u32 val; * TODO: if future platforms supports DC3CO in more than one
* transcoder, EXITLINE will need to be unset when disabling PSR
/* */
* TODO: if future platforms supports DC3CO in more than one if (intel_dp->psr.dc3co_exitline)
* transcoder, EXITLINE will need to be unset when disabling PSR intel_de_rmw(dev_priv, EXITLINE(cpu_transcoder), EXITLINE_MASK,
*/ intel_dp->psr.dc3co_exitline << EXITLINE_SHIFT | EXITLINE_ENABLE);
val = intel_de_read(dev_priv, EXITLINE(cpu_transcoder));
val &= ~EXITLINE_MASK;
val |= intel_dp->psr.dc3co_exitline << EXITLINE_SHIFT;
val |= EXITLINE_ENABLE;
intel_de_write(dev_priv, EXITLINE(cpu_transcoder), val);
}
if (HAS_PSR_HW_TRACKING(dev_priv) && HAS_PSR2_SEL_FETCH(dev_priv)) if (HAS_PSR_HW_TRACKING(dev_priv) && HAS_PSR2_SEL_FETCH(dev_priv))
intel_de_rmw(dev_priv, CHICKEN_PAR1_1, IGNORE_PSR2_HW_TRACKING, intel_de_rmw(dev_priv, CHICKEN_PAR1_1, IGNORE_PSR2_HW_TRACKING,