| Message ID | 20200326181005.11775-5-stanislav.lisovskiy@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | SAGV support for Gen12+ | expand |
On Thu, Mar 26, 2020 at 08:09:59PM +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. > v4: - Change function naming back to intel_atomic* pattern, > was decided to rename in a separate patch series. > > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bw.c | 29 ++++++++++++++++++++++++- > drivers/gpu/drm/i915/display/intel_bw.h | 9 ++++++++ > 2 files changed, 37 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c > index 58b264bc318d..a8b2038db4d2 100644 > --- a/drivers/gpu/drm/i915/display/intel_bw.c > +++ b/drivers/gpu/drm/i915/display/intel_bw.c > @@ -374,7 +374,34 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, > return data_rate; > } > > -static struct intel_bw_state * > +struct intel_bw_state * > +intel_atomic_get_bw_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); These can't return an error. > + > + return to_intel_bw_state(bw_state); > +} > + > +struct intel_bw_state * > +intel_atomic_get_bw_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_atomic_get_bw_state(struct intel_atomic_state *state) > { > struct drm_i915_private *dev_priv = to_i915(state->base.dev); > diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h > index a8aa7624c5aa..fe6579c952f5 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_atomic_get_bw_old_state(struct intel_atomic_state *state); > + > +struct intel_bw_state * > +intel_atomic_get_bw_new_state(struct intel_atomic_state *state); > + > +struct intel_bw_state * > +intel_atomic_get_bw_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
On Thu, Apr 02, 2020 at 07:20:59PM +0300, Ville Syrjälä wrote: > On Thu, Mar 26, 2020 at 08:09:59PM +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. > > v4: - Change function naming back to intel_atomic* pattern, > > was decided to rename in a separate patch series. > > > > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_bw.c | 29 ++++++++++++++++++++++++- > > drivers/gpu/drm/i915/display/intel_bw.h | 9 ++++++++ > > 2 files changed, 37 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c > > index 58b264bc318d..a8b2038db4d2 100644 > > --- a/drivers/gpu/drm/i915/display/intel_bw.c > > +++ b/drivers/gpu/drm/i915/display/intel_bw.c > > @@ -374,7 +374,34 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, > > return data_rate; > > } > > > > -static struct intel_bw_state * > > +struct intel_bw_state * > > +intel_atomic_get_bw_old_state(struct intel_atomic_state *state) Also these names aren't consistent wrt. existing practices. Should be intel_atomic_get_{new,old}_bw_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); > > These can't return an error. > > > + > > + return to_intel_bw_state(bw_state); > > +} > > + > > +struct intel_bw_state * > > +intel_atomic_get_bw_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_atomic_get_bw_state(struct intel_atomic_state *state) > > { > > struct drm_i915_private *dev_priv = to_i915(state->base.dev); > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h > > index a8aa7624c5aa..fe6579c952f5 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_atomic_get_bw_old_state(struct intel_atomic_state *state); > > + > > +struct intel_bw_state * > > +intel_atomic_get_bw_new_state(struct intel_atomic_state *state); > > + > > +struct intel_bw_state * > > +intel_atomic_get_bw_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 > > -- > Ville Syrjälä > Intel
diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c index 58b264bc318d..a8b2038db4d2 100644 --- a/drivers/gpu/drm/i915/display/intel_bw.c +++ b/drivers/gpu/drm/i915/display/intel_bw.c @@ -374,7 +374,34 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, return data_rate; } -static struct intel_bw_state * +struct intel_bw_state * +intel_atomic_get_bw_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_atomic_get_bw_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_atomic_get_bw_state(struct intel_atomic_state *state) { struct drm_i915_private *dev_priv = to_i915(state->base.dev); diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h index a8aa7624c5aa..fe6579c952f5 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_atomic_get_bw_old_state(struct intel_atomic_state *state); + +struct intel_bw_state * +intel_atomic_get_bw_new_state(struct intel_atomic_state *state); + +struct intel_bw_state * +intel_atomic_get_bw_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. v4: - Change function naming back to intel_atomic* pattern, was decided to rename in a separate patch series. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/i915/display/intel_bw.c | 29 ++++++++++++++++++++++++- drivers/gpu/drm/i915/display/intel_bw.h | 9 ++++++++ 2 files changed, 37 insertions(+), 1 deletion(-)