On Fri, Jun 14, 2019 at 04:17:26PM +0100, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <[email protected]> > > This will become useful in the following patch. > > v2: > * Assign the pointer through a helper on the top level to work around > the layering violation. (Chris) > > Signed-off-by: Tvrtko Ursulin <[email protected]>
Reviewed-by: Rodrigo Vivi <[email protected]> > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 5 +++++ > drivers/gpu/drm/i915/gt/intel_gt.h | 1 + > drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 ++ > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > 4 files changed, 10 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c > b/drivers/gpu/drm/i915/gt/intel_gt.c > index 5bc460d68c8b..6746c40c2132 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -20,6 +20,11 @@ void intel_gt_init(struct intel_gt *gt, struct > drm_i915_private *i915) > spin_lock_init(>->closed_lock); > } > > +void intel_gt_init_hw(struct drm_i915_private *i915) > +{ > + i915->gt.ggtt = &i915->ggtt; > +} > + > static void rmw_set(struct intel_uncore *uncore, i915_reg_t reg, u32 set) > { > intel_uncore_rmw(uncore, reg, 0, set); > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h > b/drivers/gpu/drm/i915/gt/intel_gt.h > index 8d84716c3b3b..53fcf4f276d3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt.h > @@ -12,6 +12,7 @@ > #include "i915_drv.h" > > void intel_gt_init(struct intel_gt *gt, struct drm_i915_private *i915); > +void intel_gt_init_hw(struct drm_i915_private *i915); > > void intel_gt_check_and_clear_faults(struct intel_gt *gt); > void intel_gt_clear_error_registers(struct intel_gt *gt, > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h > b/drivers/gpu/drm/i915/gt/intel_gt_types.h > index d96df4f68741..233f73316a43 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h > @@ -18,11 +18,13 @@ > #include "intel_wakeref.h" > > struct drm_i915_private; > +struct i915_ggtt; > struct intel_uncore; > > struct intel_gt { > struct drm_i915_private *i915; > struct intel_uncore *uncore; > + struct i915_ggtt *ggtt; > > struct i915_gt_timelines { > struct mutex mutex; /* protects list, tainted by GPU */ > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 1df76f7c717e..783cbbda75fb 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1584,6 +1584,8 @@ static int i915_driver_init_hw(struct drm_i915_private > *dev_priv) > if (ret) > goto err_ggtt; > > + intel_gt_init_hw(dev_priv); > + > ret = i915_ggtt_enable_hw(dev_priv); > if (ret) { > DRM_ERROR("failed to enable GGTT\n"); > -- > 2.20.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
