From: Ville Syrjälä <[email protected]> We'll need to do additional adjustments to the pipe pixel rate for the purposes of min CDCLK calculations. Add a new crtc_state->pixel_rate_cdclk for that purpose. We'll leave the original crtc_state->pixel_rate for data rate related calculations since we presumably don't need those extra adjustments there.
Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 4 ++-- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 8 ++++++-- .../gpu/drm/i915/display/intel_display_types.h | 7 +++++++ drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- .../gpu/drm/i915/display/intel_modeset_setup.c | 2 +- drivers/gpu/drm/i915/display/intel_sprite.c | 18 +++++++++--------- 8 files changed, 28 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/display/hsw_ips.c b/drivers/gpu/drm/i915/display/hsw_ips.c index cbaef3f13f00..f828ec962164 100644 --- a/drivers/gpu/drm/i915/display/hsw_ips.c +++ b/drivers/gpu/drm/i915/display/hsw_ips.c @@ -207,7 +207,7 @@ static int _hsw_ips_min_cdclk(const struct intel_crtc_state *crtc_state) struct intel_display *display = to_intel_display(crtc_state); if (display->platform.broadwell) - return DIV_ROUND_UP(crtc_state->pixel_rate * 100, 95); + return DIV_ROUND_UP(crtc_state->pixel_rate_cdclk * 100, 95); /* no IPS specific limits to worry about */ return 0; diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c index 70734d32a409..b3dbcd53999a 100644 --- a/drivers/gpu/drm/i915/display/i9xx_plane.c +++ b/drivers/gpu/drm/i915/display/i9xx_plane.c @@ -418,13 +418,13 @@ static int i9xx_plane_min_cdclk(const struct intel_crtc_state *crtc_state, unsigned int num, den; /* - * Note that crtc_state->pixel_rate accounts for both + * Note that crtc_state->pixel_rate_cdclk accounts for both * horizontal and vertical panel fitter downscaling factors. * Pre-HSW bspec tells us to only consider the horizontal * downscaling factor here. We ignore that and just consider * both for simplicity. */ - pixel_rate = crtc_state->pixel_rate; + pixel_rate = crtc_state->pixel_rate_cdclk; i9xx_plane_ratio(crtc_state, plane_state, &num, &den); diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c index 12bb6c414683..a53d88727177 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -2936,7 +2936,7 @@ static int _intel_pixel_rate_to_cdclk(const struct intel_crtc_state *crtc_state, static int intel_pixel_rate_to_cdclk(const struct intel_crtc_state *crtc_state) { - return _intel_pixel_rate_to_cdclk(crtc_state, crtc_state->pixel_rate); + return _intel_pixel_rate_to_cdclk(crtc_state, crtc_state->pixel_rate_cdclk); } static int intel_planes_min_cdclk(const struct intel_crtc_state *crtc_state) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 38763a6802c5..df43be51b3ba 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -2259,13 +2259,16 @@ static void intel_crtc_compute_pixel_rate(struct intel_crtc_state *crtc_state) { struct intel_display *display = to_intel_display(crtc_state); - if (HAS_GMCH(display)) + if (HAS_GMCH(display)) { /* FIXME calculate proper pipe pixel rate for GMCH pfit */ crtc_state->pixel_rate = crtc_state->hw.pipe_mode.crtc_clock; - else + crtc_state->pixel_rate_cdclk = crtc_state->pixel_rate; + } else { crtc_state->pixel_rate = ilk_pipe_pixel_rate(crtc_state); + crtc_state->pixel_rate_cdclk = crtc_state->pixel_rate; + } } static void intel_joiner_adjust_timings(const struct intel_crtc_state *crtc_state, @@ -5382,6 +5385,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, PIPE_CONF_CHECK_I(pch_pfit.casf.strength); PIPE_CONF_CHECK_I(scaler_state.scaler_id); + PIPE_CONF_CHECK_I(pixel_rate_cdclk); PIPE_CONF_CHECK_I(pixel_rate); PIPE_CONF_CHECK_X(gamma_mode); diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 8bd213db5e7a..17336ad6d5e9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1083,6 +1083,13 @@ struct intel_crtc_state { */ unsigned int pixel_rate; + /* + * Pipe pixel rate for CDCLK, adjusted for + * panel fitter/pipe scaler downscaling. + * CDCLK use cases need further adjustment. + */ + unsigned int pixel_rate_cdclk; + /* Whether to set up the PCH/FDI. Note that we never allow sharing * between pch encoders and cpu encoders. */ bool has_pch_encoder; diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index a7d02dd6ca96..cd889f7429bb 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -1567,7 +1567,7 @@ static int _intel_fbc_min_cdclk(const struct intel_crtc_state *crtc_state) /* WaFbcExceedCdClockThreshold:hsw,bdw */ if (display->platform.haswell || display->platform.broadwell) - return DIV_ROUND_UP(crtc_state->pixel_rate * 100, 95); + return DIV_ROUND_UP(crtc_state->pixel_rate_cdclk * 100, 95); /* no FBC specific limits to worry about */ return 0; diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c index 14d829171c7d..6aed88173770 100644 --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c @@ -856,7 +856,7 @@ static void intel_modeset_readout_hw_state(struct intel_display *display) */ if (plane_state->uapi.visible && plane->min_cdclk) crtc_state->plane_min_cdclk[plane->id] = - DIV_ROUND_UP(crtc_state->pixel_rate, + DIV_ROUND_UP(crtc_state->pixel_rate_cdclk, intel_cdclk_ppc(display, crtc_state->double_wide)); drm_dbg_kms(display->drm, "[PLANE:%d:%s] min_cdclk %d kHz\n", diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c index 6a65f92e8a03..9fe9d2644958 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -241,13 +241,13 @@ int vlv_plane_min_cdclk(const struct intel_crtc_state *crtc_state, unsigned int num, den; /* - * Note that crtc_state->pixel_rate accounts for both + * Note that crtc_state->pixel_rate_cdclk accounts for both * horizontal and vertical panel fitter downscaling factors. * Pre-HSW bspec tells us to only consider the horizontal * downscaling factor here. We ignore that and just consider * both for simplicity. */ - pixel_rate = crtc_state->pixel_rate; + pixel_rate = crtc_state->pixel_rate_cdclk; vlv_plane_ratio(crtc_state, plane_state, &num, &den); @@ -550,13 +550,13 @@ int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state, unsigned int num, den; /* - * Note that crtc_state->pixel_rate accounts for both + * Note that crtc_state->pixel_rate_cdclk accounts for both * horizontal and vertical panel fitter downscaling factors. * Pre-HSW bspec tells us to only consider the horizontal * downscaling factor here. We ignore that and just consider * both for simplicity. */ - pixel_rate = crtc_state->pixel_rate; + pixel_rate = crtc_state->pixel_rate_cdclk; ivb_plane_ratio(crtc_state, plane_state, &num, &den); @@ -570,13 +570,13 @@ static int ivb_sprite_min_cdclk(const struct intel_crtc_state *crtc_state, unsigned int num, den; /* - * Note that crtc_state->pixel_rate accounts for both + * Note that crtc_state->pixel_rate_cdclk accounts for both * horizontal and vertical panel fitter downscaling factors. * Pre-HSW bspec tells us to only consider the horizontal * downscaling factor here. We ignore that and just consider * both for simplicity. */ - pixel_rate = crtc_state->pixel_rate; + pixel_rate = crtc_state->pixel_rate_cdclk; src_w = drm_rect_width(&plane_state->uapi.src) >> 16; dst_w = drm_rect_width(&plane_state->uapi.dst); @@ -629,7 +629,7 @@ static void hsw_plane_ratio(const struct intel_crtc_state *crtc_state, int hsw_plane_min_cdclk(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - unsigned int pixel_rate = crtc_state->pixel_rate; + unsigned int pixel_rate = crtc_state->pixel_rate_cdclk; unsigned int num, den; hsw_plane_ratio(crtc_state, plane_state, &num, &den); @@ -918,13 +918,13 @@ static int g4x_sprite_min_cdclk(const struct intel_crtc_state *crtc_state, unsigned int limit, decimate; /* - * Note that crtc_state->pixel_rate accounts for both + * Note that crtc_state->pixel_rate_cdclk accounts for both * horizontal and vertical panel fitter downscaling factors. * Pre-HSW bspec tells us to only consider the horizontal * downscaling factor here. We ignore that and just consider * both for simplicity. */ - pixel_rate = crtc_state->pixel_rate; + pixel_rate = crtc_state->pixel_rate_cdclk; /* Horizontal downscaling limits the maximum pixel rate */ hscale = drm_rect_calc_hscale(&plane_state->uapi.src, -- 2.54.0
