[Intel-gfx] [PATCH] drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

Ville Syrjälä ville.syrjala at linux.intel.com
Fri Jun 30 17:25:03 UTC 2023


On Wed, Jun 28, 2023 at 05:10:17PM +0300, Stanislav Lisovskiy wrote:
> If we are using Bigjoiner dpll_hw_state is supposed to be exactly
> same as for master crtc, so no need to save it's state for slave crtc.

Yeah, and the master has recalculated this already. I guess this
used to make some sense in the times when we did the dpll
calculations much later.

So probably deserves a
Fixes: 0ff0e219d9b8 ("drm/i915: Compute clocks earlier")

Anyways,
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> 
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 43d6ba980780..c3e93bdde29d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -4568,7 +4568,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
>  	saved_state->uapi = slave_crtc_state->uapi;
>  	saved_state->scaler_state = slave_crtc_state->scaler_state;
>  	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
> -	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;

Seems like we should also remove it from the
intel_crtc_prepare_cleared_state() but that one clearly needs
much more thought due to the port_dpll[] stuff...

>  	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
>  
>  	intel_crtc_free_hw_state(slave_crtc_state);
> -- 
> 2.37.3

-- 
Ville Syrjälä
Intel


More information about the Intel-gfx mailing list