drm/i915: Introduce intel_cdclk_state (v3)
Subsystems (4)
v3 cover drm/i915: Introduce intel_cdclk_state (v3)
From: Ville Syrjälä <[email protected]>
Here's the latest version of my cdclk state work. I tried to accomodate most of the review feedback, although there were some comments which I think are better left for a followup work. Mainly about renaming some functions and whatnot to make more sense, and probably adjusting how we do the state swap.
On that last point, I left that 'hw' state under dev_priv->cdclk. I think we should be able to get rid of that if we pass the old cdclk state down to the code that actually programs the cdlck (since that code wants to compare the new and current states to see which parts of the programming are needed).
Another thing I realized recently is that we have no protection against gmbus or aux vs. cdclk reprogramming. On some platforms/ports gmbus and/or aux is clock by cdclk, so I think we need to add some protection. Fortunately both gmbus and aux have their own low level mutexes so I think we should be able to just grab those around the reprogramming part. Although for this we might have to keep the 'hw' cdclk state as we'd need to make sure the gmbus/aux code programs the dividers based on the actual hardware state.
So, there's still some work left, but I think we should be able to move this forward and hopefully unblock some *future* stuff.
Entire series available here:git://github.com/vsyrjala/linux.git cdclk_state_4
Ville Syrjälä (14):
drm/i915: Store the pipe pixel rate in the crtc state drm/i915: Nuke intel_mode_max_pixclk()
drm/i915: s/get_display_clock_speed/get_cdclk/
drm/i915: Clean up the .get_cdclk() assignment if ladder drm/i915: Move most cdclk/rawclk related code to intel_cdclk.c drm/i915: Pass computed vco to bxt_set_cdclk()
drm/i915: Start moving the cdclk stuff into a distinct state structure drm/i915: Track full cdclk state for the logical and actual cdclk
frequencies
drm/i915: Pass dev_priv to remainder of the cdclk functions drm/i915: Pass the cdclk state to the set_cdclk() functions drm/i915: Move PFI credit reprogramming into vlv/chv_set_cdclk() drm/i915: Nuke the VLV/CHV PFI programming power domain workaround drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct
.set_cdclk() hook
drm/i915: Move ilk_pipe_pixel_rate() to intel_display.c
Documentation/gpu/i915.rst | 9 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 37 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_cdclk.c | 1867 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 1831 ++---------------------------- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 43 +- drivers/gpu/drm/i915/intel_fbc.c | 5 +- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 51 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 6 +- 13 files changed, 2042 insertions(+), 1820 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_cdclk.c
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/14 drm/i915: Store the pipe pixel rate in the crtc state
From: Ville Syrjälä <[email protected]>
Rather than recomptuing the pipe pixel rate on demand everwhere, let's just stick the precomputed value into the crtc state.
v2: Rebase due to min_pixclk[] code movement
Document the new pixel_rate struct member (Ander) Combine vlv/chv with bdw+ in intel_modeset_readout_hw_state()
--- drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ drivers/gpu/drm/i915/intel_fbc.c | 3 +-- drivers/gpu/drm/i915/intel_pm.c | 14 +++++++------- 4 files changed, 42 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -8
@@ -7165,7 +7165,7 @@ static bool pipe_config_supports_ips(struct drm_i915_private *dev_priv,* * Should measure whether using a lower cdclk w/o IPS */ -return ilk_pipe_pixel_rate (pipe_config) <= +return pipe_config->pixel_rate <= dev_priv->max_cdclk_freq *95 /100 ; }
@@ -7189,6 +7189,19 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc) (crtc->pipe ==PIPE_A ||IS_I915G (dev_priv)); } +static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); + +if (HAS_GMCH_DISPLAY (dev_priv)) +/* FIXME calculate proper pipe pixel rate for GMCH pfit */ + crtc_state->pixel_rate = + crtc_state->base.adjusted_mode.crtc_clock; +else + crtc_state->pixel_rate = +ilk_pipe_pixel_rate (crtc_state); +} +static int intel_crtc_compute_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) {
@@ -7235,6 +7248,8 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay)return -EINVAL ; +intel_crtc_compute_pixel_rate (pipe_config); +if (HAS_IPS (dev_priv))hsw_compute_ips_config (crtc, pipe_config);
@@ -10283,7 +10298,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state)continue ; } - pixel_rate =ilk_pipe_pixel_rate (crtc_state); + pixel_rate = crtc_state->pixel_rate;if (IS_BROADWELL (dev_priv) ||IS_GEN9 (dev_priv)) pixel_rate = bdw_adjust_min_pipe_pixel_rate(crtc_state,
@@ -12792,9 +12807,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->base.adjusted_mode);intel_dump_crtc_timings (&pipe_config->base.adjusted_mode); -DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d\n" , +DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d, pixel rate %d\n" , pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h); + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pixel_rate);if (INTEL_GEN (dev_priv) >=9 ) DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
@@ -13367,6 +13383,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, }PIPE_CONF_CHECK_I (scaler_state.scaler_id); +PIPE_CONF_CHECK_CLOCK_FUZZY (pixel_rate); }/* BDW+ don't expose a synchronous way to read the state */
@@ -13658,6 +13675,8 @@ verify_crtc_state(struct drm_crtc *crtc, } } +intel_crtc_compute_pixel_rate (pipe_config); +if (!new_crtc_state->active)return ;
@@ -17102,10 +17121,11 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)*/ crtc_state->base.mode.private_flags =I915_MODE_FLAG_INHERITED ; -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) - pixclk =ilk_pipe_pixel_rate (crtc_state); -else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) - pixclk = crtc_state->base.adjusted_mode.crtc_clock; +intel_crtc_compute_pixel_rate (crtc_state); + +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) || +IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + pixclk = crtc_state->pixel_rate;else WARN_ON (dev_priv->display.modeset_calc_cdclk);
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -542,6 +542,12 @@ struct intel_crtc_state {* and get clipped at the edges. */ int pipe_src_w, pipe_src_h; +/* +* Pipe pixel rate, adjusted for +* panel fitter/pipe scaler downscaling. +*/ +unsigned int pixel_rate; +/* Whether to set up the PCH/FDI. Note that we never allow sharing * between pch encoders and cpu encoders. */ bool has_pch_encoder;
drivers/gpu/drm/i915/intel_fbc.c +1 -2
@@ -743,8 +743,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) - cache->crtc.hsw_bdw_pixel_rate = -ilk_pipe_pixel_rate (crtc_state); + cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate; cache->plane.rotation = plane_state->base.rotation; cache->plane.src_w =drm_rect_width (&plane_state->base.src) >>16 ;
drivers/gpu/drm/i915/intel_pm.c +7 -7
@@ -1807,12 +1807,12 @@ static uint32_t ilk_compute_pri_wm(const struct intel_crtc_state *cstate, cpp = pstate->base.fb->format->cpp[0 ]; - method1 =ilk_wm_method1 (ilk_pipe_pixel_rate (cstate), cpp, mem_value); + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value);if (!is_lp)return method1; - method2 =ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), + method2 =ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal,drm_rect_width (&pstate->base.dst), cpp, mem_value);
@@ -1836,8 +1836,8 @@ static uint32_t ilk_compute_spr_wm(const struct intel_crtc_state *cstate, cpp = pstate->base.fb->format->cpp[0 ]; - method1 =ilk_wm_method1 (ilk_pipe_pixel_rate (cstate), cpp, mem_value); - method2 =ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value); + method2 =ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal,drm_rect_width (&pstate->base.dst), cpp, mem_value);
@@ -1863,7 +1863,7 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate,if (!cstate->base.active)return 0 ; -return ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), +return ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal, width, cpp, mem_value); }
@@ -3547,7 +3547,7 @@ static uint32_t skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cst* Adjusted plane pixel rate is just the pipe's adjusted pixel rate * with additional adjustments for plane-specific scaling. */ - adjusted_pixel_rate =ilk_pipe_pixel_rate (cstate); + adjusted_pixel_rate = cstate->pixel_rate; downscale_amount =skl_plane_downscale_amount (pstate); pixel_rate = adjusted_pixel_rate * downscale_amount >>16 ;
@@ -3775,7 +3775,7 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate)if (!cstate->base.active)return 0 ; - pixel_rate =ilk_pipe_pixel_rate (cstate); + pixel_rate = cstate->pixel_rate;if (WARN_ON (pixel_rate ==0 ))return 0 ;
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 01/14] drm/i915: Store the pipe pixel rate in the crtc state
Quoted 11 lines · On Fri, 2017-01-20 at 20:21 +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Rather than recomptuing the pipe pixel rate on demand everwhere, let's just stick the precomputed value into the crtc state.
v2: Rebase due to min_pixclk[] code movement
Document the newpixel_ratestruct member (Ander) Combine vlv/chv with bdw+ inintel_modeset_readout_hw_state()Cc Ander Conselvan De Oliveira <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Quoted 220 lines
---
drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++++++++++++------- -
drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ drivers/gpu/drm/i915/intel_fbc.c | 3 +-- drivers/gpu/drm/i915/intel_pm.c | 14 +++++++-------4 files changed, 42 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_display.c +1
-1@@ -7165,7 +7165,7 @@ static bool pipe_config_supports_ips(structdrm_i915_private *dev_priv, * * Should measure whether using a lower cdclk w/o IPS */ -return ilk_pipe_pixel_rate (pipe_config) <= +return pipe_config->pixel_rate <= dev_priv->max_cdclk_freq * 95 / 100; }drivers/gpu/drm/i915/intel_display.c +0
-0@@ -7189,6 +7189,19 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc) (crtc->pipe == PIPE_A || IS_I915G(dev_priv)); }
+static voidintel_crtc_compute_pixel_rate(struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/intel_display.c +2
-0+{ + struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc-Quoted 1 line
dev);
drivers/gpu/drm/i915/intel_display.c +10
-0+ +if (HAS_GMCH_DISPLAY (dev_priv)) +/* FIXME calculate proper pipe pixel rate for GMCH pfit */ + crtc_state->pixel_rate = + crtc_state->base.adjusted_mode.crtc_clock; +else + crtc_state->pixel_rate = +ilk_pipe_pixel_rate (crtc_state); +} +static int
intel_crtc_compute_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config){drivers/gpu/drm/i915/intel_display.c +0
-0@@ -7235,6 +7248,8 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
adjusted_mode->crtc_hsync_start== adjusted_mode-Quoted 1 line
crtc_hdisplay)return
-EINVAL;drivers/gpu/drm/i915/intel_display.c +2
-0+intel_crtc_compute_pixel_rate (pipe_config); +if (
HAS_IPS(dev_priv))hsw_compute_ips_config(crtc, pipe_config);drivers/gpu/drm/i915/intel_display.c +0
-0@@ -10283,7 +10298,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state) continue; }drivers/gpu/drm/i915/intel_display.c +1
-1- pixel_rate =ilk_pipe_pixel_rate (crtc_state); + pixel_rate = crtc_state->pixel_rate;
if (IS_BROADWELL(dev_priv)||IS_GEN9(dev_priv))pixel_rate= bdw_adjust_min_pipe_pixel_rate(crtc_state,drivers/gpu/drm/i915/intel_display.c +3
-2@@ -12792,9 +12807,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, DRM_DEBUG_KMS("adjusted mode:\n"); drm_mode_debug_printmodeline(&pipe_config->base.adjusted_mode); intel_dump_crtc_timings(&pipe_config->base.adjusted_mode); -DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d\n" , + DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d, pixel rate %d\n", pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h); + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pixel_rate);
if (INTEL_GEN(dev_priv)>= 9) DRM_DEBUG_KMS("num_scalers: %d,scaler_users: 0x%x,scaler_id: %d\n",drivers/gpu/drm/i915/intel_display.c +0
-0@@ -13367,6 +13383,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, }
PIPE_CONF_CHECK_I(scaler_state.scaler_id);drivers/gpu/drm/i915/intel_display.c +1
-0+PIPE_CONF_CHECK_CLOCK_FUZZY (pixel_rate);}
/* BDW+ don't expose a synchronous way to read the state */drivers/gpu/drm/i915/intel_display.c +0
-0@@ -13658,6 +13675,8 @@ verify_crtc_state(struct drm_crtc *crtc, } }drivers/gpu/drm/i915/intel_display.c +2
-0+intel_crtc_compute_pixel_rate (pipe_config); +if (!new_crtc_state->active)
return;drivers/gpu/drm/i915/intel_display.c +0
-0@@ -17102,10 +17121,11 @@ static void intel_modeset_readout_hw_state(structdrm_device *dev) */
crtc_state->base.mode.private_flags=I915_MODE_FLAG_INHERITED;drivers/gpu/drm/i915/intel_display.c +0
-1- if (INTEL_GEN(dev_priv) >= 9 ||
IS_BROADWELL(dev_priv))drivers/gpu/drm/i915/intel_display.c +0
-2- pixclk =ilk_pipe_pixel_rate (crtc_state); - else if (IS_VALLEYVIEW(dev_priv) ||
IS_CHERRYVIEW(dev_priv))drivers/gpu/drm/i915/intel_display.c +0
-1- pixclk = crtc_state-Quoted 1 line
base.adjusted_mode.crtc_clock;
drivers/gpu/drm/i915/intel_display.c +3
-0+intel_crtc_compute_pixel_rate (crtc_state); + + if (INTEL_GEN(dev_priv) >= 9 ||
IS_BROADWELL(dev_priv)||drivers/gpu/drm/i915/intel_display.c +1
-0+ IS_VALLEYVIEW(dev_priv) ||
IS_CHERRYVIEW(dev_priv))drivers/gpu/drm/i915/intel_display.c +1
-0+ pixclk = crtc_state->pixel_rate;else
WARN_ON(dev_priv-Quoted 1 line
display.modeset_calc_cdclk);
drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -542,6 +542,12 @@ struct intel_crtc_state {* and get clipped at the edges. */ int pipe_src_w, pipe_src_h;drivers/gpu/drm/i915/intel_drv.h +6
-0+/* +* Pipe pixel rate, adjusted for +* panel fitter/pipe scaler downscaling. +*/ +unsigned int pixel_rate; +/* Whether to set up the PCH/FDI. Note that we never allow sharing
* between pch encoders and cpu encoders. */
boolhas_pch_encoder;drivers/gpu/drm/i915/intel_fbc.c +0
-0@@ -743,8 +743,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc,
cache->crtc.mode_flags=crtc_state->base.adjusted_mode.flags; if (IS_HASWELL(dev_priv)||IS_BROADWELL(dev_priv))drivers/gpu/drm/i915/intel_fbc.c +1
-2- cache->crtc.hsw_bdw_pixel_rate = -ilk_pipe_pixel_rate (crtc_state); + cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate;
cache->plane.rotation=plane_state->base.rotation;cache->plane.src_w=drm_rect_width(&plane_state->base.src)>> 16;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -1807,12 +1807,12 @@ static uint32_t ilk_compute_pri_wm(const struct intel_crtc_state *cstate,
cpp = pstate->base.fb->format->cpp[0];drivers/gpu/drm/i915/intel_pm.c +0
-1- method1 = ilk_wm_method1(ilk_pipe_pixel_rate(cstate), cpp,
mem_value);drivers/gpu/drm/i915/intel_pm.c +1
-0+ method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value);
if (!is_lp)
return method1;drivers/gpu/drm/i915/intel_pm.c +1
-1- method2 = ilk_wm_method2(ilk_pipe_pixel_rate(cstate), + method2 = ilk_wm_method2(cstate->pixel_rate,cstate->base.adjusted_mode.crtc_htotal,
drm_rect_width(&pstate->base.dst), cpp,mem_value);drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -1836,8 +1836,8 @@ static uint32_t ilk_compute_spr_wm(const struct intel_crtc_state *cstate,
cpp = pstate->base.fb->format->cpp[0];drivers/gpu/drm/i915/intel_pm.c +0
-1- method1 = ilk_wm_method1(ilk_pipe_pixel_rate(cstate), cpp,
mem_value);drivers/gpu/drm/i915/intel_pm.c +2
-1- method2 = ilk_wm_method2(ilk_pipe_pixel_rate(cstate), + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value); + method2 = ilk_wm_method2(cstate->pixel_rate,cstate->base.adjusted_mode.crtc_htotal,
drm_rect_width(&pstate->base.dst), cpp,mem_value);drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -1863,7 +1863,7 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate, if (!cstate->base.active) return 0;drivers/gpu/drm/i915/intel_pm.c +1
-1- return ilk_wm_method2(ilk_pipe_pixel_rate(cstate), + return ilk_wm_method2(cstate->pixel_rate,cstate->base.adjusted_mode.crtc_htotal, width, cpp,
mem_value);
}drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3547,7 +3547,7 @@ static uint32_t skl_adjusted_plane_pixel_rate(conststruct
intel_crtc_state*cst
* Adjusted plane pixel rate is just the pipe's adjusted pixel rate
* with additional adjustments for plane-specific scaling. */drivers/gpu/drm/i915/intel_pm.c +1
-1- adjusted_pixel_rate =ilk_pipe_pixel_rate (cstate); + adjusted_pixel_rate = cstate->pixel_rate;
downscale_amount=skl_plane_downscale_amount(pstate);
pixel_rate=adjusted_pixel_rate*downscale_amount>> 16;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3775,7 +3775,7 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate) if (!cstate->base.active) return 0;drivers/gpu/drm/i915/intel_pm.c +1
-1- pixel_rate =ilk_pipe_pixel_rate (cstate); + pixel_rate = cstate->pixel_rate;
Quoted 3 lines
if (WARN_ON(pixel_rate == 0))
return 0;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 01/14] drm/i915: Store the pipe pixel rate in the crtc state
In reply to [email protected]Quoted 3 lines · On Fri, Jan 20, 2017 at 08:21:52PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Rather than recomptuing the pipe pixel rate on demand everwhere, let's
recomputing, everywhere
Quoted 207 lines
just stick the precomputed value into the crtc state.
v2: Rebase due to min_pixclk[] code movement
Document the newpixel_ratestruct member (Ander) Combine vlv/chv with bdw+ inintel_modeset_readout_hw_state()Cc Ander Conselvan De Oliveira <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ drivers/gpu/drm/i915/intel_fbc.c | 3 +-- drivers/gpu/drm/i915/intel_pm.c | 14 +++++++------- 4 files changed, 42 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_display.c +28
-8@@ -7165,7 +7165,7 @@ static bool pipe_config_supports_ips(struct drm_i915_private *dev_priv,* * Should measure whether using a lower cdclk w/o IPS */ -return ilk_pipe_pixel_rate (pipe_config) <= +return pipe_config->pixel_rate <= dev_priv->max_cdclk_freq *95 /100 ; }@@ -7189,6 +7189,19 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc) (crtc->pipe ==PIPE_A ||IS_I915G (dev_priv)); } +static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); + +if (HAS_GMCH_DISPLAY (dev_priv)) +/* FIXME calculate proper pipe pixel rate for GMCH pfit */ + crtc_state->pixel_rate = + crtc_state->base.adjusted_mode.crtc_clock; +else + crtc_state->pixel_rate = +ilk_pipe_pixel_rate (crtc_state); +} +static int intel_crtc_compute_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) {@@ -7235,6 +7248,8 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay)return -EINVAL ; +intel_crtc_compute_pixel_rate (pipe_config); +if (HAS_IPS (dev_priv))hsw_compute_ips_config (crtc, pipe_config);@@ -10283,7 +10298,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state)continue ; } - pixel_rate =ilk_pipe_pixel_rate (crtc_state); + pixel_rate = crtc_state->pixel_rate;if (IS_BROADWELL (dev_priv) ||IS_GEN9 (dev_priv)) pixel_rate = bdw_adjust_min_pipe_pixel_rate(crtc_state,@@ -12792,9 +12807,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->base.adjusted_mode);intel_dump_crtc_timings (&pipe_config->base.adjusted_mode); -DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d\n" , +DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d, pixel rate %d\n" , pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h); + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pixel_rate);if (INTEL_GEN (dev_priv) >=9 ) DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",@@ -13367,6 +13383,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, }PIPE_CONF_CHECK_I (scaler_state.scaler_id); +PIPE_CONF_CHECK_CLOCK_FUZZY (pixel_rate); }/* BDW+ don't expose a synchronous way to read the state */ @@ -13658,6 +13675,8 @@ verify_crtc_state(struct drm_crtc *crtc, } } +intel_crtc_compute_pixel_rate (pipe_config); +if (!new_crtc_state->active)return ;@@ -17102,10 +17121,11 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)*/ crtc_state->base.mode.private_flags =I915_MODE_FLAG_INHERITED ; -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) - pixclk =ilk_pipe_pixel_rate (crtc_state); -else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) - pixclk = crtc_state->base.adjusted_mode.crtc_clock; +intel_crtc_compute_pixel_rate (crtc_state); + +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) || +IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + pixclk = crtc_state->pixel_rate;else WARN_ON (dev_priv->display.modeset_calc_cdclk);drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -542,6 +542,12 @@ struct intel_crtc_state {* and get clipped at the edges. */ int pipe_src_w, pipe_src_h; +/* +* Pipe pixel rate, adjusted for +* panel fitter/pipe scaler downscaling. +*/ +unsigned int pixel_rate; +/* Whether to set up the PCH/FDI. Note that we never allow sharing * between pch encoders and cpu encoders. */ bool has_pch_encoder;drivers/gpu/drm/i915/intel_fbc.c +1
-2@@ -743,8 +743,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) - cache->crtc.hsw_bdw_pixel_rate = -ilk_pipe_pixel_rate (crtc_state); + cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate; cache->plane.rotation = plane_state->base.rotation; cache->plane.src_w =drm_rect_width (&plane_state->base.src) >>16 ;drivers/gpu/drm/i915/intel_pm.c +7
-7@@ -1807,12 +1807,12 @@ static uint32_t ilk_compute_pri_wm(const struct intel_crtc_state *cstate, cpp = pstate->base.fb->format->cpp[0 ]; - method1 =ilk_wm_method1 (ilk_pipe_pixel_rate (cstate), cpp, mem_value); + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value);if (!is_lp)return method1; - method2 =ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), + method2 =ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal,drm_rect_width (&pstate->base.dst), cpp, mem_value);@@ -1836,8 +1836,8 @@ static uint32_t ilk_compute_spr_wm(const struct intel_crtc_state *cstate, cpp = pstate->base.fb->format->cpp[0 ]; - method1 =ilk_wm_method1 (ilk_pipe_pixel_rate (cstate), cpp, mem_value); - method2 =ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value); + method2 =ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal,drm_rect_width (&pstate->base.dst), cpp, mem_value);@@ -1863,7 +1863,7 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate,if (!cstate->base.active)return 0 ; -return ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), +return ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal, width, cpp, mem_value); }@@ -3547,7 +3547,7 @@ static uint32_t skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cst* Adjusted plane pixel rate is just the pipe's adjusted pixel rate * with additional adjustments for plane-specific scaling. */ - adjusted_pixel_rate =ilk_pipe_pixel_rate (cstate); + adjusted_pixel_rate = cstate->pixel_rate; downscale_amount =skl_plane_downscale_amount (pstate); pixel_rate = adjusted_pixel_rate * downscale_amount >>16 ;@@ -3775,7 +3775,7 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate)if (!cstate->base.active)return 0 ; - pixel_rate =ilk_pipe_pixel_rate (cstate); + pixel_rate = cstate->pixel_rate;if (WARN_ON (pixel_rate ==0 ))return 0 ;Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/14 drm/i915: Store the pipe pixel rate in the crtc state
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Rather than recomputing the pipe pixel rate on demand everywhere, let's just stick the precomputed value into the crtc state.
v2: Rebase due to min_pixclk[] code movement
Document the new pixel_rate struct member (Ander) Combine vlv/chv with bdw+ in intel_modeset_readout_hw_state()
v3: Fix typos in commit message (David)
--- drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ drivers/gpu/drm/i915/intel_fbc.c | 3 +-- drivers/gpu/drm/i915/intel_pm.c | 14 +++++++------- 4 files changed, 42 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -8
@@ -7172,7 +7172,7 @@ static bool pipe_config_supports_ips(struct drm_i915_private *dev_priv,* * Should measure whether using a lower cdclk w/o IPS */ -return ilk_pipe_pixel_rate (pipe_config) <= +return pipe_config->pixel_rate <= dev_priv->max_cdclk_freq *95 /100 ; }
@@ -7196,6 +7196,19 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc) (crtc->pipe ==PIPE_A ||IS_I915G (dev_priv)); } +static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); + +if (HAS_GMCH_DISPLAY (dev_priv)) +/* FIXME calculate proper pipe pixel rate for GMCH pfit */ + crtc_state->pixel_rate = + crtc_state->base.adjusted_mode.crtc_clock; +else + crtc_state->pixel_rate = +ilk_pipe_pixel_rate (crtc_state); +} +static int intel_crtc_compute_config (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config) {
@@ -7242,6 +7255,8 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay)return -EINVAL ; +intel_crtc_compute_pixel_rate (pipe_config); +if (HAS_IPS (dev_priv))hsw_compute_ips_config (crtc, pipe_config);
@@ -10290,7 +10305,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state)continue ; } - pixel_rate =ilk_pipe_pixel_rate (crtc_state); + pixel_rate = crtc_state->pixel_rate;if (IS_BROADWELL (dev_priv) ||IS_GEN9 (dev_priv)) pixel_rate = bdw_adjust_min_pipe_pixel_rate(crtc_state,
@@ -12800,9 +12815,10 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->base.adjusted_mode);intel_dump_crtc_timings (&pipe_config->base.adjusted_mode); -DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d\n" , +DRM_DEBUG_KMS ("port clock: %d, pipe src size: %dx%d, pixel rate %d\n" , pipe_config->port_clock, - pipe_config->pipe_src_w, pipe_config->pipe_src_h); + pipe_config->pipe_src_w, pipe_config->pipe_src_h, + pipe_config->pixel_rate);if (INTEL_GEN (dev_priv) >=9 ) DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
@@ -13378,6 +13394,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, }PIPE_CONF_CHECK_I (scaler_state.scaler_id); +PIPE_CONF_CHECK_CLOCK_FUZZY (pixel_rate); }/* BDW+ don't expose a synchronous way to read the state */
@@ -13669,6 +13686,8 @@ verify_crtc_state(struct drm_crtc *crtc, } } +intel_crtc_compute_pixel_rate (pipe_config); +if (!new_crtc_state->active)return ;
@@ -17134,10 +17153,11 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)*/ crtc_state->base.mode.private_flags =I915_MODE_FLAG_INHERITED ; -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) - pixclk =ilk_pipe_pixel_rate (crtc_state); -else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) - pixclk = crtc_state->base.adjusted_mode.crtc_clock; +intel_crtc_compute_pixel_rate (crtc_state); + +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) || +IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + pixclk = crtc_state->pixel_rate;else WARN_ON (dev_priv->display.modeset_calc_cdclk);
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -544,6 +544,12 @@ struct intel_crtc_state {* and get clipped at the edges. */ int pipe_src_w, pipe_src_h; +/* +* Pipe pixel rate, adjusted for +* panel fitter/pipe scaler downscaling. +*/ +unsigned int pixel_rate; +/* Whether to set up the PCH/FDI. Note that we never allow sharing * between pch encoders and cpu encoders. */ bool has_pch_encoder;
drivers/gpu/drm/i915/intel_fbc.c +1 -2
@@ -742,8 +742,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) - cache->crtc.hsw_bdw_pixel_rate = -ilk_pipe_pixel_rate (crtc_state); + cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate; cache->plane.rotation = plane_state->base.rotation; cache->plane.src_w =drm_rect_width (&plane_state->base.src) >>16 ;
drivers/gpu/drm/i915/intel_pm.c +7 -7
@@ -1807,12 +1807,12 @@ static uint32_t ilk_compute_pri_wm(const struct intel_crtc_state *cstate, cpp = pstate->base.fb->format->cpp[0 ]; - method1 =ilk_wm_method1 (ilk_pipe_pixel_rate (cstate), cpp, mem_value); + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value);if (!is_lp)return method1; - method2 =ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), + method2 =ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal,drm_rect_width (&pstate->base.dst), cpp, mem_value);
@@ -1836,8 +1836,8 @@ static uint32_t ilk_compute_spr_wm(const struct intel_crtc_state *cstate, cpp = pstate->base.fb->format->cpp[0 ]; - method1 =ilk_wm_method1 (ilk_pipe_pixel_rate (cstate), cpp, mem_value); - method2 =ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), + method1 =ilk_wm_method1 (cstate->pixel_rate, cpp, mem_value); + method2 =ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal,drm_rect_width (&pstate->base.dst), cpp, mem_value);
@@ -1863,7 +1863,7 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate,if (!cstate->base.active)return 0 ; -return ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), +return ilk_wm_method2 (cstate->pixel_rate, cstate->base.adjusted_mode.crtc_htotal, width, cpp, mem_value); }
@@ -3546,7 +3546,7 @@ static uint32_t skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *cst* Adjusted plane pixel rate is just the pipe's adjusted pixel rate * with additional adjustments for plane-specific scaling. */ - adjusted_pixel_rate =ilk_pipe_pixel_rate (cstate); + adjusted_pixel_rate = cstate->pixel_rate; downscale_amount =skl_plane_downscale_amount (pstate); pixel_rate = adjusted_pixel_rate * downscale_amount >>16 ;
@@ -3774,7 +3774,7 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate)if (!cstate->base.active)return 0 ; - pixel_rate =ilk_pipe_pixel_rate (cstate); + pixel_rate = cstate->pixel_rate;if (WARN_ON (pixel_rate ==0 ))return 0 ;
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/14 drm/i915: Nuke intel_mode_max_pixclk()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
ilk_max_pixel_rate() will now give the "correct" pixel rate for all platforms, so let's rename it to intel_max_pixel_rate() and kill off intel_mode_max_pixclk().
v2: Fix typo in commit message (Ander)
--- drivers/gpu/drm/i915/intel_display.c | 41 ++++++------------------------------ 1 file changed, 6 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -35
@@ -122,7 +122,7 @@ static void ironlake_pfit_disable(struct intel_crtc *crtc, bool force);static void ironlake_pfit_enable (struct intel_crtc *crtc);static void intel_modeset_setup_hw_state (struct drm_device *dev);static void intel_pre_disable_primary_noatomic (struct drm_crtc *crtc); -static int ilk_max_pixel_rate (struct drm_atomic_state *state); +static int intel_max_pixel_rate (struct drm_atomic_state *state);static int glk_calc_cdclk (int max_pixclk);static int bxt_calc_cdclk (int max_pixclk);
@@ -6553,40 +6553,11 @@ static int bxt_calc_cdclk(int max_pixclk)return 144000 ; } -/* Compute the max pixel clock for new configuration. */ -static int intel_mode_max_pixclk (struct drm_device *dev, -struct drm_atomic_state *state) -{ -struct intel_atomic_state *intel_state =to_intel_atomic_state (state); -struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_crtc *crtc; -struct drm_crtc_state *crtc_state; -unsigned max_pixclk =0 , i; -enum pipe pipe; - -memcpy (intel_state->min_pixclk, dev_priv->min_pixclk, -sizeof (intel_state->min_pixclk)); - -for_each_crtc_in_state (state, crtc, crtc_state, i) { -int pixclk =0 ; - -if (crtc_state->enable) - pixclk = crtc_state->adjusted_mode.crtc_clock; - - intel_state->min_pixclk[i] = pixclk; - } - -for_each_pipe (dev_priv, pipe) - max_pixclk =max (intel_state->min_pixclk[pipe], max_pixclk); - -return max_pixclk; -} -static int valleyview_modeset_calc_cdclk (struct drm_atomic_state *state) {struct drm_device *dev = state->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -int max_pixclk =intel_mode_max_pixclk (dev, state); +int max_pixclk =intel_max_pixel_rate (state);struct intel_atomic_state *intel_state =to_intel_atomic_state (state);
@@ -6602,7 +6573,7 @@ static int valleyview_modeset_calc_cdclk(struct drm_atomic_state *state)static int bxt_modeset_calc_cdclk (struct drm_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->dev); -int max_pixclk =ilk_max_pixel_rate (state); +int max_pixclk =intel_max_pixel_rate (state);struct intel_atomic_state *intel_state =to_intel_atomic_state (state);int cdclk;
@@ -10276,7 +10247,7 @@ static int bdw_adjust_min_pipe_pixel_rate(struct intel_crtc_state *crtc_state, }/* compute the max rate for new configuration */ -static int ilk_max_pixel_rate (struct drm_atomic_state *state) +static int intel_max_pixel_rate (struct drm_atomic_state *state) {struct intel_atomic_state *intel_state =to_intel_atomic_state (state);struct drm_i915_private *dev_priv =to_i915 (state->dev);
@@ -10408,7 +10379,7 @@ static int broadwell_modeset_calc_cdclk(struct drm_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->dev);struct intel_atomic_state *intel_state =to_intel_atomic_state (state); -int max_pixclk =ilk_max_pixel_rate (state); +int max_pixclk =intel_max_pixel_rate (state);int cdclk;/*
@@ -10444,7 +10415,7 @@ static int skl_modeset_calc_cdclk(struct drm_atomic_state *state) {struct intel_atomic_state *intel_state =to_intel_atomic_state (state);struct drm_i915_private *dev_priv =to_i915 (state->dev); -const int max_pixclk =ilk_max_pixel_rate (state); +const int max_pixclk =intel_max_pixel_rate (state);int vco = intel_state->cdclk_pll_vco;int cdclk;
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/14 drm/i915: s/get_display_clock_speed/get_cdclk/
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Rename the .get_display_clock_speed() hook to .get_cdclk(). .get_cdclk() is more specific (which clock) and it's much shorter.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 93 +++++++++++++-------------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +- 3 files changed, 39 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -602,7 +602,7 @@ struct intel_limit;struct dpll ;struct drm_i915_display_funcs { -int (*get_display_clock_speed)(struct drm_i915_private *dev_priv); +int (*get_cdclk)(struct drm_i915_private *dev_priv);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
drivers/gpu/drm/i915/intel_display.c +37 -56
226 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -2
@@ -966,8 +966,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv, {gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -WARN_ON (dev_priv->cdclk_freq != - dev_priv->display.get_display_clock_speed (dev_priv)); +WARN_ON (dev_priv->cdclk_freq != dev_priv->display.get_cdclk (dev_priv));gen9_assert_dbuf_enabled (dev_priv);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/14 drm/i915: s/get_display_clock_speed/get_cdclk/
From: Ville Syrjälä <[email protected]>
Rename the .get_display_clock_speed() hook to .get_cdclk(). .get_cdclk() is more specific (which clock) and it's much shorter.
v2: Deal with IS_GEN9_BC()
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 93 +++++++++++++-------------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +- 3 files changed, 39 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -601,7 +601,7 @@ struct intel_limit;struct dpll ;struct drm_i915_display_funcs { -int (*get_display_clock_speed)(struct drm_i915_private *dev_priv); +int (*get_cdclk)(struct drm_i915_private *dev_priv);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
drivers/gpu/drm/i915/intel_display.c +37 -56
226 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -2
@@ -966,8 +966,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv, {gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -WARN_ON (dev_priv->cdclk_freq != - dev_priv->display.get_display_clock_speed (dev_priv)); +WARN_ON (dev_priv->cdclk_freq != dev_priv->display.get_cdclk (dev_priv));gen9_assert_dbuf_enabled (dev_priv);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/14 drm/i915: s/get_display_clock_speed/get_cdclk/
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Rename the .get_display_clock_speed() hook to .get_cdclk(). .get_cdclk() is more specific (which clock) and it's much shorter.
v2: Deal with IS_GEN9_BC()
v3: Deal with i945gm_get_display_clock_speed()
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 98 +++++++++++++-------------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +- 3 files changed, 41 insertions(+), 62 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -602,7 +602,7 @@ struct intel_limit;struct dpll ;struct drm_i915_display_funcs { -int (*get_display_clock_speed)(struct drm_i915_private *dev_priv); +int (*get_cdclk)(struct drm_i915_private *dev_priv);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
drivers/gpu/drm/i915/intel_display.c +39 -59
238 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -2
@@ -966,8 +966,7 @@ static void gen9_dc_off_power_well_enable(struct drm_i915_private *dev_priv, {gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -WARN_ON (dev_priv->cdclk_freq != - dev_priv->display.get_display_clock_speed (dev_priv)); +WARN_ON (dev_priv->cdclk_freq != dev_priv->display.get_cdclk (dev_priv));gen9_assert_dbuf_enabled (dev_priv);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/14 drm/i915: Clean up the .get_cdclk() assignment if ladder
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Let's clean up the mess we have in the if ladder that assigns the .get_cdclk() hooks. The grouping of the platforms by the function results in a thing that's not really legible, so let's do it the other way around and order the if ladder by platform and duplicate whatever assignments we need.
To further avoid confusion with the function names let's rename them to just fixed_<freq>_get_cdclk(). The other option would be to duplicate the functions entirely but it seems quite pointless to do that since each one just returns a fixed value.
--- drivers/gpu/drm/i915/intel_display.c | 41 +++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +24 -17
@@ -7366,22 +7366,22 @@ static int valleyview_get_cdclk(struct drm_i915_private *dev_priv) CCK_DISPLAY_CLOCK_CONTROL); } -static int ilk_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_450mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 450000 ; } -static int i945_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_400mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 400000 ; } -static int i915_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_333mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 333333 ; } -static int i9xx_misc_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_200mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 200000 ; }
@@ -7431,7 +7431,7 @@ static int i915gm_get_cdclk(struct drm_i915_private *dev_priv) } } -static int i865_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_266mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 266667 ; }
@@ -7474,7 +7474,7 @@ static int i85x_get_cdclk(struct drm_i915_private *dev_priv)return 0 ; } -static int i830_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_133mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 133333 ; }
@@ -16180,32 +16180,39 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.get_cdclk = haswell_get_cdclk; else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) dev_priv->display.get_cdclk = valleyview_get_cdclk; + else if (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_GEN5(dev_priv)) - dev_priv->display.get_cdclk = ilk_get_cdclk; - else if (IS_I945G(dev_priv) || IS_I965G(dev_priv) || - IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) - dev_priv->display.get_cdclk = i945_get_cdclk; + dev_priv->display.get_cdclk = fixed_450mhz_get_cdclk; else if (IS_GM45(dev_priv)) dev_priv->display.get_cdclk = gm45_get_cdclk; + else if (IS_G4X(dev_priv)) + dev_priv->display.get_cdclk = g33_get_cdclk; else if (IS_I965GM(dev_priv)) dev_priv->display.get_cdclk = i965gm_get_cdclk; + else if (IS_I965G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_PINEVIEW(dev_priv)) dev_priv->display.get_cdclk = pnv_get_cdclk; - else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) + else if (IS_G33(dev_priv)) dev_priv->display.get_cdclk = g33_get_cdclk; - else if (IS_I915G(dev_priv)) - dev_priv->display.get_cdclk = i915_get_cdclk; - else if (IS_I945GM(dev_priv) || IS_I845G(dev_priv)) - dev_priv->display.get_cdclk = i9xx_misc_get_cdclk; + else if (IS_I945GM(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; + else if (IS_I945G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_I915GM(dev_priv)) dev_priv->display.get_cdclk = i915gm_get_cdclk; + else if (IS_I915G(dev_priv)) + dev_priv->display.get_cdclk = fixed_333mhz_get_cdclk; else if (IS_I865G(dev_priv)) - dev_priv->display.get_cdclk = i865_get_cdclk; + dev_priv->display.get_cdclk = fixed_266mhz_get_cdclk; else if (IS_I85X(dev_priv)) dev_priv->display.get_cdclk = i85x_get_cdclk; + else if (IS_I845G(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; else { /* 830 */WARN (!IS_I830 (dev_priv),"Unknown platform. Assuming 133 MHz CDCLK\n" ); - dev_priv->display.get_cdclk = i830_get_cdclk; + dev_priv->display.get_cdclk = fixed_133mhz_get_cdclk; }if (IS_GEN5 (dev_priv)) {
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/14] drm/i915: Clean up the .get_cdclk() assignment if ladder
Quoted 51 lines · On Fri, Jan 20, 2017 at 08:21:55PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Let's clean up the mess we have in the if ladder that assigns the .get_cdclk() hooks. The grouping of the platforms by the function results in a thing that's not really legible, so let's do it the other way around and order the if ladder by platform and duplicate whatever assignments we need.
To further avoid confusion with the function names let's rename them to just fixed_<freq>_get_cdclk(). The other option would be to duplicate the functions entirely but it seems quite pointless to do that since each one just returns a fixed value.
Signed-off-by Ville Syrjälä <[email protected]>Reviewed-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 41 +++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_display.c +4
-4@@ -7366,22 +7366,22 @@ static int valleyview_get_cdclk(struct drm_i915_private *dev_priv) CCK_DISPLAY_CLOCK_CONTROL); } -static int ilk_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_450mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 450000 ; } -static int i945_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_400mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 400000 ; } -static int i915_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_333mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 333333 ; } -static int i9xx_misc_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_200mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 200000 ; }
drivers/gpu/drm/i915/intel_display.c static int i915gm_get_cdclk(struct drm_i915_private *dev_priv) · line 7437
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +1
-1@@ -7431,7 +7431,7 @@ static int i915gm_get_cdclk(struct drm_i915_private *dev_priv) } } -static int i865_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_266mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 266667 ; }
How about reordering this and the one above to have the clocks in strictly descending order?
drivers/gpu/drm/i915/intel_display.c static int i85x_get_cdclk(struct drm_i915_private *dev_priv) · line 7475
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -7474,7 +7474,7 @@ static int i85x_get_cdclk(struct drm_i915_private *dev_priv)return 0 ; }
Similarly, move this one down.
Quoted 63 lines
drivers/gpu/drm/i915/intel_display.c +19
-12-static int i830_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_133mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 133333 ; }@@ -16180,32 +16180,39 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.get_cdclk = haswell_get_cdclk; else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) dev_priv->display.get_cdclk = valleyview_get_cdclk; + else if (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_GEN5(dev_priv)) - dev_priv->display.get_cdclk = ilk_get_cdclk; - else if (IS_I945G(dev_priv) || IS_I965G(dev_priv) || - IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) - dev_priv->display.get_cdclk = i945_get_cdclk; + dev_priv->display.get_cdclk = fixed_450mhz_get_cdclk; else if (IS_GM45(dev_priv)) dev_priv->display.get_cdclk = gm45_get_cdclk; + else if (IS_G4X(dev_priv)) + dev_priv->display.get_cdclk = g33_get_cdclk; else if (IS_I965GM(dev_priv)) dev_priv->display.get_cdclk = i965gm_get_cdclk; + else if (IS_I965G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_PINEVIEW(dev_priv)) dev_priv->display.get_cdclk = pnv_get_cdclk; - else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) + else if (IS_G33(dev_priv)) dev_priv->display.get_cdclk = g33_get_cdclk; - else if (IS_I915G(dev_priv)) - dev_priv->display.get_cdclk = i915_get_cdclk; - else if (IS_I945GM(dev_priv) || IS_I845G(dev_priv)) - dev_priv->display.get_cdclk = i9xx_misc_get_cdclk; + else if (IS_I945GM(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; + else if (IS_I945G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_I915GM(dev_priv)) dev_priv->display.get_cdclk = i915gm_get_cdclk; + else if (IS_I915G(dev_priv)) + dev_priv->display.get_cdclk = fixed_333mhz_get_cdclk; else if (IS_I865G(dev_priv)) - dev_priv->display.get_cdclk = i865_get_cdclk; + dev_priv->display.get_cdclk = fixed_266mhz_get_cdclk; else if (IS_I85X(dev_priv)) dev_priv->display.get_cdclk = i85x_get_cdclk; + else if (IS_I845G(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; else { /* 830 */WARN (!IS_I830 (dev_priv),"Unknown platform. Assuming 133 MHz CDCLK\n" ); - dev_priv->display.get_cdclk = i830_get_cdclk; + dev_priv->display.get_cdclk = fixed_133mhz_get_cdclk; }if (IS_GEN5 (dev_priv)) {Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/14] drm/i915: Clean up the .get_cdclk() assignment if ladder
Quoted 55 lines · David Weinehall
Quoted 54 lines · On Fri, Jan 20, 2017 at 08:21:55PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Let's clean up the mess we have in the if ladder that assigns the .get_cdclk() hooks. The grouping of the platforms by the function results in a thing that's not really legible, so let's do it the other way around and order the if ladder by platform and duplicate whatever assignments we need.
To further avoid confusion with the function names let's rename them to just fixed_<freq>_get_cdclk(). The other option would be to duplicate the functions entirely but it seems quite pointless to do that since each one just returns a fixed value.
Signed-off-by Ville Syrjälä <[email protected]>Reviewed-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 41 +++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_display.c +4
-4@@ -7366,22 +7366,22 @@ static int valleyview_get_cdclk(struct drm_i915_private *dev_priv) CCK_DISPLAY_CLOCK_CONTROL); } -static int ilk_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_450mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 450000 ; } -static int i945_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_400mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 400000 ; } -static int i915_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_333mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 333333 ; } -static int i9xx_misc_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_200mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 200000 ; }@@ -7431,7 +7431,7 @@ static int i915gm_get_cdclk(struct drm_i915_private *dev_priv) } }
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static int i915gm_get_cdclk(struct drm_i915_private *dev_priv) · line 7437
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +1
-1-static int i865_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_266mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 266667 ; }How about reordering this and the one above to have the clocks in strictly descending order?
It gets reordered in the patch that moves it all into a new file.
Quoted 70 lines
drivers/gpu/drm/i915/intel_display.c static int i85x_get_cdclk(struct drm_i915_private *dev_priv) · line 7475
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +0
-0@@ -7474,7 +7474,7 @@ static int i85x_get_cdclk(struct drm_i915_private *dev_priv)return 0 ; }Similarly, move this one down.
Quoted 63 lines
drivers/gpu/drm/i915/intel_display.c +19
-12-static int i830_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_133mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 133333 ; }@@ -16180,32 +16180,39 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.get_cdclk = haswell_get_cdclk; else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) dev_priv->display.get_cdclk = valleyview_get_cdclk; + else if (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_GEN5(dev_priv)) - dev_priv->display.get_cdclk = ilk_get_cdclk; - else if (IS_I945G(dev_priv) || IS_I965G(dev_priv) || - IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) - dev_priv->display.get_cdclk = i945_get_cdclk; + dev_priv->display.get_cdclk = fixed_450mhz_get_cdclk; else if (IS_GM45(dev_priv)) dev_priv->display.get_cdclk = gm45_get_cdclk; + else if (IS_G4X(dev_priv)) + dev_priv->display.get_cdclk = g33_get_cdclk; else if (IS_I965GM(dev_priv)) dev_priv->display.get_cdclk = i965gm_get_cdclk; + else if (IS_I965G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_PINEVIEW(dev_priv)) dev_priv->display.get_cdclk = pnv_get_cdclk; - else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) + else if (IS_G33(dev_priv)) dev_priv->display.get_cdclk = g33_get_cdclk; - else if (IS_I915G(dev_priv)) - dev_priv->display.get_cdclk = i915_get_cdclk; - else if (IS_I945GM(dev_priv) || IS_I845G(dev_priv)) - dev_priv->display.get_cdclk = i9xx_misc_get_cdclk; + else if (IS_I945GM(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; + else if (IS_I945G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_I915GM(dev_priv)) dev_priv->display.get_cdclk = i915gm_get_cdclk; + else if (IS_I915G(dev_priv)) + dev_priv->display.get_cdclk = fixed_333mhz_get_cdclk; else if (IS_I865G(dev_priv)) - dev_priv->display.get_cdclk = i865_get_cdclk; + dev_priv->display.get_cdclk = fixed_266mhz_get_cdclk; else if (IS_I85X(dev_priv)) dev_priv->display.get_cdclk = i85x_get_cdclk; + else if (IS_I845G(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; else { /* 830 */WARN (!IS_I830 (dev_priv),"Unknown platform. Assuming 133 MHz CDCLK\n" ); - dev_priv->display.get_cdclk = i830_get_cdclk; + dev_priv->display.get_cdclk = fixed_133mhz_get_cdclk; }if (IS_GEN5 (dev_priv)) {Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/14 drm/i915: Clean up the .get_cdclk() assignment if ladder
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Let's clean up the mess we have in the if ladder that assigns the .get_cdclk() hooks. The grouping of the platforms by the function results in a thing that's not really legible, so let's do it the other way around and order the if ladder by platform and duplicate whatever assignments we need.
To further avoid confusion with the function names let's rename them to just fixed_<freq>_get_cdclk(). The other option would be to duplicate the functions entirely but it seems quite pointless to do that since each one just returns a fixed value.
v2: Deal with i945gm_get_cdclk()
--- drivers/gpu/drm/i915/intel_display.c | 39 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +22 -17
@@ -7385,12 +7385,12 @@ static int valleyview_get_cdclk(struct drm_i915_private *dev_priv) CCK_DISPLAY_CLOCK_CONTROL); } -static int ilk_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_450mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 450000 ; } -static int i945_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_400mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 400000 ; }
@@ -7415,12 +7415,12 @@ static int i945gm_get_cdclk(struct drm_i915_private *dev_priv) } } -static int i915_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_333mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 333333 ; } -static int i9xx_misc_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_200mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 200000 ; }
@@ -7470,7 +7470,7 @@ static int i915gm_get_cdclk(struct drm_i915_private *dev_priv) } } -static int i865_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_266mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 266667 ; }
@@ -7513,7 +7513,7 @@ static int i85x_get_cdclk(struct drm_i915_private *dev_priv)return 0 ; } -static int i830_get_cdclk (struct drm_i915_private *dev_priv) +static int fixed_133mhz_get_cdclk (struct drm_i915_private *dev_priv) {return 133333 ; }
@@ -16249,34 +16249,39 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.get_cdclk = haswell_get_cdclk; else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) dev_priv->display.get_cdclk = valleyview_get_cdclk; + else if (IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_GEN5(dev_priv)) - dev_priv->display.get_cdclk = ilk_get_cdclk; - else if (IS_I945G(dev_priv) || IS_I965G(dev_priv) || - IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) - dev_priv->display.get_cdclk = i945_get_cdclk; + dev_priv->display.get_cdclk = fixed_450mhz_get_cdclk; else if (IS_GM45(dev_priv)) dev_priv->display.get_cdclk = gm45_get_cdclk; + else if (IS_G4X(dev_priv)) + dev_priv->display.get_cdclk = g33_get_cdclk; else if (IS_I965GM(dev_priv)) dev_priv->display.get_cdclk = i965gm_get_cdclk; + else if (IS_I965G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_PINEVIEW(dev_priv)) dev_priv->display.get_cdclk = pnv_get_cdclk; - else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) + else if (IS_G33(dev_priv)) dev_priv->display.get_cdclk = g33_get_cdclk; - else if (IS_I915G(dev_priv)) - dev_priv->display.get_cdclk = i915_get_cdclk; - else if (IS_I845G(dev_priv)) - dev_priv->display.get_cdclk = i9xx_misc_get_cdclk; else if (IS_I945GM(dev_priv)) dev_priv->display.get_cdclk = i945gm_get_cdclk; + else if (IS_I945G(dev_priv)) + dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; else if (IS_I915GM(dev_priv)) dev_priv->display.get_cdclk = i915gm_get_cdclk; + else if (IS_I915G(dev_priv)) + dev_priv->display.get_cdclk = fixed_333mhz_get_cdclk; else if (IS_I865G(dev_priv)) - dev_priv->display.get_cdclk = i865_get_cdclk; + dev_priv->display.get_cdclk = fixed_266mhz_get_cdclk; else if (IS_I85X(dev_priv)) dev_priv->display.get_cdclk = i85x_get_cdclk; + else if (IS_I845G(dev_priv)) + dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; else { /* 830 */WARN (!IS_I830 (dev_priv),"Unknown platform. Assuming 133 MHz CDCLK\n" ); - dev_priv->display.get_cdclk = i830_get_cdclk; + dev_priv->display.get_cdclk = fixed_133mhz_get_cdclk; }if (IS_GEN5 (dev_priv)) {
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/14 drm/i915: Move most cdclk/rawclk related code to intel_cdclk.c
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Let's try to shrink intel_display.c a bit by moving the cdclk/rawclk stuff to a new file. It's all reasonably self contained so we don't even have to add that many non-static symbols.
We'll also take the opportunity to shuffle around the functions a bit to get things in a more consistent order based on the platform.
v2: Add kernel-docs (Ander)
--- Documentation/gpu/i915.rst | 9 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_cdclk.c | 1775 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 1677 +------------------------------- drivers/gpu/drm/i915/intel_drv.h | 9 +- 5 files changed, 1797 insertions(+), 1674 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_cdclk.c
Documentation/gpu/i915.rst +9 -0
@@ -213,6 +213,15 @@ Video BIOS Table (VBT) .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h :internal: +Display clocks +-------------- + +.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c + :doc: CDCLK / RAWCLK + +.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c + :internal: + Display PLLs ------------
drivers/gpu/drm/i915/Makefile +1 -0
@@ -72,6 +72,7 @@ i915-y += intel_audio.o \ intel_atomic.o \ intel_atomic_plane.o \ intel_bios.o \ + intel_cdclk.o \ intel_color.o \ intel_display.o \ intel_dpio_phy.o \
drivers/gpu/drm/i915/intel_cdclk.c new file +1775 -0
1,775 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +4 -1673
1,203 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
PATCH v3 5/14 drm/i915: Move most cdclk/rawclk related code to intel_cdclk.c
From: Ville Syrjälä <[email protected]>
Let's try to shrink intel_display.c a bit by moving the cdclk/rawclk stuff to a new file. It's all reasonably self contained so we don't even have to add that many non-static symbols.
We'll also take the opportunity to shuffle around the functions a bit to get things in a more consistent order based on the platform.
v2: Add kernel-docs (Ander)
v3: Deal with IS_GEN9_BC()
--- Documentation/gpu/i915.rst | 9 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_cdclk.c | 1775 ++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 2117 ++++------------------------------ drivers/gpu/drm/i915/intel_drv.h | 9 +- 5 files changed, 2017 insertions(+), 1894 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_cdclk.c
Documentation/gpu/i915.rst +9 -0
@@ -213,6 +213,15 @@ Video BIOS Table (VBT) .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h :internal: +Display clocks +-------------- + +.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c + :doc: CDCLK / RAWCLK + +.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c + :internal: + Display PLLs ------------
drivers/gpu/drm/i915/Makefile +1 -0
@@ -72,6 +72,7 @@ i915-y += intel_audio.o \ intel_atomic.o \ intel_atomic_plane.o \ intel_bios.o \ + intel_cdclk.o \ intel_color.o \ intel_display.o \ intel_dpio_phy.o \
drivers/gpu/drm/i915/intel_cdclk.c new file +1775 -0
1,775 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +224 -1893
1,203 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
PATCH v4 5/14 drm/i915: Move most cdclk/rawclk related code to intel_cdclk.c
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Let's try to shrink intel_display.c a bit by moving the cdclk/rawclk stuff to a new file. It's all reasonably self contained so we don't even have to add that many non-static symbols.
We'll also take the opportunity to shuffle around the functions a bit to get things in a more consistent order based on the platform.
v2: Add kernel-docs (Ander)
v3: Deal with IS_GEN9_BC()
v4: Deal with i945gm_get_cdclk()
--- Documentation/gpu/i915.rst | 9 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_cdclk.c | 1794 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 1697 +------------------------------- drivers/gpu/drm/i915/intel_drv.h | 9 +- 5 files changed, 1816 insertions(+), 1694 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_cdclk.c
Documentation/gpu/i915.rst +9 -0
@@ -213,6 +213,15 @@ Video BIOS Table (VBT) .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h :internal: +Display clocks +-------------- + +.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c + :doc: CDCLK / RAWCLK + +.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c + :internal: + Display PLLs ------------
drivers/gpu/drm/i915/Makefile +1 -0
@@ -72,6 +72,7 @@ i915-y += intel_audio.o \ intel_atomic.o \ intel_atomic_plane.o \ intel_bios.o \ + intel_cdclk.o \ intel_color.o \ intel_display.o \ intel_dpio_phy.o \
drivers/gpu/drm/i915/intel_cdclk.c new file +1794 -0
1,794 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +4 -1693
1,184 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
PATCH v3 6/14 drm/i915: Pass computed vco to bxt_set_cdclk()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Rather than compute the vco inside bxt_set_cdclk() let's precompute it outside and pass it in. A small step towards a fully precomputed cdclk state.
--- drivers/gpu/drm/i915/intel_cdclk.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_cdclk.c +19 -14
@@ -1124,15 +1124,11 @@ static void bxt_de_pll_enable(struct drm_i915_private *dev_priv, int vco) dev_priv->cdclk_pll.vco = vco; } -static void bxt_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) +static void bxt_set_cdclk (struct drm_i915_private *dev_priv, +int cdclk,int vco) {u32 val, divider; -int vco, ret; - -if (IS_GEMINILAKE (dev_priv)) - vco =glk_de_pll_vco (dev_priv, cdclk); -else - vco =bxt_de_pll_vco (dev_priv, cdclk); +int ret;DRM_DEBUG_DRIVER ("Changing CDCLK to %d kHz (VCO %d kHz)\n" , cdclk, vco);
@@ -1265,7 +1261,7 @@ static void bxt_sanitize_cdclk(struct drm_i915_private *dev_priv)*/ void bxt_init_cdclk (struct drm_i915_private *dev_priv) { -int cdclk; +int cdclk, vco;bxt_sanitize_cdclk (dev_priv);
@@ -1277,12 +1273,15 @@ void bxt_init_cdclk(struct drm_i915_private *dev_priv)* - The initial CDCLK needs to be read from VBT. * Need to make this change after VBT has changes for BXT. */ -if (IS_GEMINILAKE (dev_priv)) +if (IS_GEMINILAKE (dev_priv)) { cdclk =glk_calc_cdclk (0 ); -else + vco =glk_de_pll_vco (dev_priv, cdclk); + }else { cdclk =bxt_calc_cdclk (0 ); + vco =bxt_de_pll_vco (dev_priv, cdclk); + } -bxt_set_cdclk (dev_priv, cdclk); +bxt_set_cdclk (dev_priv, cdclk, vco); }/**
@@ -1294,7 +1293,7 @@ void bxt_init_cdclk(struct drm_i915_private *dev_priv)*/ void bxt_uninit_cdclk (struct drm_i915_private *dev_priv) { -bxt_set_cdclk (dev_priv, dev_priv->cdclk_pll.ref); +bxt_set_cdclk (dev_priv, dev_priv->cdclk_pll.ref,0 ); } static int bdw_adjust_min_pipe_pixel_rate(struct intel_crtc_state *crtc_state,
@@ -1514,12 +1513,18 @@ static int bxt_modeset_calc_cdclk(struct drm_atomic_state *state)static void bxt_modeset_commit_cdclk (struct drm_atomic_state *old_state) { -struct drm_device *dev = old_state->dev; +struct drm_i915_private *dev_priv =to_i915 (old_state->dev);struct intel_atomic_state *old_intel_state =to_intel_atomic_state (old_state);unsigned int req_cdclk = old_intel_state->dev_cdclk; +unsigned int req_vco; -bxt_set_cdclk (to_i915 (dev), req_cdclk); +if (IS_GEMINILAKE (dev_priv)) + req_vco =glk_de_pll_vco (dev_priv, req_cdclk); +else + req_vco =bxt_de_pll_vco (dev_priv, req_cdclk); + +bxt_set_cdclk (dev_priv, req_cdclk, req_vco); }static int intel_compute_max_dotclk (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/14 drm/i915: Start moving the cdclk stuff into a distinct state structure
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Introduce intel_cdclk state which for now will track the cdclk frequency, the vco frequency and the reference frequency (not sure we want the last one, but I put it there anyway). We'll also make the .get_cdclk() function fill out this state structure rather than just returning the current cdclk frequency.
One immediate benefit is that calling .get_cdclk() will no longer clobber state stored under dev_priv unless ex[plicitly told to do so. Previously it clobbered the vco and reference clocks stored there on some platforms.
We'll expand the use of this structure to actually precomputing the state and whatnot later.
v2: Constify intel_cdclk_state_compare()
v3: Document intel_cdclk_state_compare()
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 14 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_cdclk.c | 367 +++++++++++++++++++------------- drivers/gpu/drm/i915/intel_display.c | 18 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 5 +- 10 files changed, 248 insertions(+), 171 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -1262,7 +1262,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_puts (m,"no P-state info available\n" ); } -seq_printf (m,"Current CD clock frequency: %d kHz\n" , dev_priv->cdclk_freq); +seq_printf (m,"Current CD clock frequency: %d kHz\n" , dev_priv->cdclk.hw.cdclk);seq_printf (m,"Max CD clock frequency: %d kHz\n" , dev_priv->max_cdclk_freq);seq_printf (m,"Max pixel clock frequency: %d kHz\n" , dev_priv->max_dotclk_freq);
drivers/gpu/drm/i915/i915_drv.h +10 -4
@@ -600,9 +600,11 @@ struct intel_initial_plane_config;struct intel_crtc ;struct intel_limit ;struct dpll ; +struct intel_cdclk_state ;struct drm_i915_display_funcs { -int (*get_cdclk)(struct drm_i915_private *dev_priv); +void (*get_cdclk)(struct drm_i915_private *dev_priv, +struct intel_cdclk_state *cdclk_state);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
@@ -2053,6 +2055,10 @@ struct i915_oa_ops {bool (*oa_buffer_is_empty)(struct drm_i915_private *dev_priv); }; +struct intel_cdclk_state { +unsigned int cdclk, vco, ref; +}; +struct drm_i915_private {struct drm_device drm;
@@ -2157,7 +2163,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_preferred_vco_freq; -unsigned int cdclk_freq, max_cdclk_freq; +unsigned int max_cdclk_freq;/* * For reading holding any crtc lock is sufficient,
@@ -2171,8 +2177,8 @@ struct drm_i915_private {unsigned int czclk_freq;struct { -unsigned int vco, ref; - } cdclk_pll; +struct intel_cdclk_state hw; + } cdclk;/** * wq - Driver workqueue for GEM.
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -734,7 +734,7 @@ static int i915_audio_component_get_cdclk_freq(struct device *kdev)if (WARN_ON_ONCE (!HAS_DDI (dev_priv)))return -ENODEV ; -return dev_priv->cdclk_freq; +return dev_priv->cdclk.hw.cdclk; }/*
drivers/gpu/drm/i915/intel_cdclk.c +216 -151
808 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +9 -9
@@ -135,7 +135,7 @@ struct intel_limit { };/* returns HPLL frequency in kHz */ -static int valleyview_get_vco (struct drm_i915_private *dev_priv) +int vlv_get_hpll_vco (struct drm_i915_private *dev_priv) {int hpll_freq, vco_freq[] = {800 ,1600 ,2000 ,2400 };
@@ -171,7 +171,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, const char *name, u32 reg) { if (dev_priv->hpll_freq == 0) - dev_priv->hpll_freq = valleyview_get_vco(dev_priv); + dev_priv->hpll_freq = vlv_get_hpll_vco(dev_priv);return vlv_get_cck_clock (dev_priv, name, reg, dev_priv->hpll_freq);
@@ -12390,7 +12390,7 @@ static int intel_modeset_checks(struct drm_atomic_state *state)*/ if (dev_priv->display.modeset_calc_cdclk) {if (!intel_state->cdclk_pll_vco) - intel_state->cdclk_pll_vco = dev_priv->cdclk_pll.vco; + intel_state->cdclk_pll_vco = dev_priv->cdclk.hw.vco;if (!intel_state->cdclk_pll_vco) intel_state->cdclk_pll_vco = dev_priv->skl_preferred_vco_freq;
@@ -12410,8 +12410,8 @@ static int intel_modeset_checks(struct drm_atomic_state *state) }/* All pipes must be switched off while we change the cdclk. */ -if (intel_state->dev_cdclk != dev_priv->cdclk_freq || - intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco) { +if (intel_state->dev_cdclk != dev_priv->cdclk.hw.cdclk || + intel_state->cdclk_pll_vco != dev_priv->cdclk.hw.vco) { ret =intel_modeset_all_pipes (state);if (ret <0 )return ret;
@@ -12828,8 +12828,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)drm_atomic_helper_update_legacy_modeset_state (state->dev, state);if (dev_priv->display.modeset_commit_cdclk && - (intel_state->dev_cdclk != dev_priv->cdclk_freq || - intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco)) + (intel_state->dev_cdclk != dev_priv->cdclk.hw.cdclk || + intel_state->cdclk_pll_vco != dev_priv->cdclk.hw.vco)) dev_priv->display.modeset_commit_cdclk (state);/*
@@ -14806,7 +14806,7 @@ void intel_modeset_init_hw(struct drm_device *dev)intel_update_cdclk (dev_priv); - dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq; + dev_priv->atomic_cdclk_freq = dev_priv->cdclk.hw.cdclk;intel_init_clock_gating (dev_priv); }
@@ -14979,7 +14979,7 @@ int intel_modeset_init(struct drm_device *dev)intel_update_czclk (dev_priv);intel_update_cdclk (dev_priv); - dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq; + dev_priv->atomic_cdclk_freq = dev_priv->cdclk.hw.cdclk;intel_shared_dpll_init (dev);
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -916,7 +916,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)* divide by 2000 and use that */ if (intel_dig_port->port ==PORT_A ) -return DIV_ROUND_CLOSEST (dev_priv->cdclk_freq,2000 ); +return DIV_ROUND_CLOSEST (dev_priv->cdclk.hw.cdclk,2000 );else return DIV_ROUND_CLOSEST (dev_priv->rawclk_freq,2000 ); }
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1237,10 +1237,13 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv);void intel_update_max_cdclk (struct drm_i915_private *dev_priv);void intel_update_cdclk (struct drm_i915_private *dev_priv);void intel_update_rawclk (struct drm_i915_private *dev_priv); +bool intel_cdclk_state_compare (const struct intel_cdclk_state *a, +const struct intel_cdclk_state *b);/* intel_display.c */ enum transcoder intel_crtc_pch_transcoder (struct intel_crtc *crtc);void intel_update_rawclk (struct drm_i915_private *dev_priv); +int vlv_get_hpll_vco (struct drm_i915_private *dev_priv);int vlv_get_cck_clock (struct drm_i915_private *dev_priv,const char *name,u32 reg,int ref_freq); int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_fbc.c +1 -1
@@ -818,7 +818,7 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)/* WaFbcExceedCdClockThreshold:hsw,bdw */ if ((IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) && - cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk_freq *95 /100 ) { + cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk.hw.cdclk *95 /100 ) { fbc->no_fbc_reason ="pixel rate is too big" ;return false; }
drivers/gpu/drm/i915/intel_panel.c +2 -2
@@ -1315,7 +1315,7 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)if (IS_PINEVIEW (dev_priv)) clock =KHz (dev_priv->rawclk_freq);else - clock =KHz (dev_priv->cdclk_freq); + clock =KHz (dev_priv->cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *32 ); }
@@ -1333,7 +1333,7 @@ static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)if (IS_G4X (dev_priv)) clock =KHz (dev_priv->rawclk_freq);else - clock =KHz (dev_priv->cdclk_freq); + clock =KHz (dev_priv->cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *128 ); }
drivers/gpu/drm/i915/intel_runtime_pm.c +4 -1
@@ -964,9 +964,12 @@ static void gen9_assert_dbuf_enabled(struct drm_i915_private *dev_priv)static void gen9_dc_off_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_cdclk_state cdclk_state = {}; +gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -WARN_ON (dev_priv->cdclk_freq != dev_priv->display.get_cdclk (dev_priv)); + dev_priv->display.get_cdclk (dev_priv, &cdclk_state); +WARN_ON (!intel_cdclk_state_compare (&dev_priv->cdclk.hw, &cdclk_state));gen9_assert_dbuf_enabled (dev_priv);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 7/14 drm/i915: Start moving the cdclk stuff into a distinct state structure
From: Ville Syrjälä <[email protected]>
Introduce intel_cdclk state which for now will track the cdclk frequency, the vco frequency and the reference frequency (not sure we want the last one, but I put it there anyway). We'll also make the .get_cdclk() function fill out this state structure rather than just returning the current cdclk frequency.
One immediate benefit is that calling .get_cdclk() will no longer clobber state stored under dev_priv unless ex[plicitly told to do so. Previously it clobbered the vco and reference clocks stored there on some platforms.
We'll expand the use of this structure to actually precomputing the state and whatnot later.
v2: Constify intel_cdclk_state_compare()
v3: Document intel_cdclk_state_compare()
v4: Deal with i945gm_get_cdclk()
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 14 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_cdclk.c | 382 +++++++++++++++++++------------- drivers/gpu/drm/i915/intel_display.c | 18 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 5 +- 10 files changed, 258 insertions(+), 176 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -1281,7 +1281,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_puts (m,"no P-state info available\n" ); } -seq_printf (m,"Current CD clock frequency: %d kHz\n" , dev_priv->cdclk_freq); +seq_printf (m,"Current CD clock frequency: %d kHz\n" , dev_priv->cdclk.hw.cdclk);seq_printf (m,"Max CD clock frequency: %d kHz\n" , dev_priv->max_cdclk_freq);seq_printf (m,"Max pixel clock frequency: %d kHz\n" , dev_priv->max_dotclk_freq);
drivers/gpu/drm/i915/i915_drv.h +10 -4
@@ -600,9 +600,11 @@ struct intel_initial_plane_config;struct intel_crtc ;struct intel_limit ;struct dpll ; +struct intel_cdclk_state ;struct drm_i915_display_funcs { -int (*get_cdclk)(struct drm_i915_private *dev_priv); +void (*get_cdclk)(struct drm_i915_private *dev_priv, +struct intel_cdclk_state *cdclk_state);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
@@ -2060,6 +2062,10 @@ struct i915_oa_ops {bool (*oa_buffer_is_empty)(struct drm_i915_private *dev_priv); }; +struct intel_cdclk_state { +unsigned int cdclk, vco, ref; +}; +struct drm_i915_private {struct drm_device drm;
@@ -2164,7 +2170,7 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_preferred_vco_freq; -unsigned int cdclk_freq, max_cdclk_freq; +unsigned int max_cdclk_freq;/* * For reading holding any crtc lock is sufficient,
@@ -2178,8 +2184,8 @@ struct drm_i915_private {unsigned int czclk_freq;struct { -unsigned int vco, ref; - } cdclk_pll; +struct intel_cdclk_state hw; + } cdclk;/** * wq - Driver workqueue for GEM.
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -734,7 +734,7 @@ static int i915_audio_component_get_cdclk_freq(struct device *kdev)if (WARN_ON_ONCE (!HAS_DDI (dev_priv)))return -ENODEV ; -return dev_priv->cdclk_freq; +return dev_priv->cdclk.hw.cdclk; }/*
drivers/gpu/drm/i915/intel_cdclk.c +226 -156
837 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +9 -9
@@ -135,7 +135,7 @@ struct intel_limit { };/* returns HPLL frequency in kHz */ -static int valleyview_get_vco (struct drm_i915_private *dev_priv) +int vlv_get_hpll_vco (struct drm_i915_private *dev_priv) {int hpll_freq, vco_freq[] = {800 ,1600 ,2000 ,2400 };
@@ -171,7 +171,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, const char *name, u32 reg) { if (dev_priv->hpll_freq == 0) - dev_priv->hpll_freq = valleyview_get_vco(dev_priv); + dev_priv->hpll_freq = vlv_get_hpll_vco(dev_priv);return vlv_get_cck_clock (dev_priv, name, reg, dev_priv->hpll_freq);
@@ -12413,7 +12413,7 @@ static int intel_modeset_checks(struct drm_atomic_state *state)*/ if (dev_priv->display.modeset_calc_cdclk) {if (!intel_state->cdclk_pll_vco) - intel_state->cdclk_pll_vco = dev_priv->cdclk_pll.vco; + intel_state->cdclk_pll_vco = dev_priv->cdclk.hw.vco;if (!intel_state->cdclk_pll_vco) intel_state->cdclk_pll_vco = dev_priv->skl_preferred_vco_freq;
@@ -12433,8 +12433,8 @@ static int intel_modeset_checks(struct drm_atomic_state *state) }/* All pipes must be switched off while we change the cdclk. */ -if (intel_state->dev_cdclk != dev_priv->cdclk_freq || - intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco) { +if (intel_state->dev_cdclk != dev_priv->cdclk.hw.cdclk || + intel_state->cdclk_pll_vco != dev_priv->cdclk.hw.vco) { ret =intel_modeset_all_pipes (state);if (ret <0 )return ret;
@@ -12869,8 +12869,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)drm_atomic_helper_update_legacy_modeset_state (state->dev, state);if (dev_priv->display.modeset_commit_cdclk && - (intel_state->dev_cdclk != dev_priv->cdclk_freq || - intel_state->cdclk_pll_vco != dev_priv->cdclk_pll.vco)) + (intel_state->dev_cdclk != dev_priv->cdclk.hw.cdclk || + intel_state->cdclk_pll_vco != dev_priv->cdclk.hw.vco)) dev_priv->display.modeset_commit_cdclk (state);/*
@@ -14855,7 +14855,7 @@ void intel_modeset_init_hw(struct drm_device *dev)intel_update_cdclk (dev_priv); - dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq; + dev_priv->atomic_cdclk_freq = dev_priv->cdclk.hw.cdclk;intel_init_clock_gating (dev_priv); }
@@ -15031,7 +15031,7 @@ int intel_modeset_init(struct drm_device *dev)intel_update_czclk (dev_priv);intel_update_cdclk (dev_priv); - dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq; + dev_priv->atomic_cdclk_freq = dev_priv->cdclk.hw.cdclk;intel_shared_dpll_init (dev);
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -918,7 +918,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)* divide by 2000 and use that */ if (intel_dig_port->port ==PORT_A ) -return DIV_ROUND_CLOSEST (dev_priv->cdclk_freq,2000 ); +return DIV_ROUND_CLOSEST (dev_priv->cdclk.hw.cdclk,2000 );else return DIV_ROUND_CLOSEST (dev_priv->rawclk_freq,2000 ); }
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1251,10 +1251,13 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv);void intel_update_max_cdclk (struct drm_i915_private *dev_priv);void intel_update_cdclk (struct drm_i915_private *dev_priv);void intel_update_rawclk (struct drm_i915_private *dev_priv); +bool intel_cdclk_state_compare (const struct intel_cdclk_state *a, +const struct intel_cdclk_state *b);/* intel_display.c */ enum transcoder intel_crtc_pch_transcoder (struct intel_crtc *crtc);void intel_update_rawclk (struct drm_i915_private *dev_priv); +int vlv_get_hpll_vco (struct drm_i915_private *dev_priv);int vlv_get_cck_clock (struct drm_i915_private *dev_priv,const char *name,u32 reg,int ref_freq); int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_fbc.c +1 -1
@@ -817,7 +817,7 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)/* WaFbcExceedCdClockThreshold:hsw,bdw */ if ((IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) && - cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk_freq *95 /100 ) { + cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk.hw.cdclk *95 /100 ) { fbc->no_fbc_reason ="pixel rate is too big" ;return false; }
drivers/gpu/drm/i915/intel_panel.c +2 -2
@@ -1315,7 +1315,7 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)if (IS_PINEVIEW (dev_priv)) clock =KHz (dev_priv->rawclk_freq);else - clock =KHz (dev_priv->cdclk_freq); + clock =KHz (dev_priv->cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *32 ); }
@@ -1333,7 +1333,7 @@ static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)if (IS_G4X (dev_priv)) clock =KHz (dev_priv->rawclk_freq);else - clock =KHz (dev_priv->cdclk_freq); + clock =KHz (dev_priv->cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *128 ); }
drivers/gpu/drm/i915/intel_runtime_pm.c +4 -1
@@ -964,9 +964,12 @@ static void gen9_assert_dbuf_enabled(struct drm_i915_private *dev_priv)static void gen9_dc_off_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_cdclk_state cdclk_state = {}; +gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -WARN_ON (dev_priv->cdclk_freq != dev_priv->display.get_cdclk (dev_priv)); + dev_priv->display.get_cdclk (dev_priv, &cdclk_state); +WARN_ON (!intel_cdclk_state_compare (&dev_priv->cdclk.hw, &cdclk_state));gen9_assert_dbuf_enabled (dev_priv);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/14 drm/i915: Track full cdclk state for the logical and actual cdclk frequencies
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The current dev_cdclk vs. cdclk vs. atomic_cdclk_freq is quite a mess. So here I'm introducing the "actual" and "logical" naming for our cdclk state. "actual" is what we'll bash into the hardware and "logical" is what everyone should use for state computaion/checking and whatnot. We'll track both using the intel_cdclk_state as both will need other differing parameters than just the actual cdclk frequency.
While doing that we can at the same time unify the appearance of the .modeset_calc_cdclk() implementations a little bit.
v2: Commit dev_priv->cdclk.actual since that already has the
new state by the time .modeset_commit_cdclk() is called.
v3: s/locical/logical/ and improve the docs a bit
--- drivers/gpu/drm/i915/i915_drv.h | 20 ++++-- drivers/gpu/drm/i915/intel_cdclk.c | 123 ++++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_display.c | 39 ++++++----- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 22 ++++--- drivers/gpu/drm/i915/intel_pm.c | 4 +- 6 files changed, 127 insertions(+), 83 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +14 -6
@@ -2165,18 +2165,26 @@ struct drm_i915_private {unsigned int skl_preferred_vco_freq;unsigned int max_cdclk_freq; -/* -* For reading holding any crtc lock is sufficient, -* for writing must hold all of them. -*/ -unsigned int atomic_cdclk_freq; -unsigned int max_dotclk_freq;unsigned int rawclk_freq;unsigned int hpll_freq;unsigned int czclk_freq;struct { +/* +* The current logical cdclk state. +* See intel_atomic_state.cdclk.logical +* +* For reading holding any crtc lock is sufficient, +* for writing must hold all of them. +*/ +struct intel_cdclk_state logical; +/* +* The current actual cdclk state. +* See intel_atomic_state.cdclk.actual +*/ +struct intel_cdclk_state actual; +/* The current hardware cdclk state */ struct intel_cdclk_state hw; } cdclk;
drivers/gpu/drm/i915/intel_cdclk.c +78 -45
191 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +19 -20
@@ -12370,6 +12370,8 @@ static int intel_modeset_checks(struct drm_atomic_state *state) intel_state->modeset = true; intel_state->active_crtcs = dev_priv->active_crtcs; + intel_state->cdclk.logical = dev_priv->cdclk.logical; + intel_state->cdclk.actual = dev_priv->cdclk.actual;for_each_crtc_in_state (state, crtc, crtc_state, i) {if (crtc_state->active)
@@ -12389,38 +12391,35 @@ static int intel_modeset_checks(struct drm_atomic_state *state)* adjusted_mode bits in the crtc directly. */ if (dev_priv->display.modeset_calc_cdclk) { -if (!intel_state->cdclk_pll_vco) - intel_state->cdclk_pll_vco = dev_priv->cdclk.hw.vco; -if (!intel_state->cdclk_pll_vco) - intel_state->cdclk_pll_vco = dev_priv->skl_preferred_vco_freq; - ret = dev_priv->display.modeset_calc_cdclk (state);if (ret <0 )return ret;/* -* Writes to dev_priv->atomic_cdclk_freq must protected by +* Writes to dev_priv->cdclk.logical must protected by * holding all the crtc locks, even if we don't end up * touching the hardware */ -if (intel_state->cdclk != dev_priv->atomic_cdclk_freq) { +if (!intel_cdclk_state_compare (&dev_priv->cdclk.logical, + &intel_state->cdclk.logical)) { ret =intel_lock_all_pipes (state);if (ret <0 )return ret; }/* All pipes must be switched off while we change the cdclk. */ -if (intel_state->dev_cdclk != dev_priv->cdclk.hw.cdclk || - intel_state->cdclk_pll_vco != dev_priv->cdclk.hw.vco) { +if (!intel_cdclk_state_compare (&dev_priv->cdclk.actual, + &intel_state->cdclk.actual)) { ret =intel_modeset_all_pipes (state);if (ret <0 )return ret; } -DRM_DEBUG_KMS ("New cdclk calculated to be atomic %u, actual %u\n" , - intel_state->cdclk, intel_state->dev_cdclk); +DRM_DEBUG_KMS ("New cdclk calculated to be logical %u kHz, actual %u kHz\n" , + intel_state->cdclk.logical.cdclk, + intel_state->cdclk.actual.cdclk); }else { -to_intel_atomic_state (state)->cdclk = dev_priv->atomic_cdclk_freq; +to_intel_atomic_state (state)->cdclk.logical = dev_priv->cdclk.logical; }intel_modeset_clear_plls (state);
@@ -12523,7 +12522,7 @@ static int intel_atomic_check(struct drm_device *dev,if (ret)return ret; }else { - intel_state->cdclk = dev_priv->atomic_cdclk_freq; + intel_state->cdclk.logical = dev_priv->cdclk.logical; } ret =drm_atomic_helper_check_planes (dev, state);
@@ -12828,8 +12827,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)drm_atomic_helper_update_legacy_modeset_state (state->dev, state);if (dev_priv->display.modeset_commit_cdclk && - (intel_state->dev_cdclk != dev_priv->cdclk.hw.cdclk || - intel_state->cdclk_pll_vco != dev_priv->cdclk.hw.vco)) + !intel_cdclk_state_compare (&dev_priv->cdclk.hw, + &dev_priv->cdclk.actual)) dev_priv->display.modeset_commit_cdclk (state);/*
@@ -13010,7 +13009,8 @@ static int intel_atomic_commit(struct drm_device *dev,memcpy (dev_priv->min_pixclk, intel_state->min_pixclk,sizeof (intel_state->min_pixclk)); dev_priv->active_crtcs = intel_state->active_crtcs; - dev_priv->atomic_cdclk_freq = intel_state->cdclk; + dev_priv->cdclk.logical = intel_state->cdclk.logical; + dev_priv->cdclk.actual = intel_state->cdclk.actual; }drm_atomic_state_get (state);
@@ -13248,7 +13248,7 @@ skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_statereturn DRM_PLANE_HELPER_NO_SCALING ; crtc_clock = crtc_state->base.adjusted_mode.crtc_clock; - cdclk =to_intel_atomic_state (crtc_state->base.state)->cdclk; + cdclk =to_intel_atomic_state (crtc_state->base.state)->cdclk.logical.cdclk;if (WARN_ON_ONCE (!crtc_clock || cdclk < crtc_clock))return DRM_PLANE_HELPER_NO_SCALING ;
@@ -14805,8 +14805,7 @@ void intel_modeset_init_hw(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);intel_update_cdclk (dev_priv); - - dev_priv->atomic_cdclk_freq = dev_priv->cdclk.hw.cdclk; + dev_priv->cdclk.logical = dev_priv->cdclk.actual = dev_priv->cdclk.hw;intel_init_clock_gating (dev_priv); }
@@ -14979,7 +14978,7 @@ int intel_modeset_init(struct drm_device *dev)intel_update_czclk (dev_priv);intel_update_cdclk (dev_priv); - dev_priv->atomic_cdclk_freq = dev_priv->cdclk.hw.cdclk; + dev_priv->cdclk.logical = dev_priv->cdclk.actual = dev_priv->cdclk.hw;intel_shared_dpll_init (dev);
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1765,7 +1765,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,break ; } -to_intel_atomic_state (pipe_config->base.state)->cdclk_pll_vco = vco; +to_intel_atomic_state (pipe_config->base.state)->cdclk.logical.vco = vco; }if (!HAS_DDI (dev_priv))
drivers/gpu/drm/i915/intel_drv.h +13 -9
@@ -333,13 +333,20 @@ struct dpll {struct intel_atomic_state {struct drm_atomic_state base; -unsigned int cdclk; +struct { +/* +* Logical state of cdclk (used for all scaling, watermark, +* etc. calculations and checks). This is computed as if all +* enabled crtcs were active. +*/ +struct intel_cdclk_state logical; -/* -* Calculated device cdclk, can be different from cdclk -* only when all crtc's are DPMS off. -*/ -unsigned int dev_cdclk; +/* +* Actual state of cdclk, can be different from the logical +* state only when all crtc's are DPMS off. +*/ +struct intel_cdclk_state actual; + } cdclk;bool dpll_set, modeset;
@@ -356,9 +363,6 @@ struct intel_atomic_state {unsigned int active_crtcs;unsigned int min_pixclk[I915_MAX_PIPES ]; -/* SKL/KBL Only */ -unsigned int cdclk_pll_vco; -struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];/*
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -2095,7 +2095,7 @@ hsw_compute_linetime_wm(const struct intel_crtc_state *cstate)return 0 ;if (WARN_ON (adjusted_mode->crtc_clock ==0 ))return 0 ; -if (WARN_ON (intel_state->cdclk ==0 )) +if (WARN_ON (intel_state->cdclk.logical.cdclk ==0 ))return 0 ;/* The WM are computed with base on how long it takes to fill a single
@@ -2104,7 +2104,7 @@ hsw_compute_linetime_wm(const struct intel_crtc_state *cstate) linetime =DIV_ROUND_CLOSEST (adjusted_mode->crtc_htotal *1000 *8 , adjusted_mode->crtc_clock); ips_linetime =DIV_ROUND_CLOSEST (adjusted_mode->crtc_htotal *1000 *8 , - intel_state->cdclk); + intel_state->cdclk.logical.cdclk);return PIPE_WM_LINETIME_IPS_LINETIME (ips_linetime) |PIPE_WM_LINETIME_TIME (linetime);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 9/14 drm/i915: Pass dev_priv to remainder of the cdclk functions
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Clean up the dev vs. dev_priv straggles that are making things look inconsistentt.
v2: Deal with churn
--- drivers/gpu/drm/i915/intel_cdclk.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_cdclk.c +10 -15
@@ -461,9 +461,8 @@ static void vlv_program_pfi_credits(struct drm_i915_private *dev_priv)WARN_ON (I915_READ (GCI_CONTROL ) &PFI_CREDIT_RESEND ); } -static void vlv_set_cdclk (struct drm_device *dev,int cdclk) +static void vlv_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) { -struct drm_i915_private *dev_priv =to_i915 (dev);u32 val, cmd;if (cdclk >=320000 )/* jump to highest voltage for 400MHz too */
@@ -524,9 +523,8 @@ static void vlv_set_cdclk(struct drm_device *dev, int cdclk)intel_update_cdclk (dev_priv); } -static void chv_set_cdclk (struct drm_device *dev,int cdclk) +static void chv_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) { -struct drm_i915_private *dev_priv =to_i915 (dev);u32 val, cmd;switch (cdclk) {
@@ -594,9 +592,8 @@ static void bdw_get_cdclk(struct drm_i915_private *dev_priv, cdclk_state->cdclk =675000 ; } -static void bdw_set_cdclk (struct drm_device *dev,int cdclk) +static void bdw_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t val, data;int ret;
@@ -1431,8 +1428,7 @@ static int intel_max_pixel_rate(struct drm_atomic_state *state)static int vlv_modeset_calc_cdclk (struct drm_atomic_state *state) { -struct drm_device *dev = state->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (state->dev);int max_pixclk =intel_max_pixel_rate (state);struct intel_atomic_state *intel_state =to_intel_atomic_state (state);
@@ -1462,8 +1458,7 @@ static int vlv_modeset_calc_cdclk(struct drm_atomic_state *state)static void vlv_modeset_commit_cdclk (struct drm_atomic_state *old_state) { -struct drm_device *dev = old_state->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (old_state->dev);unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk;/*
@@ -1478,9 +1473,9 @@ static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state)intel_display_power_get (dev_priv,POWER_DOMAIN_PIPE_A );if (IS_CHERRYVIEW (dev_priv)) -chv_set_cdclk (dev, req_cdclk); +chv_set_cdclk (dev_priv, req_cdclk);else -vlv_set_cdclk (dev, req_cdclk); +vlv_set_cdclk (dev_priv, req_cdclk);vlv_program_pfi_credits (dev_priv);
@@ -1522,10 +1517,10 @@ static int bdw_modeset_calc_cdclk(struct drm_atomic_state *state)static void bdw_modeset_commit_cdclk (struct drm_atomic_state *old_state) { -struct drm_device *dev = old_state->dev; -unsigned int req_cdclk =to_i915 (dev)->cdclk.actual.cdclk; +struct drm_i915_private *dev_priv =to_i915 (old_state->dev); +unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk; -bdw_set_cdclk (dev, req_cdclk); +bdw_set_cdclk (dev_priv, req_cdclk); }static int skl_modeset_calc_cdclk (struct drm_atomic_state *state)
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/14 drm/i915: Pass the cdclk state to the set_cdclk() functions
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Rather than passing all the different parameters (cdclk,vco so far) sparately to the set_cdclk() functions, just pass the entire cdclk state.
v2: Deal with churn
v3: Drop the usless .ref assignment (Ander)
--- drivers/gpu/drm/i915/intel_cdclk.c | 78 +++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/intel_cdclk.c +48 -30
@@ -461,8 +461,10 @@ static void vlv_program_pfi_credits(struct drm_i915_private *dev_priv)WARN_ON (I915_READ (GCI_CONTROL ) &PFI_CREDIT_RESEND ); } -static void vlv_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) +static void vlv_set_cdclk (struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state) { +int cdclk = cdclk_state->cdclk;u32 val, cmd;if (cdclk >=320000 )/* jump to highest voltage for 400MHz too */
@@ -523,8 +525,10 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv, int cdclk)intel_update_cdclk (dev_priv); } -static void chv_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) +static void chv_set_cdclk (struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state) { +int cdclk = cdclk_state->cdclk;u32 val, cmd;switch (cdclk) {
@@ -592,8 +596,10 @@ static void bdw_get_cdclk(struct drm_i915_private *dev_priv, cdclk_state->cdclk =675000 ; } -static void bdw_set_cdclk (struct drm_i915_private *dev_priv,int cdclk) +static void bdw_set_cdclk (struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state) { +int cdclk = cdclk_state->cdclk;uint32_t val, data;int ret;
@@ -864,8 +870,10 @@ static void skl_dpll0_disable(struct drm_i915_private *dev_priv) }static void skl_set_cdclk (struct drm_i915_private *dev_priv, -int cdclk,int vco) +const struct intel_cdclk_state *cdclk_state) { +int cdclk = cdclk_state->cdclk; +int vco = cdclk_state->vco;u32 freq_select, pcu_ack;int ret;
@@ -979,7 +987,7 @@ static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv)*/ void skl_init_cdclk (struct drm_i915_private *dev_priv) { -int cdclk, vco; +struct intel_cdclk_state cdclk_state;skl_sanitize_cdclk (dev_priv);
@@ -995,12 +1003,14 @@ void skl_init_cdclk(struct drm_i915_private *dev_priv)return ; } - vco = dev_priv->skl_preferred_vco_freq; -if (vco ==0 ) - vco =8100000 ; - cdclk =skl_calc_cdclk (0 , vco); + cdclk_state = dev_priv->cdclk.hw; -skl_set_cdclk (dev_priv, cdclk, vco); + cdclk_state.vco = dev_priv->skl_preferred_vco_freq; +if (cdclk_state.vco ==0 ) + cdclk_state.vco =8100000 ; + cdclk_state.cdclk =skl_calc_cdclk (0 , cdclk_state.vco); + +skl_set_cdclk (dev_priv, &cdclk_state); }/**
@@ -1012,7 +1022,12 @@ void skl_init_cdclk(struct drm_i915_private *dev_priv)*/ void skl_uninit_cdclk (struct drm_i915_private *dev_priv) { -skl_set_cdclk (dev_priv, dev_priv->cdclk.hw.ref,0 ); +struct intel_cdclk_state cdclk_state = dev_priv->cdclk.hw; + + cdclk_state.cdclk = cdclk_state.ref; + cdclk_state.vco =0 ; + +skl_set_cdclk (dev_priv, &cdclk_state); }static int bxt_calc_cdclk (int max_pixclk)
@@ -1176,8 +1191,10 @@ static void bxt_de_pll_enable(struct drm_i915_private *dev_priv, int vco) }static void bxt_set_cdclk (struct drm_i915_private *dev_priv, -int cdclk,int vco) +const struct intel_cdclk_state *cdclk_state) { +int cdclk = cdclk_state->cdclk; +int vco = cdclk_state->vco;u32 val, divider;int ret;
@@ -1312,7 +1329,7 @@ static void bxt_sanitize_cdclk(struct drm_i915_private *dev_priv)*/ void bxt_init_cdclk (struct drm_i915_private *dev_priv) { -int cdclk, vco; +struct intel_cdclk_state cdclk_state;bxt_sanitize_cdclk (dev_priv);
@@ -1320,20 +1337,22 @@ void bxt_init_cdclk(struct drm_i915_private *dev_priv) dev_priv->cdclk.hw.vco != 0)return ; + cdclk_state = dev_priv->cdclk.hw; +/* * FIXME: * - The initial CDCLK needs to be read from VBT. * Need to make this change after VBT has changes for BXT. */ if (IS_GEMINILAKE (dev_priv)) { - cdclk =glk_calc_cdclk (0 ); - vco =glk_de_pll_vco (dev_priv, cdclk); + cdclk_state.cdclk =glk_calc_cdclk (0 ); + cdclk_state.vco =glk_de_pll_vco (dev_priv, cdclk_state.cdclk); }else { - cdclk =bxt_calc_cdclk (0 ); - vco =bxt_de_pll_vco (dev_priv, cdclk); + cdclk_state.cdclk =bxt_calc_cdclk (0 ); + cdclk_state.vco =bxt_de_pll_vco (dev_priv, cdclk_state.cdclk); } -bxt_set_cdclk (dev_priv, cdclk, vco); +bxt_set_cdclk (dev_priv, &cdclk_state); }/**
@@ -1345,7 +1364,12 @@ void bxt_init_cdclk(struct drm_i915_private *dev_priv)*/ void bxt_uninit_cdclk (struct drm_i915_private *dev_priv) { -bxt_set_cdclk (dev_priv, dev_priv->cdclk.hw.ref,0 ); +struct intel_cdclk_state cdclk_state = dev_priv->cdclk.hw; + + cdclk_state.cdclk = cdclk_state.ref; + cdclk_state.vco =0 ; + +bxt_set_cdclk (dev_priv, &cdclk_state); }/**
@@ -1459,7 +1483,6 @@ static int vlv_modeset_calc_cdclk(struct drm_atomic_state *state)static void vlv_modeset_commit_cdclk (struct drm_atomic_state *old_state) {struct drm_i915_private *dev_priv =to_i915 (old_state->dev); -unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk;/* * FIXME: We can end up here with all power domains off, yet
@@ -1473,9 +1496,9 @@ static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state)intel_display_power_get (dev_priv,POWER_DOMAIN_PIPE_A );if (IS_CHERRYVIEW (dev_priv)) -chv_set_cdclk (dev_priv, req_cdclk); +chv_set_cdclk (dev_priv, &dev_priv->cdclk.actual);else -vlv_set_cdclk (dev_priv, req_cdclk); +vlv_set_cdclk (dev_priv, &dev_priv->cdclk.actual);vlv_program_pfi_credits (dev_priv);
@@ -1518,9 +1541,8 @@ static int bdw_modeset_calc_cdclk(struct drm_atomic_state *state)static void bdw_modeset_commit_cdclk (struct drm_atomic_state *old_state) {struct drm_i915_private *dev_priv =to_i915 (old_state->dev); -unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk; -bdw_set_cdclk (dev_priv, req_cdclk); +bdw_set_cdclk (dev_priv, &dev_priv->cdclk.actual); }static int skl_modeset_calc_cdclk (struct drm_atomic_state *state)
@@ -1565,10 +1587,8 @@ static int skl_modeset_calc_cdclk(struct drm_atomic_state *state)static void skl_modeset_commit_cdclk (struct drm_atomic_state *old_state) {struct drm_i915_private *dev_priv =to_i915 (old_state->dev); -unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk; -unsigned int req_vco = dev_priv->cdclk.actual.vco; -skl_set_cdclk (dev_priv, req_cdclk, req_vco); +skl_set_cdclk (dev_priv, &dev_priv->cdclk.actual); }static int bxt_modeset_calc_cdclk (struct drm_atomic_state *state)
@@ -1618,10 +1638,8 @@ static int bxt_modeset_calc_cdclk(struct drm_atomic_state *state)static void bxt_modeset_commit_cdclk (struct drm_atomic_state *old_state) {struct drm_i915_private *dev_priv =to_i915 (old_state->dev); -unsigned int req_cdclk = dev_priv->cdclk.actual.cdclk; -unsigned int req_vco = dev_priv->cdclk.actual.vco; -bxt_set_cdclk (dev_priv, req_cdclk, req_vco); +bxt_set_cdclk (dev_priv, &dev_priv->cdclk.actual); }static int intel_compute_max_dotclk (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/14 drm/i915: Move PFI credit reprogramming into vlv/chv_set_cdclk()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Move the vlv_program_pfi_credits() into vlv_set_cdclk() and chv_set_cdclk() so that we can neuter vlv_modeset_commit_cdclk().
--- drivers/gpu/drm/i915/intel_cdclk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_cdclk.c +4 -1
@@ -522,6 +522,8 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv,mutex_unlock (&dev_priv->sb_lock); +vlv_program_pfi_credits (dev_priv); +intel_update_cdclk (dev_priv); }
@@ -561,6 +563,8 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv, }mutex_unlock (&dev_priv->rps.hw_lock); +vlv_program_pfi_credits (dev_priv); +intel_update_cdclk (dev_priv); }
@@ -1500,7 +1504,6 @@ static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state)else vlv_set_cdclk (dev_priv, &dev_priv->cdclk.actual); -vlv_program_pfi_credits (dev_priv);intel_display_power_put (dev_priv,POWER_DOMAIN_PIPE_A ); }
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 11/14 drm/i915: Move PFI credit reprogramming into vlv/chv_set_cdclk()
From: Ville Syrjälä <[email protected]>
Move the vlv_program_pfi_credits() into vlv_set_cdclk() and chv_set_cdclk() so that we can neuter vlv_modeset_commit_cdclk().
v2: Do the PFI programming after cdclk readout since it currently
depends on the readout to fill dev_priv->cdclk.hw
--- drivers/gpu/drm/i915/intel_cdclk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_cdclk.c +4 -1
@@ -523,6 +523,8 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv,mutex_unlock (&dev_priv->sb_lock);intel_update_cdclk (dev_priv); + +vlv_program_pfi_credits (dev_priv); } static void chv_set_cdclk(struct drm_i915_private *dev_priv,
@@ -562,6 +564,8 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv,mutex_unlock (&dev_priv->rps.hw_lock);intel_update_cdclk (dev_priv); + +vlv_program_pfi_credits (dev_priv); }static int bdw_calc_cdclk (int max_pixclk)
@@ -1500,7 +1504,6 @@ static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state)else vlv_set_cdclk (dev_priv, &dev_priv->cdclk.actual); -vlv_program_pfi_credits (dev_priv);intel_display_power_put (dev_priv,POWER_DOMAIN_PIPE_A ); }
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 12/14 drm/i915: Nuke the VLV/CHV PFI programming power domain workaround
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The hack to grab the pipe A power domain around VLV/CHV cdclk programming has surely outlived its usefulness. We should be holding sufficient power domains during any modeset, so let's just nuke this hack.
v2: Fix typo in commit message (Ander)
--- drivers/gpu/drm/i915/intel_cdclk.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/gpu/drm/i915/intel_cdclk.c +0 -14
@@ -1488,24 +1488,10 @@ static void vlv_modeset_commit_cdclk(struct drm_atomic_state *old_state) {struct drm_i915_private *dev_priv =to_i915 (old_state->dev); -/* -* FIXME: We can end up here with all power domains off, yet -* with a CDCLK frequency other than the minimum. To account -* for this take the PIPE-A power domain, which covers the HW -* blocks needed for the following programming. This can be -* removed once it's guaranteed that we get here either with -* the minimum CDCLK set, or the required power domains -* enabled. -*/ -intel_display_power_get (dev_priv,POWER_DOMAIN_PIPE_A ); -if (IS_CHERRYVIEW (dev_priv))chv_set_cdclk (dev_priv, &dev_priv->cdclk.actual);else vlv_set_cdclk (dev_priv, &dev_priv->cdclk.actual); - - -intel_display_power_put (dev_priv,POWER_DOMAIN_PIPE_A ); }static int bdw_modeset_calc_cdclk (struct drm_atomic_state *state)
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/14 drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct .set_cdclk() hook
In reply to [email protected]From: Ville Syrjälä <[email protected]>
With the cdclk state, all the .modeset_commit_cdclk() hooks are now pointless wrappers. Let's replace them with just a .set_cdclk() function pointer. However let's wrap that in a small helper that does the state comparison and prints a unified debug message across all platforms. We didn't even have the debug print on all platforms previously. This reduces the clutter in intel_atomic_commit_tail() a little bit.
v2: Wrap .set_cdclk() in intel_set_cdclk()
v3: Add kernel-docs
--- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_cdclk.c | 79 +++++++++++++++--------------------- drivers/gpu/drm/i915/intel_display.c | 5 +-- drivers/gpu/drm/i915/intel_drv.h | 2 + 4 files changed, 38 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -605,6 +605,8 @@ struct intel_cdclk_state;struct drm_i915_display_funcs {void (*get_cdclk)(struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_state); +void (*set_cdclk)(struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
@@ -619,7 +621,6 @@ struct drm_i915_display_funcs {int (*compute_global_watermarks)(struct drm_atomic_state *state);void (*update_wm)(struct intel_crtc *crtc);int (*modeset_calc_cdclk)(struct drm_atomic_state *state); -void (*modeset_commit_cdclk)(struct drm_atomic_state *state);/* Returns the active state of the crtc, and if the crtc is active, * fills out the pipe-config with the hw state. */ bool (*get_pipe_config)(struct intel_crtc *,
drivers/gpu/drm/i915/intel_cdclk.c +33 -46
136 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +1 -4
@@ -12826,10 +12826,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)if (intel_state->modeset) {drm_atomic_helper_update_legacy_modeset_state (state->dev, state); -if (dev_priv->display.modeset_commit_cdclk && - !intel_cdclk_state_compare (&dev_priv->cdclk.hw, - &dev_priv->cdclk.actual)) - dev_priv->display.modeset_commit_cdclk (state); +intel_set_cdclk (dev_priv, &dev_priv->cdclk.actual);/* * SKL workaround: bspec recommends we disable the SAGV when we
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1243,6 +1243,8 @@ void intel_update_cdclk(struct drm_i915_private *dev_priv);void intel_update_rawclk (struct drm_i915_private *dev_priv);bool intel_cdclk_state_compare (const struct intel_cdclk_state *a,const struct intel_cdclk_state *b); +void intel_set_cdclk (struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state);/* intel_display.c */ enum transcoder intel_crtc_pch_transcoder (struct intel_crtc *crtc);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 13/14 drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct .set_cdclk() hook
From: Ville Syrjälä <[email protected]>
With the cdclk state, all the .modeset_commit_cdclk() hooks are now pointless wrappers. Let's replace them with just a .set_cdclk() function pointer. However let's wrap that in a small helper that does the state comparison and prints a unified debug message across all platforms. We didn't even have the debug print on all platforms previously. This reduces the clutter in intel_atomic_commit_tail() a little bit.
v2: Wrap .set_cdclk() in intel_set_cdclk()
v3: Add kernel-docs
v4: Deal with IS_GEN9_BC()
--- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_cdclk.c | 79 +++++++++++++++--------------------- drivers/gpu/drm/i915/intel_display.c | 5 +-- drivers/gpu/drm/i915/intel_drv.h | 2 + 4 files changed, 38 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -604,6 +604,8 @@ struct intel_cdclk_state;struct drm_i915_display_funcs {void (*get_cdclk)(struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_state); +void (*set_cdclk)(struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state);int (*get_fifo_size)(struct drm_i915_private *dev_priv,int plane);int (*compute_pipe_wm)(struct intel_crtc_state *cstate); int (*compute_intermediate_wm)(struct drm_device *dev,
@@ -618,7 +620,6 @@ struct drm_i915_display_funcs {int (*compute_global_watermarks)(struct drm_atomic_state *state);void (*update_wm)(struct intel_crtc *crtc);int (*modeset_calc_cdclk)(struct drm_atomic_state *state); -void (*modeset_commit_cdclk)(struct drm_atomic_state *state);/* Returns the active state of the crtc, and if the crtc is active, * fills out the pipe-config with the hw state. */ bool (*get_pipe_config)(struct intel_crtc *,
drivers/gpu/drm/i915/intel_cdclk.c +33 -46
136 lines not on this page · raw message
drivers/gpu/drm/i915/intel_display.c +1 -4
@@ -12837,10 +12837,7 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)if (intel_state->modeset) {drm_atomic_helper_update_legacy_modeset_state (state->dev, state); -if (dev_priv->display.modeset_commit_cdclk && - !intel_cdclk_state_compare (&dev_priv->cdclk.hw, - &dev_priv->cdclk.actual)) - dev_priv->display.modeset_commit_cdclk (state); +intel_set_cdclk (dev_priv, &dev_priv->cdclk.actual);/* * SKL workaround: bspec recommends we disable the SAGV when we
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1258,6 +1258,8 @@ void intel_update_cdclk(struct drm_i915_private *dev_priv);void intel_update_rawclk (struct drm_i915_private *dev_priv);bool intel_cdclk_state_compare (const struct intel_cdclk_state *a,const struct intel_cdclk_state *b); +void intel_set_cdclk (struct drm_i915_private *dev_priv, +const struct intel_cdclk_state *cdclk_state);/* intel_display.c */ enum transcoder intel_crtc_pch_transcoder (struct intel_crtc *crtc);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 14/14 drm/i915: Move ilk_pipe_pixel_rate() to intel_display.c
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Move ilk_pipe_pixel_rate() next to its only caller (intel_crtc_compute_pixel_rate()).
--- drivers/gpu/drm/i915/intel_display.c | 35 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_pm.c | 33 --------------------------------- 3 files changed, 35 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/intel_display.c +35 -0
@@ -6216,6 +6216,41 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc) (crtc->pipe ==PIPE_A ||IS_I915G (dev_priv)); } +static uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config) +{ +uint32_t pixel_rate; + + pixel_rate = pipe_config->base.adjusted_mode.crtc_clock; + +/* +* We only use IF-ID interlacing. If we ever use +* PF-ID we'll need to adjust the pixel_rate here. +*/ + +if (pipe_config->pch_pfit.enabled) { +uint64_t pipe_w, pipe_h, pfit_w, pfit_h; +uint32_t pfit_size = pipe_config->pch_pfit.size; + + pipe_w = pipe_config->pipe_src_w; + pipe_h = pipe_config->pipe_src_h; + + pfit_w = (pfit_size >>16 ) &0xFFFF ; + pfit_h = pfit_size &0xFFFF ; +if (pipe_w < pfit_w) + pipe_w = pfit_w; +if (pipe_h < pfit_h) + pipe_h = pfit_h; + +if (WARN_ON (!pfit_w || !pfit_h)) +return pixel_rate; + + pixel_rate =div_u64 ((uint64_t ) pixel_rate * pipe_w * pipe_h, + pfit_w * pfit_h); + } + +return pixel_rate; +} +static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -1806,7 +1806,6 @@ bool skl_wm_level_equals(const struct skl_wm_level *l1,bool skl_ddb_allocation_overlaps (const struct skl_ddb_entry **entries,const struct skl_ddb_entry *ddb,int ignore); -uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config);bool ilk_disable_lp_wm (struct drm_device *dev);int sanitize_rc6_option (struct drm_i915_private *dev_priv,int enable_rc6);static inline int intel_enable_rc6 (void )
drivers/gpu/drm/i915/intel_pm.c +0 -33
@@ -1701,39 +1701,6 @@ static void i845_update_wm(struct intel_crtc *unused_crtc)I915_WRITE (FW_BLC , fwater_lo); } -uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config) -{ -uint32_t pixel_rate; - - pixel_rate = pipe_config->base.adjusted_mode.crtc_clock; - -/* We only use IF-ID interlacing. If we ever use PF-ID we'll need to -* adjust the pixel_rate here. */ - -if (pipe_config->pch_pfit.enabled) { -uint64_t pipe_w, pipe_h, pfit_w, pfit_h; -uint32_t pfit_size = pipe_config->pch_pfit.size; - - pipe_w = pipe_config->pipe_src_w; - pipe_h = pipe_config->pipe_src_h; - - pfit_w = (pfit_size >>16 ) &0xFFFF ; - pfit_h = pfit_size &0xFFFF ; -if (pipe_w < pfit_w) - pipe_w = pfit_w; -if (pipe_h < pfit_h) - pipe_h = pfit_h; - -if (WARN_ON (!pfit_w || !pfit_h)) -return pixel_rate; - - pixel_rate =div_u64 ((uint64_t ) pixel_rate * pipe_w * pipe_h, - pfit_w * pfit_h); - } - -return pixel_rate; -} -/* latency must be in 0.1us units. */ static uint32_t ilk_wm_method1 (uint32_t pixel_rate,uint8_t cpp,uint32_t latency) {
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: Introduce intel_cdclk_state (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Introduce intel_cdclk_state (rev3)
URL : https://patchwork.freedesktop.org/series/16994/
State : warning
== Summary ==
Series 16994v3 drm/i915: Introduce intel_cdclk_state
https://patchwork.freedesktop.org/api/1.0/series/16994/revisions/3/mbox/
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> DMESG-WARN (fi-snb-2520m)fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:214 dwarn:1 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
aa012aa081f6a6d2dd5a1df0f3c3736017df0d56 drm-tip: 2017y-01m-20d-09h-33m-30s UTC integration manifest f3392a6 drm/i915: Move ilk_pipe_pixel_rate() to intel_display.c
3814a27 drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct .set_cdclk() hook e2deea6 drm/i915: Nuke the VLV/CHV PFI programming power domain workaround
6fcaeaa drm/i915: Move PFI credit reprogramming into vlv/chv_set_cdclk()
0356921 drm/i915: Pass the cdclk state to the set_cdclk() functions
9beaad6 drm/i915: Pass dev_priv to remainder of the cdclk functions
a9b883f drm/i915: Track full cdclk state for the logical and actual cdclk frequencies b8e2944 drm/i915: Start moving the cdclk stuff into a distinct state structure 8cf8a7b drm/i915: Pass computed vco to bxt_set_cdclk()
4520d74 drm/i915: Move most cdclk/rawclk related code to intel_cdclk.c
e970539 drm/i915: Clean up the .get_cdclk() assignment if ladder
9222aa2 drm/i915: s/get_display_clock_speed/get_cdclk/
e77b395 drm/i915: Nuke intel_mode_max_pixclk()
6dcb6f8 drm/i915: Store the pipe pixel rate in the crtc state
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3564/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · On Fri, 2017-01-20 at 20:21 +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Here's the latest version of my cdclk state work. I tried to accomodate most of the review feedback, although there were some comments which I think are better left for a followup work. Mainly about renaming some functions and whatnot to make more sense, and probably adjusting how we do the state swap.
Yeah, I didn't intend to block these on those comments. I reviewed the first patch and skimmed through the others and didn't notice anything wrong with them.
Ander
Quoted 53 lines
On that last point, I left that 'hw' state under
dev_priv->cdclk. I think we should be able to get rid of that if we pass the old cdclk state down to the code that actually programs the cdlck (since that code wants to compare the new and current states to see which parts of the programming are needed).Another thing I realized recently is that we have no protection against gmbus or aux vs. cdclk reprogramming. On some platforms/ports gmbus and/or aux is clock by cdclk, so I think we need to add some protection. Fortunately both gmbus and aux have their own low level mutexes so I think we should be able to just grab those around the reprogramming part. Although for this we might have to keep the 'hw' cdclk state as we'd need to make sure the gmbus/aux code programs the dividers based on the actual hardware state.
So, there's still some work left, but I think we should be able to move this forward and hopefully unblock some *future* stuff.
Entire series available here:
git://github.com/vsyrjala/linux.gitcdclk_state_4Ville Syrjälä (14):
drm/i915: Store the pipe pixel rate in the crtc state drm/i915: Nukeintel_mode_max_pixclk()
drm/i915: s/get_display_clock_speed/get_cdclk/
drm/i915: Clean up the .get_cdclk() assignment if ladder drm/i915: Move most cdclk/rawclk related code tointel_cdclk.cdrm/i915: Pass computed vco tobxt_set_cdclk()
drm/i915: Start moving the cdclk stuff into a distinct state structure drm/i915: Track full cdclk state for the logical and actual cdclk frequencies
drm/i915: Passdev_privto remainder of the cdclk functions drm/i915: Pass the cdclk state to theset_cdclk()functions drm/i915: Move PFI credit reprogramming into vlv/chv_set_cdclk() drm/i915: Nuke the VLV/CHV PFI programming power domain workaround drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct .set_cdclk() hook
drm/i915: Moveilk_pipe_pixel_rate()tointel_display.cDocumentation/gpu/i915.rst | 9 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 37 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_cdclk.c | 1867
+++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_display.c | 1831 ++---------------------------- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 43 +- drivers/gpu/drm/i915/intel_fbc.c | 5 +- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 51 +-drivers/gpu/drm/i915/intel_runtime_pm.c| 6 +-
Quoted 3 lines
13 files changed, 2042 insertions(+), 1820 deletions(-)create mode 100644
drivers/gpu/drm/i915/intel_cdclk.c
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: Introduce intel_cdclk_state (rev8)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Introduce intel_cdclk_state (rev8)
URL : https://patchwork.freedesktop.org/series/16994/
State : warning
== Summary ==
Series 16994v8 drm/i915: Introduce intel_cdclk_state
https://patchwork.freedesktop.org/api/1.0/series/16994/revisions/8/mbox/
Test gem_close_race:
Subgroup basic-threads:
incomplete -> PASS (fi-bxt-j4205)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b:
dmesg-warn -> PASS (fi-skl-6700k)
pass -> DMESG-WARN (fi-ivb-3770)fi-bdw-5557u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:247 pass:208 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:79 pass:66 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:247 pass:225 dwarn:1 dfail:0 fail:0 skip:21 fi-kbl-7500u total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:247 pass:222 dwarn:4 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
48cf644b4781ce8345c7506b719601c563982802 drm-tip: 2017y-01m-26d-18h-59m-50s UTC integration manifest 0caab40 drm/i915: Clean up the .get_cdclk() assignment if ladderad2c05e3 drm/i915: s/get_display_clock_speed/get_cdclk/
89e0edd drm/i915: Nuke intel_mode_max_pixclk()
17178cb drm/i915: Store the pipe pixel rate in the crtc state
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3615/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: Introduce intel_cdclk_state (rev12)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Introduce intel_cdclk_state (rev12)
URL : https://patchwork.freedesktop.org/series/16994/
State : warning
== Summary ==
Series 16994v12 drm/i915: Introduce intel_cdclk_state
https://patchwork.freedesktop.org/api/1.0/series/16994/revisions/12/mbox/
Test kms_force_connector_basic:
Subgroup force-edid:
pass -> DMESG-WARN (fi-snb-2520m)fi-bdw-5557u total:252 pass:238 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:252 pass:230 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19 fi-ilk-650 total:252 pass:199 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:252 pass:231 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:252 pass:231 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:252 pass:229 dwarn:0 dfail:0 fail:2 skip:21 fi-skl-6260u total:252 pass:239 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:252 pass:232 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:252 pass:227 dwarn:4 dfail:0 fail:0 skip:21 fi-skl-6770hq total:252 pass:239 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:252 pass:220 dwarn:1 dfail:0 fail:0 skip:31 fi-snb-2600 total:252 pass:220 dwarn:0 dfail:0 fail:0 skip:32
828426643736be75ecb9293d9de37cceeb3212ea drm-tip: 2017y-02m-07d-19h-09m-25s UTC integration manifest 3536b05 drm/i915: Clean up the .get_cdclk() assignment if ladder
7e62691 drm/i915: s/get_display_clock_speed/get_cdclk/
384459c drm/i915: Nuke intel_mode_max_pixclk()
48f77a4 drm/i915: Store the pipe pixel rate in the crtc state
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3728/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 37 lines · On Fri, Jan 20, 2017 at 08:21:51PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Here's the latest version of my cdclk state work. I tried to accomodate most of the review feedback, although there were some comments which I think are better left for a followup work. Mainly about renaming some functions and whatnot to make more sense, and probably adjusting how we do the state swap.
On that last point, I left that 'hw' state under
dev_priv->cdclk. I think we should be able to get rid of that if we pass the old cdclk state down to the code that actually programs the cdlck (since that code wants to compare the new and current states to see which parts of the programming are needed).Another thing I realized recently is that we have no protection against gmbus or aux vs. cdclk reprogramming. On some platforms/ports gmbus and/or aux is clock by cdclk, so I think we need to add some protection. Fortunately both gmbus and aux have their own low level mutexes so I think we should be able to just grab those around the reprogramming part. Although for this we might have to keep the 'hw' cdclk state as we'd need to make sure the gmbus/aux code programs the dividers based on the actual hardware state.
So, there's still some work left, but I think we should be able to move this forward and hopefully unblock some *future* stuff.
Entire series available here:
git://github.com/vsyrjala/linux.gitcdclk_state_4Ville Syrjälä (14):
drm/i915: Store the pipe pixel rate in the crtc state drm/i915: Nukeintel_mode_max_pixclk()
drm/i915: s/get_display_clock_speed/get_cdclk/
drm/i915: Clean up the .get_cdclk() assignment if ladder drm/i915: Move most cdclk/rawclk related code tointel_cdclk.cdrm/i915: Pass computed vco tobxt_set_cdclk()
drm/i915: Start moving the cdclk stuff into a distinct state structure drm/i915: Track full cdclk state for the logical and actual cdclk
Quoted 8 lines
frequencies
drm/i915: Passdev_privto remainder of the cdclk functions drm/i915: Pass the cdclk state to theset_cdclk()functions drm/i915: Move PFI credit reprogramming into vlv/chv_set_cdclk() drm/i915: Nuke the VLV/CHV PFI programming power domain workaround drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct
.set_cdclk() hook
drm/i915: Moveilk_pipe_pixel_rate()tointel_display.c
Entire pile pushed to dinq. Thanks for the reviews.
Quoted 19 lines
Documentation/gpu/i915.rst | 9 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 37 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_cdclk.c | 1867 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 1831 ++---------------------------- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 43 +- drivers/gpu/drm/i915/intel_fbc.c | 5 +- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 51 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 6 +- 13 files changed, 2042 insertions(+), 1820 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_cdclk.cSignature · 1 line
2.10.2
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx