diff options
| author | Ville Syrjälä <[email protected]> | 2025-02-13 15:02:16 +0000 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2025-02-15 19:04:06 +0000 |
| commit | 9fa560f70e249c937c7eddec019fd1c304bff135 (patch) | |
| tree | c15c558e7fab15c7ef9683aee7933952caf72f82 /drivers/gpu/drm/i915/display/intel_dpio_phy.c | |
| parent | drm/i915: Relocate vlv_wait_port_ready() (diff) | |
| download | kernel-9fa560f70e249c937c7eddec019fd1c304bff135.tar.gz kernel-9fa560f70e249c937c7eddec019fd1c304bff135.zip | |
drm/i915: Simplify vlv_wait_port_ready() arguments
Currently vlv_wait_port_ready() takes the display+dig_port,
but all it really needs is the encoder. The display can be
dug out from therein.
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Jani Nikula <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dpio_phy.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpio_phy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c index 968b795206b3..429f89543789 100644 --- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c +++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c @@ -1157,16 +1157,16 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder, vlv_dpio_put(dev_priv); } -void vlv_wait_port_ready(struct intel_display *display, - struct intel_digital_port *dig_port, +void vlv_wait_port_ready(struct intel_encoder *encoder, unsigned int expected_mask) { + struct intel_display *display = to_intel_display(encoder); u32 port_mask; i915_reg_t dpll_reg; - switch (dig_port->base.port) { + switch (encoder->port) { default: - MISSING_CASE(dig_port->base.port); + MISSING_CASE(encoder->port); fallthrough; case PORT_B: port_mask = DPLL_PORTB_READY_MASK; @@ -1186,7 +1186,7 @@ void vlv_wait_port_ready(struct intel_display *display, if (intel_de_wait(display, dpll_reg, port_mask, expected_mask, 1000)) drm_WARN(display->drm, 1, "timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n", - dig_port->base.base.base.id, dig_port->base.base.name, + encoder->base.base.id, encoder->base.name, intel_de_read(display, dpll_reg) & port_mask, expected_mask); } |