On Mon, Jan 20, 2020 at 07:47:25PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <[email protected]> > > Now that we have the more formal global state thing let's > use if for memory bandwidth tracking. No real difference > to the current private object usage since we already > tried to avoid taking the single serializing lock needlessly. > But since we're going to roll the global state out to more > things probably a good idea to unify the approaches a bit. > > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_bw.c | 31 +++++++++----------- > drivers/gpu/drm/i915/display/intel_bw.h | 4 +-- > drivers/gpu/drm/i915/display/intel_display.c | 2 -- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > 4 files changed, 17 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c > b/drivers/gpu/drm/i915/display/intel_bw.c > index b228671d5a5d..316abcf3e6a2 100644 > --- a/drivers/gpu/drm/i915/display/intel_bw.c > +++ b/drivers/gpu/drm/i915/display/intel_bw.c > @@ -374,10 +374,9 @@ static 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); > - struct drm_private_state *bw_state; > + struct intel_global_state *bw_state; > > - bw_state = drm_atomic_get_private_obj_state(&state->base, > - &dev_priv->bw_obj); > + bw_state = intel_atomic_get_global_obj_state(state, &dev_priv->bw_obj); > if (IS_ERR(bw_state)) > return ERR_CAST(bw_state); > > @@ -392,7 +391,7 @@ int intel_bw_atomic_check(struct intel_atomic_state > *state) > unsigned int data_rate, max_data_rate; > unsigned int num_active_planes; > struct intel_crtc *crtc; > - int i; > + int i, ret; > > /* FIXME earlier gens need some checks too */ > if (INTEL_GEN(dev_priv) < 11) > @@ -433,6 +432,10 @@ int intel_bw_atomic_check(struct intel_atomic_state > *state) > if (!bw_state) > return 0; > > + ret = intel_atomic_lock_global_state(&bw_state->base); > + if (ret) > + return ret; > +
So getting the state already read locked it and the above will write lock it. For clarity the above func could be named accordingly. Either way: Reviewed-by: Imre Deak <[email protected]> > data_rate = intel_bw_data_rate(dev_priv, bw_state); > num_active_planes = intel_bw_num_active_planes(dev_priv, bw_state); > > @@ -449,7 +452,8 @@ int intel_bw_atomic_check(struct intel_atomic_state > *state) > return 0; > } > > -static struct drm_private_state *intel_bw_duplicate_state(struct > drm_private_obj *obj) > +static struct intel_global_state * > +intel_bw_duplicate_state(struct intel_global_obj *obj) > { > struct intel_bw_state *state; > > @@ -457,18 +461,16 @@ static struct drm_private_state > *intel_bw_duplicate_state(struct drm_private_obj > if (!state) > return NULL; > > - __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base); > - > return &state->base; > } > > -static void intel_bw_destroy_state(struct drm_private_obj *obj, > - struct drm_private_state *state) > +static void intel_bw_destroy_state(struct intel_global_obj *obj, > + struct intel_global_state *state) > { > kfree(state); > } > > -static const struct drm_private_state_funcs intel_bw_funcs = { > +static const struct intel_global_state_funcs intel_bw_funcs = { > .atomic_duplicate_state = intel_bw_duplicate_state, > .atomic_destroy_state = intel_bw_destroy_state, > }; > @@ -481,13 +483,8 @@ int intel_bw_init(struct drm_i915_private *dev_priv) > if (!state) > return -ENOMEM; > > - drm_atomic_private_obj_init(&dev_priv->drm, &dev_priv->bw_obj, > - &state->base, &intel_bw_funcs); > + intel_atomic_global_obj_init(dev_priv, &dev_priv->bw_obj, > + &state->base, &intel_bw_funcs); > > return 0; > } > - > -void intel_bw_cleanup(struct drm_i915_private *dev_priv) > -{ > - drm_atomic_private_obj_fini(&dev_priv->bw_obj); > -} > diff --git a/drivers/gpu/drm/i915/display/intel_bw.h > b/drivers/gpu/drm/i915/display/intel_bw.h > index 20b9ad241802..a8aa7624c5aa 100644 > --- a/drivers/gpu/drm/i915/display/intel_bw.h > +++ b/drivers/gpu/drm/i915/display/intel_bw.h > @@ -9,13 +9,14 @@ > #include <drm/drm_atomic.h> > > #include "intel_display.h" > +#include "intel_global_state.h" > > struct drm_i915_private; > struct intel_atomic_state; > struct intel_crtc_state; > > struct intel_bw_state { > - struct drm_private_state base; > + struct intel_global_state base; > > unsigned int data_rate[I915_MAX_PIPES]; > u8 num_active_planes[I915_MAX_PIPES]; > @@ -25,7 +26,6 @@ struct intel_bw_state { > > void intel_bw_init_hw(struct drm_i915_private *dev_priv); > int intel_bw_init(struct drm_i915_private *dev_priv); > -void intel_bw_cleanup(struct drm_i915_private *dev_priv); > int intel_bw_atomic_check(struct intel_atomic_state *state); > void intel_bw_crtc_update(struct intel_bw_state *bw_state, > const struct intel_crtc_state *crtc_state); > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 70eb6eaab095..f5396c5c00c6 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -18566,8 +18566,6 @@ void intel_modeset_driver_remove(struct > drm_i915_private *i915) > > intel_gmbus_teardown(i915); > > - intel_bw_cleanup(i915); > - > destroy_workqueue(i915->flip_wq); > destroy_workqueue(i915->modeset_wq); > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index b558e68b4dbd..63cda89a4e62 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1251,7 +1251,7 @@ struct drm_i915_private { > u8 num_planes; > } max_bw[6]; > > - struct drm_private_obj bw_obj; > + struct intel_global_obj bw_obj; > > struct intel_runtime_pm runtime_pm; > > -- > 2.24.1 > > _______________________________________________ > 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
