| Message ID | 20200224153240.9047-4-stanislav.lisovskiy@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Refactor Gen11+ SAGV support | expand |
On Mon, Feb 24, 2020 at 05:32:35PM +0200, Stanislav Lisovskiy wrote: > Add correspondent helpers to be able to get old/new bandwidth > global state object. > > v2: - Fixed typo in function call > v3: - Changed new functions naming to use convention proposed > by Jani Nikula, i.e intel_bw_* in intel_bw.c file. And now they no longer match the naming pattern used by all the other simialr functions. > > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bw.c | 33 ++++++++++++++++++++++--- > drivers/gpu/drm/i915/display/intel_bw.h | 9 +++++++ > 2 files changed, 39 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c > index 58b264bc318d..bdad7476dc7b 100644 > --- a/drivers/gpu/drm/i915/display/intel_bw.c > +++ b/drivers/gpu/drm/i915/display/intel_bw.c > @@ -374,8 +374,35 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, > return data_rate; > } > > -static struct intel_bw_state * > -intel_atomic_get_bw_state(struct intel_atomic_state *state) > +struct intel_bw_state * > +intel_bw_get_old_state(struct intel_atomic_state *state) > +{ > + struct drm_i915_private *dev_priv = to_i915(state->base.dev); > + struct intel_global_state *bw_state; > + > + bw_state = intel_atomic_get_old_global_obj_state(state, &dev_priv->bw_obj); > + if (IS_ERR(bw_state)) > + return ERR_CAST(bw_state); > + > + return to_intel_bw_state(bw_state); > +} > + > +struct intel_bw_state * > +intel_bw_get_new_state(struct intel_atomic_state *state) > +{ > + struct drm_i915_private *dev_priv = to_i915(state->base.dev); > + struct intel_global_state *bw_state; > + > + bw_state = intel_atomic_get_new_global_obj_state(state, &dev_priv->bw_obj); > + > + if (IS_ERR(bw_state)) > + return ERR_CAST(bw_state); > + > + return to_intel_bw_state(bw_state); > +} > + > +struct intel_bw_state * > +intel_bw_get_state(struct intel_atomic_state *state) > { > struct drm_i915_private *dev_priv = to_i915(state->base.dev); > struct intel_global_state *bw_state; > @@ -420,7 +447,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) > old_active_planes == new_active_planes) > continue; > > - bw_state = intel_atomic_get_bw_state(state); > + bw_state = intel_bw_get_state(state); > if (IS_ERR(bw_state)) > return PTR_ERR(bw_state); > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h > index a8aa7624c5aa..b5f61463922f 100644 > --- a/drivers/gpu/drm/i915/display/intel_bw.h > +++ b/drivers/gpu/drm/i915/display/intel_bw.h > @@ -24,6 +24,15 @@ struct intel_bw_state { > > #define to_intel_bw_state(x) container_of((x), struct intel_bw_state, base) > > +struct intel_bw_state * > +intel_bw_get_old_state(struct intel_atomic_state *state); > + > +struct intel_bw_state * > +intel_bw_get_new_state(struct intel_atomic_state *state); > + > +struct intel_bw_state * > +intel_bw_get_state(struct intel_atomic_state *state); > + > void intel_bw_init_hw(struct drm_i915_private *dev_priv); > int intel_bw_init(struct drm_i915_private *dev_priv); > int intel_bw_atomic_check(struct intel_atomic_state *state); > -- > 2.24.1.485.gad05a3d8e5
diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c index 58b264bc318d..bdad7476dc7b 100644 --- a/drivers/gpu/drm/i915/display/intel_bw.c +++ b/drivers/gpu/drm/i915/display/intel_bw.c @@ -374,8 +374,35 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, return data_rate; } -static struct intel_bw_state * -intel_atomic_get_bw_state(struct intel_atomic_state *state) +struct intel_bw_state * +intel_bw_get_old_state(struct intel_atomic_state *state) +{ + struct drm_i915_private *dev_priv = to_i915(state->base.dev); + struct intel_global_state *bw_state; + + bw_state = intel_atomic_get_old_global_obj_state(state, &dev_priv->bw_obj); + if (IS_ERR(bw_state)) + return ERR_CAST(bw_state); + + return to_intel_bw_state(bw_state); +} + +struct intel_bw_state * +intel_bw_get_new_state(struct intel_atomic_state *state) +{ + struct drm_i915_private *dev_priv = to_i915(state->base.dev); + struct intel_global_state *bw_state; + + bw_state = intel_atomic_get_new_global_obj_state(state, &dev_priv->bw_obj); + + if (IS_ERR(bw_state)) + return ERR_CAST(bw_state); + + return to_intel_bw_state(bw_state); +} + +struct intel_bw_state * +intel_bw_get_state(struct intel_atomic_state *state) { struct drm_i915_private *dev_priv = to_i915(state->base.dev); struct intel_global_state *bw_state; @@ -420,7 +447,7 @@ int intel_bw_atomic_check(struct intel_atomic_state *state) old_active_planes == new_active_planes) continue; - bw_state = intel_atomic_get_bw_state(state); + bw_state = intel_bw_get_state(state); if (IS_ERR(bw_state)) return PTR_ERR(bw_state); diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h index a8aa7624c5aa..b5f61463922f 100644 --- a/drivers/gpu/drm/i915/display/intel_bw.h +++ b/drivers/gpu/drm/i915/display/intel_bw.h @@ -24,6 +24,15 @@ struct intel_bw_state { #define to_intel_bw_state(x) container_of((x), struct intel_bw_state, base) +struct intel_bw_state * +intel_bw_get_old_state(struct intel_atomic_state *state); + +struct intel_bw_state * +intel_bw_get_new_state(struct intel_atomic_state *state); + +struct intel_bw_state * +intel_bw_get_state(struct intel_atomic_state *state); + void intel_bw_init_hw(struct drm_i915_private *dev_priv); int intel_bw_init(struct drm_i915_private *dev_priv); int intel_bw_atomic_check(struct intel_atomic_state *state);
Add correspondent helpers to be able to get old/new bandwidth global state object. v2: - Fixed typo in function call v3: - Changed new functions naming to use convention proposed by Jani Nikula, i.e intel_bw_* in intel_bw.c file. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/i915/display/intel_bw.c | 33 ++++++++++++++++++++++--- drivers/gpu/drm/i915/display/intel_bw.h | 9 +++++++ 2 files changed, 39 insertions(+), 3 deletions(-)