Shared DPLL kernel doc and improvements
Subsystems (4)
v2 cover Shared DPLL kernel doc and improvements
Hi,
This is a long overdue update series with Daniel's comments addressed. Only the last patch is missing and R-b since it is new in this version.
Thanks,
Ander
Ander Conselvan de Oliveira (7):
drm/i915: Introduce intel_release_shared_dpll()
drm/i915: Rename intel_shared_dpll_commit() to _swap_state() drm/i915: Rename intel_shared_dpll_config to intel_shared_dpll_state drm/i915: Rename intel_shared_dpll->mode_set() to prepare() drm/i915: Update kerneldoc for intel_dpll_mgr.c
drm/i915: Add dpll entrypoint for dumping hw state drm/i915: Move intel_atomic_get_shared_dpll_state() to
intel_dpll_mgr.c
Documentation/gpu/i915.rst | 12 ++ drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/intel_atomic.c | 31 ---- drivers/gpu/drm/i915/intel_ddi.c | 10 +- drivers/gpu/drm/i915/intel_display.c | 64 ++----- drivers/gpu/drm/i915/intel_dpll_mgr.c | 319 +++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_dpll_mgr.h | 176 ++++++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 4 +- 8 files changed, 442 insertions(+), 186 deletions(-)
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/7 drm/i915: Introduce intel_release_shared_dpll()
While the details of getting a shared dpll are wrapped by intel_get_shared_dpll(), the release was still hand rolled into the modeset code. Fix that by creating an entry point for releasing the pll and move that code there.
v2: Take old_dpll from crtc->state instead of crtc_state. (CI)
--- drivers/gpu/drm/i915/intel_display.c | 6 +---- drivers/gpu/drm/i915/intel_dpll_mgr.c | 41 +++++++++++++++-------------------- drivers/gpu/drm/i915/intel_dpll_mgr.h | 11 +++------- 3 files changed, 22 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -5
@@ -13874,7 +13874,6 @@ static void intel_modeset_clear_plls(struct drm_atomic_state *state) {struct drm_device *dev = state->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_shared_dpll_config *shared_dpll =NULL ;struct drm_crtc *crtc;struct drm_crtc_state *crtc_state;int i;
@@ -13895,10 +13894,7 @@ static void intel_modeset_clear_plls(struct drm_atomic_state *state)if (!old_dpll)continue ; -if (!shared_dpll) - shared_dpll =intel_atomic_get_shared_dpll_state (state); - -intel_shared_dpll_config_put (shared_dpll, old_dpll, intel_crtc); +intel_release_shared_dpll (old_dpll, intel_crtc, state); } }
drivers/gpu/drm/i915/intel_dpll_mgr.c +18 -23
56 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpll_mgr.h +3 -8
@@ -138,14 +138,6 @@ intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,enum intel_dpll_id intel_get_shared_dpll_id (struct drm_i915_private *dev_priv,struct intel_shared_dpll *pll); -void -intel_shared_dpll_config_get (struct intel_shared_dpll_config *config, -struct intel_shared_dpll *pll, -struct intel_crtc *crtc); -void -intel_shared_dpll_config_put (struct intel_shared_dpll_config *config, -struct intel_shared_dpll *pll, -struct intel_crtc *crtc);void assert_shared_dpll (struct drm_i915_private *dev_priv,struct intel_shared_dpll *pll,bool state);
@@ -154,6 +146,9 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,struct intel_shared_dpll *intel_get_shared_dpll (struct intel_crtc *crtc,struct intel_crtc_state *state,struct intel_encoder *encoder); +void intel_release_shared_dpll (struct intel_shared_dpll *dpll, +struct intel_crtc *crtc, +struct drm_atomic_state *state);void intel_prepare_shared_dpll (struct intel_crtc *crtc);void intel_enable_shared_dpll (struct intel_crtc *crtc);void intel_disable_shared_dpll (struct intel_crtc *crtc);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/7 drm/i915: Rename intel_shared_dpll_commit() to _swap_state()
In reply to Ander Conselvan de OliveiraThe function intel_shared_dpll_commit() performs the equivalent of drm_atomic_helper_swap_state() for the shared dpll state, which is not handled by the helpers. So make it do a full swap of the state and rename it for consistency.
v2: Fix typo in the commit message. (Durga)
v3: Rebase.
v4: Swap the states instead of just renaming the function. (Daniel)
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 7 ++++++- drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -14660,7 +14660,7 @@ static int intel_atomic_commit(struct drm_device *dev,drm_atomic_helper_swap_state (state, true); dev_priv->wm.distrust_bios_wm = false; -intel_shared_dpll_commit (state); +intel_shared_dpll_swap_state (state);intel_atomic_track_fbs (state);if (intel_state->modeset) {
drivers/gpu/drm/i915/intel_dpll_mgr.c +6 -1
@@ -265,7 +265,7 @@ intel_reference_shared_dpll(struct intel_shared_dpll *pll, shared_dpll[pll->id].crtc_mask |=1 << crtc->pipe; } -void intel_shared_dpll_commit (struct drm_atomic_state *state) +void intel_shared_dpll_swap_state (struct drm_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->dev);struct intel_shared_dpll_config *shared_dpll;
@@ -277,8 +277,13 @@ void intel_shared_dpll_commit(struct drm_atomic_state *state) shared_dpll =to_intel_atomic_state (state)->shared_dpll;for (i =0 ; i < dev_priv->num_shared_dpll; i++) { +struct intel_shared_dpll_config tmp; + pll = &dev_priv->shared_dplls[i]; + + tmp = pll->config; pll->config = shared_dpll[i]; + shared_dpll[i] = tmp; } }
drivers/gpu/drm/i915/intel_dpll_mgr.h +1 -1
@@ -152,7 +152,7 @@ void intel_release_shared_dpll(struct intel_shared_dpll *dpll,void intel_prepare_shared_dpll (struct intel_crtc *crtc);void intel_enable_shared_dpll (struct intel_crtc *crtc);void intel_disable_shared_dpll (struct intel_crtc *crtc); -void intel_shared_dpll_commit (struct drm_atomic_state *state); +void intel_shared_dpll_swap_state (struct drm_atomic_state *state);void intel_shared_dpll_init (struct drm_device *dev);/* BXT dpll related functions */
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/7 drm/i915: Rename intel_shared_dpll_config to intel_shared_dpll_state
In reply to Ander Conselvan de OliveiraStruct intel_shared_dpll_config is used to hold the state of the DPLL in the "atomic" sense, so call it state like everything else atomic.
v2: Rebase
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +++--- drivers/gpu/drm/i915/intel_atomic.c | 6 +-- drivers/gpu/drm/i915/intel_ddi.c | 10 ++--- drivers/gpu/drm/i915/intel_display.c | 22 +++++------ drivers/gpu/drm/i915/intel_dpll_mgr.c | 72 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_dpll_mgr.h | 4 +- drivers/gpu/drm/i915/intel_drv.h | 4 +- 7 files changed, 65 insertions(+), 65 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -3352,14 +3352,14 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)seq_printf (m,"DPLL%i: %s, id: %i\n" , i, pll->name, pll->id);seq_printf (m," crtc_mask: 0x%08x, active: 0x%x, on: %s\n" , - pll->config.crtc_mask, pll->active_mask,yesno (pll->on)); + pll->state.crtc_mask, pll->active_mask,yesno (pll->on));seq_printf (m," tracked hardware state:\n" ); -seq_printf (m," dpll: 0x%08x\n" , pll->config.hw_state.dpll); +seq_printf (m," dpll: 0x%08x\n" , pll->state.hw_state.dpll);seq_printf (m," dpll_md: 0x%08x\n" , - pll->config.hw_state.dpll_md); -seq_printf (m," fp0: 0x%08x\n" , pll->config.hw_state.fp0); -seq_printf (m," fp1: 0x%08x\n" , pll->config.hw_state.fp1); -seq_printf (m," wrpll: 0x%08x\n" , pll->config.hw_state.wrpll); + pll->state.hw_state.dpll_md); +seq_printf (m," fp0: 0x%08x\n" , pll->state.hw_state.fp0); +seq_printf (m," fp1: 0x%08x\n" , pll->state.hw_state.fp1); +seq_printf (m," wrpll: 0x%08x\n" , pll->state.hw_state.wrpll); }drm_modeset_unlock_all (dev);
drivers/gpu/drm/i915/intel_atomic.c +3 -3
@@ -267,7 +267,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev,static void intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, -struct intel_shared_dpll_config *shared_dpll) +struct intel_shared_dpll_state *shared_dpll) {enum intel_dpll_id i;
@@ -275,11 +275,11 @@ intel_atomic_duplicate_dpll_state(struct drm_i915_private *dev_priv,for (i =0 ; i < dev_priv->num_shared_dpll; i++) {struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; - shared_dpll[i] = pll->config; + shared_dpll[i] = pll->state; } } -struct intel_shared_dpll_config * +struct intel_shared_dpll_state *intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s) {struct intel_atomic_state *state =to_intel_atomic_state (s);
drivers/gpu/drm/i915/intel_ddi.c +5 -5
@@ -1057,7 +1057,7 @@ static int bxt_calc_pll_link(struct drm_i915_private *dev_priv,return 0 ; pll = &dev_priv->shared_dplls[dpll]; - state = &pll->config.hw_state; + state = &pll->state.hw_state; clock.m1 =2 ; clock.m2 = (state->pll0 &PORT_PLL_M2_MASK ) <<22 ;
@@ -2134,7 +2134,7 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock)struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct intel_shared_dpll *pll =NULL ; -struct intel_shared_dpll_config tmp_pll_config; +struct intel_shared_dpll_state tmp_pll_state;enum intel_dpll_id dpll_id;if (IS_GEN9_LP (dev_priv)) {
@@ -2150,11 +2150,11 @@ intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock) pll->active_mask);return NULL ; } - tmp_pll_config = pll->config; + tmp_pll_state = pll->state;if (!bxt_ddi_dp_set_dpll_hw_state (clock, - &pll->config.hw_state)) { + &pll->state.hw_state)) {DRM_ERROR ("Could not setup DPLL\n" ); - pll->config = tmp_pll_config; + pll->state = tmp_pll_state;return NULL ; } }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) {
drivers/gpu/drm/i915/intel_display.c +11 -11
@@ -13743,9 +13743,9 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv, }if (!crtc) { -I915_STATE_WARN (pll->active_mask & ~pll->config.crtc_mask, +I915_STATE_WARN (pll->active_mask & ~pll->state.crtc_mask,"more active pll users than references: %x vs %x\n" , - pll->active_mask, pll->config.crtc_mask); + pll->active_mask, pll->state.crtc_mask);return ; }
@@ -13761,11 +13761,11 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv,"pll active mismatch (didn't expect pipe %c in active mask 0x%02x)\n" , pipe_name(drm_crtc_index(crtc)), pll->active_mask); -I915_STATE_WARN (!(pll->config.crtc_mask & crtc_mask), +I915_STATE_WARN (!(pll->state.crtc_mask & crtc_mask),"pll enabled crtcs mismatch (expected 0x%x in 0x%02x)\n" , - crtc_mask, pll->config.crtc_mask); + crtc_mask, pll->state.crtc_mask); -I915_STATE_WARN (pll->on &&memcmp (&pll->config.hw_state, +I915_STATE_WARN (pll->on &&memcmp (&pll->state.hw_state, &dpll_hw_state,sizeof (dpll_hw_state)),"pll hw state mismatch\n" );
@@ -13791,7 +13791,7 @@ verify_shared_dpll_state(struct drm_device *dev, struct drm_crtc *crtc,I915_STATE_WARN (pll->active_mask & crtc_mask,"pll active mismatch (didn't expect pipe %c in active mask)\n" ,pipe_name (drm_crtc_index (crtc))); -I915_STATE_WARN (pll->config.crtc_mask & crtc_mask, +I915_STATE_WARN (pll->state.crtc_mask & crtc_mask,"pll enabled crtcs mismatch (found %x in enabled mask)\n" ,pipe_name (drm_crtc_index (crtc))); }
@@ -17054,16 +17054,16 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; pll->on = pll->funcs.get_hw_state (dev_priv, pll, - &pll->config.hw_state); - pll->config.crtc_mask =0 ; + &pll->state.hw_state); + pll->state.crtc_mask =0 ;for_each_intel_crtc (dev, crtc) {if (crtc->active && crtc->config->shared_dpll == pll) - pll->config.crtc_mask |=1 << crtc->pipe; + pll->state.crtc_mask |=1 << crtc->pipe; } - pll->active_mask = pll->config.crtc_mask; + pll->active_mask = pll->state.crtc_mask;DRM_DEBUG_KMS ("%s hw state readout: crtc_mask 0x%08x, on %i\n" , - pll->name, pll->config.crtc_mask, pll->on); + pll->name, pll->state.crtc_mask, pll->on); }for_each_intel_encoder (dev, encoder) {
drivers/gpu/drm/i915/intel_dpll_mgr.c +36 -36
230 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpll_mgr.h +2 -2
@@ -93,7 +93,7 @@ struct intel_dpll_hw_state { pcsdw12; }; -struct intel_shared_dpll_config { +struct intel_shared_dpll_state {unsigned crtc_mask;/* mask of CRTCs sharing this PLL */ struct intel_dpll_hw_state hw_state; };
@@ -113,7 +113,7 @@ struct intel_shared_dpll_funcs { };struct intel_shared_dpll { -struct intel_shared_dpll_config config; +struct intel_shared_dpll_state state;unsigned active_mask;/* mask of active CRTCs (i.e. DPMS on) */ bool on;/* is the PLL actually active? Disabled during modeset */
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -359,7 +359,7 @@ struct intel_atomic_state {/* SKL/KBL Only */ unsigned int cdclk_pll_vco; -struct intel_shared_dpll_config shared_dpll[I915_NUM_PLLS ]; +struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];/* * Current watermarks can't be trusted during hardware readout, so
@@ -1815,7 +1815,7 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *); -struct intel_shared_dpll_config * +struct intel_shared_dpll_state *intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s); static inline struct intel_crtc_state *
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 drm/i915: Rename intel_shared_dpll->mode_set() to prepare()
In reply to Ander Conselvan de OliveiraThe hook is called from intel_prepare_shared_dpll(). The name doesn't make sense after all the changes to modeset code. So just call it prepare.
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 8 ++++---- drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +4 -4
@@ -112,7 +112,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc)WARN_ON (pll->on);assert_shared_dpll_disabled (dev_priv, pll); - pll->funcs.mode_set (dev_priv, pll); + pll->funcs.prepare (dev_priv, pll); }mutex_unlock (&dev_priv->dpll_lock); }
@@ -306,8 +306,8 @@ static bool ibx_pch_dpll_get_hw_state(struct drm_i915_private *dev_priv,return val &DPLL_VCO_ENABLE ; } -static void ibx_pch_dpll_mode_set (struct drm_i915_private *dev_priv, -struct intel_shared_dpll *pll) +static void ibx_pch_dpll_prepare (struct drm_i915_private *dev_priv, +struct intel_shared_dpll *pll) {I915_WRITE (PCH_FP0 (pll->id), pll->state.hw_state.fp0);I915_WRITE (PCH_FP1 (pll->id), pll->state.hw_state.fp1);
@@ -396,7 +396,7 @@ ibx_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, }static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = { - .mode_set = ibx_pch_dpll_mode_set, + .prepare = ibx_pch_dpll_prepare, .enable = ibx_pch_dpll_enable, .disable = ibx_pch_dpll_disable, .get_hw_state = ibx_pch_dpll_get_hw_state,
drivers/gpu/drm/i915/intel_dpll_mgr.h +1 -1
@@ -101,7 +101,7 @@ struct intel_shared_dpll_state {struct intel_shared_dpll_funcs {/* The mode_set hook is optional and should be used together with the * intel_prepare_shared_dpll function. */ -void (*mode_set)(struct drm_i915_private *dev_priv, +void (*prepare)(struct drm_i915_private *dev_priv,struct intel_shared_dpll *pll);void (*enable)(struct drm_i915_private *dev_priv,struct intel_shared_dpll *pll);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/7 drm/i915: Update kerneldoc for intel_dpll_mgr.c
In reply to Ander Conselvan de OliveiraThe documentation for most of the non-static members and structs were missing. Fix that.
v2: Fix typos (Durga)
v3: Rebase.
Fix make docs warnings.
Document more.
v4: capitilize CRTC; say that the prepare hook is a nop if the DPLL is
already enabled; link to struct intel_dpll_hw_state from @hw_state field in struct intel_shared_dpll_state; reorganize DPLL flags; link intel_shared_dpll_state to other structs and functions. (Daniel)
--- Documentation/gpu/i915.rst | 12 +++ drivers/gpu/drm/i915/intel_dpll_mgr.c | 91 ++++++++++++++++++-- drivers/gpu/drm/i915/intel_dpll_mgr.h | 154 ++++++++++++++++++++++++++++++---- 3 files changed, 237 insertions(+), 20 deletions(-)
Documentation/gpu/i915.rst +12 -0
@@ -213,6 +213,18 @@ Video BIOS Table (VBT) .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h :internal: +Display PLLs +------------ + +.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.c + :doc: Display PLLs + +.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.c + :internal: + +.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h + :internal: + Memory Management and Command Submission ========================================
drivers/gpu/drm/i915/intel_dpll_mgr.c +86 -5
152 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpll_mgr.h +139 -15
207 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 drm/i915: Add dpll entrypoint for dumping hw state
In reply to Ander Conselvan de OliveiraRemove the IS_PLATFORM() macros from intel_dump_pipe_config() and split that logic in platform specific implementations inside the dpll code, accessed through a platform independent interface.
v2: Rebase.
--- drivers/gpu/drm/i915/intel_display.c | 34 +-------------- drivers/gpu/drm/i915/intel_dpll_mgr.c | 79 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dpll_mgr.h | 3 ++ 3 files changed, 83 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -33
@@ -12826,39 +12826,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,DRM_DEBUG_KMS ("ips: %i, double wide: %i\n" , pipe_config->ips_enabled, pipe_config->double_wide); -if (IS_GEN9_LP (dev_priv)) { -DRM_DEBUG_KMS ("dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x," -"pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, " -"pll6: 0x%x, pll8: 0x%x, pll9: 0x%x, pll10: 0x%x, pcsdw12: 0x%x\n" , - pipe_config->dpll_hw_state.ebb0, - pipe_config->dpll_hw_state.ebb4, - pipe_config->dpll_hw_state.pll0, - pipe_config->dpll_hw_state.pll1, - pipe_config->dpll_hw_state.pll2, - pipe_config->dpll_hw_state.pll3, - pipe_config->dpll_hw_state.pll6, - pipe_config->dpll_hw_state.pll8, - pipe_config->dpll_hw_state.pll9, - pipe_config->dpll_hw_state.pll10, - pipe_config->dpll_hw_state.pcsdw12); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { -DRM_DEBUG_KMS ("dpll_hw_state: " -"ctrl1: 0x%x, cfgcr1: 0x%x, cfgcr2: 0x%x\n" , - pipe_config->dpll_hw_state.ctrl1, - pipe_config->dpll_hw_state.cfgcr1, - pipe_config->dpll_hw_state.cfgcr2); - }else if (HAS_DDI (dev_priv)) { -DRM_DEBUG_KMS ("dpll_hw_state: wrpll: 0x%x spll: 0x%x\n" , - pipe_config->dpll_hw_state.wrpll, - pipe_config->dpll_hw_state.spll); - }else { -DRM_DEBUG_KMS ("dpll_hw_state: dpll: 0x%x, dpll_md: 0x%x, " -"fp0: 0x%x, fp1: 0x%x\n" , - pipe_config->dpll_hw_state.dpll, - pipe_config->dpll_hw_state.dpll_md, - pipe_config->dpll_hw_state.fp0, - pipe_config->dpll_hw_state.fp1); - } +intel_dpll_dump_hw_state (dev_priv, &pipe_config->dpll_hw_state);DRM_DEBUG_KMS ("planes on this crtc\n" );list_for_each_entry (plane, &dev->mode_config.plane_list, head) {
drivers/gpu/drm/i915/intel_dpll_mgr.c +79 -0
136 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpll_mgr.h +3 -0
@@ -279,6 +279,9 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc);void intel_shared_dpll_swap_state (struct drm_atomic_state *state);void intel_shared_dpll_init (struct drm_device *dev); +void intel_dpll_dump_hw_state (struct drm_i915_private *dev_priv, +struct intel_dpll_hw_state *hw_state); +/* BXT dpll related functions */ bool bxt_ddi_dp_set_dpll_hw_state (int clock,struct intel_dpll_hw_state *dpll_hw_state);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 drm/i915: Move intel_atomic_get_shared_dpll_state() to intel_dpll_mgr.c
In reply to Ander Conselvan de OliveiraThe function intel_atomic_get_shared_dpll_state() is only called from intel_dpll_mgr.c and it concerns the same data structures as the other functions in that file, so move it there and make it static.
--- drivers/gpu/drm/i915/intel_atomic.c | 31 ------------------------------- drivers/gpu/drm/i915/intel_dpll_mgr.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 -- 3 files changed, 31 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_atomic.c +0 -31
@@ -265,37 +265,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev,return 0 ; } -static void -intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, -struct intel_shared_dpll_state *shared_dpll) -{ -enum intel_dpll_id i; - -/* Copy shared dpll state */ -for (i =0 ; i < dev_priv->num_shared_dpll; i++) { -struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; - - shared_dpll[i] = pll->state; - } -} - -struct intel_shared_dpll_state * -intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s) -{ -struct intel_atomic_state *state =to_intel_atomic_state (s); - -WARN_ON (!drm_modeset_is_locked (&s->dev->mode_config.connection_mutex)); - -if (!state->dpll_set) { - state->dpll_set = true; - -intel_atomic_duplicate_dpll_state (to_i915 (s->dev), - state->shared_dpll); - } - -return state->shared_dpll; -} -struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev) {
drivers/gpu/drm/i915/intel_dpll_mgr.c +31 -0
@@ -80,6 +80,37 @@ skl_find_link_pll(struct drm_i915_private *dev_priv, int clock)return pll; } +static void +intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, +struct intel_shared_dpll_state *shared_dpll) +{ +enum intel_dpll_id i; + +/* Copy shared dpll state */ +for (i =0 ; i < dev_priv->num_shared_dpll; i++) { +struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; + + shared_dpll[i] = pll->state; + } +} + +static struct intel_shared_dpll_state * +intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s) +{ +struct intel_atomic_state *state =to_intel_atomic_state (s); + +WARN_ON (!drm_modeset_is_locked (&s->dev->mode_config.connection_mutex)); + +if (!state->dpll_set) { + state->dpll_set = true; + +intel_atomic_duplicate_dpll_state (to_i915 (s->dev), + state->shared_dpll); + } + +return state->shared_dpll; +} +/** * intel_get_shared_dpll_by_id - get a DPLL given its id * @dev_priv: i915 device instance
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -1815,8 +1815,6 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *); -struct intel_shared_dpll_state * -intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s);static inline struct intel_crtc_state * intel_atomic_get_crtc_state(struct drm_atomic_state *state,
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/7] drm/i915: Move intel_atomic_get_shared_dpll_state() to intel_dpll_mgr.c
Quoted 6 lines · Ander Conselvan de Oliveira
The function
intel_atomic_get_shared_dpll_state()is only called fromintel_dpll_mgr.cand it concerns the same data structures as the other functions in that file, so move it there and make it static.Signed-off-by Ander Conselvan de Oliveira <[email protected]>Suggested-by Daniel Vetter <[email protected]>
Always love some doc work, thanks for respinning this series.
Quoted 106 lines
--- drivers/gpu/drm/i915/intel_atomic.c | 31 ------------------------------- drivers/gpu/drm/i915/intel_dpll_mgr.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 -- 3 files changed, 31 insertions(+), 33 deletions(-)drivers/gpu/drm/i915/intel_atomic.c +0
-31@@ -265,37 +265,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev,return 0 ; } -static void -intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, -struct intel_shared_dpll_state *shared_dpll) -{ -enum intel_dpll_id i; - -/* Copy shared dpll state */ -for (i =0 ; i < dev_priv->num_shared_dpll; i++) { -struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; - - shared_dpll[i] = pll->state; - } -} - -struct intel_shared_dpll_state * -intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s) -{ -struct intel_atomic_state *state =to_intel_atomic_state (s); - -WARN_ON (!drm_modeset_is_locked (&s->dev->mode_config.connection_mutex)); - -if (!state->dpll_set) { - state->dpll_set = true; - -intel_atomic_duplicate_dpll_state (to_i915 (s->dev), - state->shared_dpll); - } - -return state->shared_dpll; -} -struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev) {drivers/gpu/drm/i915/intel_dpll_mgr.c +31
-0@@ -80,6 +80,37 @@ skl_find_link_pll(struct drm_i915_private *dev_priv, int clock)return pll; } +static void +intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, +struct intel_shared_dpll_state *shared_dpll) +{ +enum intel_dpll_id i; + +/* Copy shared dpll state */ +for (i =0 ; i < dev_priv->num_shared_dpll; i++) { +struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; + + shared_dpll[i] = pll->state; + } +} + +static struct intel_shared_dpll_state * +intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s) +{ +struct intel_atomic_state *state =to_intel_atomic_state (s); + +WARN_ON (!drm_modeset_is_locked (&s->dev->mode_config.connection_mutex)); + +if (!state->dpll_set) { + state->dpll_set = true; + +intel_atomic_duplicate_dpll_state (to_i915 (s->dev), + state->shared_dpll); + } + +return state->shared_dpll; +} +/** * intel_get_shared_dpll_by_id - get a DPLL given its id * @dev_priv: i915 device instance drivers/gpu/drm/i915/intel_drv.h +0
-2@@ -1815,8 +1815,6 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *); -struct intel_shared_dpll_state * -intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s);static inline struct intel_crtc_state * intel_atomic_get_crtc_state(struct drm_atomic_state *state,Signature · 1 line
2.5.5
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/7] drm/i915: Move intel_atomic_get_shared_dpll_state() to intel_dpll_mgr.c
Quoted 6 lines · Daniel Vetter
Quoted 5 lines · Ander Conselvan de Oliveira
The function
intel_atomic_get_shared_dpll_state()is only called fromintel_dpll_mgr.cand it concerns the same data structures as the other functions in that file, so move it there and make it static.
Quoted 6 lines
Quoted 3 lines
l.com>
Suggested-by Daniel Vetter <[email protected]>Always love some doc work, thanks for respinning this series.
Reviewed-by Daniel Vetter <[email protected]>
Pushed. Thanks for the reviews.
Ander
Quoted 108 lines
Quoted 108 lines
---
drivers/gpu/drm/i915/intel_atomic.c | 31 -------------------------------drivers/gpu/drm/i915/intel_dpll_mgr.c| 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 --3 files changed, 31 insertions(+), 33 deletions(-)drivers/gpu/drm/i915/intel_atomic.c +0
-0@@ -265,37 +265,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev, return 0; }drivers/gpu/drm/i915/intel_atomic.c +0
-3-static void -intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, - struct intel_shared_dpll_state
*shared_dpll)drivers/gpu/drm/i915/intel_atomic.c +0
-17-{ -enum intel_dpll_id i; - -/* Copy shared dpll state */ -for (i =0 ; i < dev_priv->num_shared_dpll; i++) { -struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; - - shared_dpll[i] = pll->state; - } -} - -struct intel_shared_dpll_state * -intel_atomic_get_shared_dpll_state(struct drm_atomic_state *s) -{ - struct intel_atomic_state *state = to_intel_atomic_state(s); - - WARN_ON(!drm_modeset_is_locked(&s->dev-Quoted 1 line
mode_config.connection_mutex));
drivers/gpu/drm/i915/intel_atomic.c +0
-11- -if (!state->dpll_set) { - state->dpll_set = true; - -intel_atomic_duplicate_dpll_state (to_i915 (s->dev), - state->shared_dpll); - } - -return state->shared_dpll; -} -struct
drm_atomic_state*
intel_atomic_state_alloc(structdrm_device*dev)
{drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0@@ -80,6 +80,37 @@ skl_find_link_pll(struct drm_i915_private *dev_priv, int clock) return pll; }drivers/gpu/drm/i915/intel_dpll_mgr.c +3
-0+static void +intel_atomic_duplicate_dpll_state (struct drm_i915_private *dev_priv, + struct intel_shared_dpll_state
*shared_dpll)drivers/gpu/drm/i915/intel_dpll_mgr.c +17
-0+{ +enum intel_dpll_id i; + +/* Copy shared dpll state */ +for (i =0 ; i < dev_priv->num_shared_dpll; i++) { +struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; + + shared_dpll[i] = pll->state; + } +} + +static struct intel_shared_dpll_state * +intel_atomic_get_shared_dpll_state(struct drm_atomic_state *s) +{ + struct intel_atomic_state *state = to_intel_atomic_state(s); + + WARN_ON(!drm_modeset_is_locked(&s->dev-Quoted 1 line
mode_config.connection_mutex));
drivers/gpu/drm/i915/intel_dpll_mgr.c +11
-0+ +if (!state->dpll_set) { + state->dpll_set = true; + +intel_atomic_duplicate_dpll_state (to_i915 (s->dev), + state->shared_dpll); + } + +return state->shared_dpll; +} +/**
*intel_get_shared_dpll_by_id- get a DPLL given its id
* @dev_priv: i915 device instancedrivers/gpu/drm/i915/intel_drv.h +0
-0@@ -1815,8 +1815,6 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state); struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev); void intel_atomic_state_clear(struct drm_atomic_state *);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +0
-2-struct intel_shared_dpll_state * -intel_atomic_get_shared_dpll_state (struct drm_atomic_state *s);
static inline structintel_crtc_state* intel_atomic_get_crtc_state(structdrm_atomic_state*state, --
2.5.5
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Shared DPLL kernel doc and improvements (rev2)
In reply to Ander Conselvan de Oliveira== Series Details ==
== Series Details ==
Series: Shared DPLL kernel doc and improvements (rev2)
URL : https://patchwork.freedesktop.org/series/13277/
State : success
== Summary ==
Series 13277v2 Shared DPLL kernel doc and improvements
https://patchwork.freedesktop.org/api/1.0/series/13277/revisions/2/mbox/
Test pm_rpm:
Subgroup basic-pci-d3-state:
incomplete -> PASS (fi-byt-n2820)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:82 pass:69 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:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
584adc8f6687d7f6832ce060c3f6022282119f18 drm-tip: 2016y-12m-28d-13h-55m-14s UTC integration manifest c905e30 drm/i915: Move intel_atomic_get_shared_dpll_state() to intel_dpll_mgr.c 8ee6bea drm/i915: Add dpll entrypoint for dumping hw state
f3b72bb drm/i915: Update kerneldoc for intel_dpll_mgr.c
729333c drm/i915: Rename intel_shared_dpll->mode_set() to prepare()
f06cf12 drm/i915: Rename intel_shared_dpll_config to intel_shared_dpll_state
be94191 drm/i915: Rename intel_shared_dpll_commit() to _swap_state()
dafe87c drm/i915: Introduce intel_release_shared_dpll()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3403/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for Shared DPLL kernel doc and improvements (rev2)
Quoted 5 lines · Patchwork
== Series Details ==
Series: Shared DPLL kernel doc and improvements (rev2) URL : https://patchwork.freedesktop.org/series/13277/
State : success
Patches 1-6 pushed.
Thanks
Ander
Quoted 38 lines
== Summary ==
Series 13277v2 Shared DPLL kernel doc and improvements
https://patchwork.freedesktop.org/api/1.0/series/13277/revisions/2/mbox/Test
pm_rpm:
Subgroup basic-pci-d3-state:
incomplete -> PASS (fi-byt-n2820)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:82 pass:69 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:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
584adc8f6687d7f6832ce060c3f6022282119f18drm-tip: 2016y-12m-28d-13h-55m-14s UTC integration manifest
c905e30 drm/i915: Moveintel_atomic_get_shared_dpll_state()tointel_dpll_mgr.c
8ee6bea drm/i915: Add dpll entrypoint for dumping hw state f3b72bb drm/i915: Update kerneldoc forintel_dpll_mgr.c
729333c drm/i915: Renameintel_shared_dpll->mode_set()toprepare()f06cf12 drm/i915: Renameintel_shared_dpll_configtointel_shared_dpll_statebe94191 drm/i915: Renameintel_shared_dpll_commit()to_swap_state()dafe87c drm/i915: Introduceintel_release_shared_dpll()
Quoted 7 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3403/
_______________________________________________
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