| Message ID | 1458830866-12578-1-git-send-email-joonas.lahtinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On to, 2016-03-24 at 16:47 +0200, Joonas Lahtinen wrote: > Rename and document the GGTT init functions to give a better > idea of the context where they are called from. > > i915_gem_gtt_init => i915_ggtt_init_hw > i915_gem_init_global_gtt => i915_gem_init_ggtt > i915_global_gtt_cleanup => i915_ggtt_cleanup_hw > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Acked-by: Chris Wilson <chris@chris-wilson.co.uk> Chris, accidentally did not remove you A-b for v2. You can retake your position here. This is the best balance between general naming logic and consistency with ppgtt I could come up. How about I merge this? Regards, Joonas > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_dma.c | 14 +++++++------- > drivers/gpu/drm/i915/i915_gem.c | 2 +- > drivers/gpu/drm/i915/i915_gem_gtt.c | 18 +++++++++++++++--- > drivers/gpu/drm/i915/i915_gem_gtt.h | 7 +++---- > 4 files changed, 26 insertions(+), 15 deletions(-) >
On Tue, Mar 29, 2016 at 04:15:54PM +0300, Joonas Lahtinen wrote: > On to, 2016-03-24 at 16:47 +0200, Joonas Lahtinen wrote: > > Rename and document the GGTT init functions to give a better > > idea of the context where they are called from. > > > > i915_gem_gtt_init => i915_ggtt_init_hw > > i915_gem_init_global_gtt => i915_gem_init_ggtt > > i915_global_gtt_cleanup => i915_ggtt_cleanup_hw > > > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Acked-by: Chris Wilson <chris@chris-wilson.co.uk> > > Chris, accidentally did not remove you A-b for v2. You can retake your > position here. > > This is the best balance between general naming logic and consistency > with ppgtt I could come up. How about I merge this? I don't have any better names to suggest, and the init_hw should help a lot. Go for it. -Chris
On Tue, Mar 29, 2016 at 03:25:38PM +0100, Chris Wilson wrote: > On Tue, Mar 29, 2016 at 04:15:54PM +0300, Joonas Lahtinen wrote: > > On to, 2016-03-24 at 16:47 +0200, Joonas Lahtinen wrote: > > > Rename and document the GGTT init functions to give a better > > > idea of the context where they are called from. > > > > > > i915_gem_gtt_init => i915_ggtt_init_hw > > > i915_gem_init_global_gtt => i915_gem_init_ggtt > > > i915_global_gtt_cleanup => i915_ggtt_cleanup_hw > > > > > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > Acked-by: Chris Wilson <chris@chris-wilson.co.uk> > > > > Chris, accidentally did not remove you A-b for v2. You can retake your > > position here. > > > > This is the best balance between general naming logic and consistency > > with ppgtt I could come up. How about I merge this? > > I don't have any better names to suggest, and the init_hw should help a > lot. Go for it. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On ke, 2016-03-30 at 10:12 +0100, Chris Wilson wrote: > On Tue, Mar 29, 2016 at 03:25:38PM +0100, Chris Wilson wrote: > > > > On Tue, Mar 29, 2016 at 04:15:54PM +0300, Joonas Lahtinen wrote: > > > > > > On to, 2016-03-24 at 16:47 +0200, Joonas Lahtinen wrote: > > > > > > > > Rename and document the GGTT init functions to give a better > > > > idea of the context where they are called from. > > > > > > > > i915_gem_gtt_init => i915_ggtt_init_hw > > > > i915_gem_init_global_gtt => i915_gem_init_ggtt > > > > i915_global_gtt_cleanup => i915_ggtt_cleanup_hw > > > > > > > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Acked-by: Chris Wilson <chris@chris-wilson.co.uk> > > > Chris, accidentally did not remove you A-b for v2. You can retake your > > > position here. > > > > > > This is the best balance between general naming logic and consistency > > > with ppgtt I could come up. How about I merge this? > > I don't have any better names to suggest, and the init_hw should help a > > lot. Go for it. > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Merged, thanks for review and comments everyone. > -Chris >
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index fc8ac98..90adde4 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1180,7 +1180,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) intel_device_info_runtime_init(dev); - ret = i915_gem_gtt_init(dev); + ret = i915_ggtt_init_hw(dev); if (ret) return ret; @@ -1189,13 +1189,13 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) ret = i915_kick_out_firmware_fb(dev_priv); if (ret) { DRM_ERROR("failed to remove conflicting framebuffer drivers\n"); - goto out_gtt; + goto out_ggtt; } ret = i915_kick_out_vgacon(dev_priv); if (ret) { DRM_ERROR("failed to remove conflicting VGA console\n"); - goto out_gtt; + goto out_ggtt; } pci_set_master(dev->pdev); @@ -1222,7 +1222,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) aperture_size); if (dev_priv->ggtt.mappable == NULL) { ret = -EIO; - goto out_gtt; + goto out_ggtt; } dev_priv->ggtt.mtrr = arch_phys_wc_add(dev_priv->ggtt.mappable_base, @@ -1255,8 +1255,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) return 0; -out_gtt: - i915_global_gtt_cleanup(dev); +out_ggtt: + i915_ggtt_cleanup_hw(dev); return ret; } @@ -1275,7 +1275,7 @@ static void i915_driver_cleanup_hw(struct drm_i915_private *dev_priv) pm_qos_remove_request(&dev_priv->pm_qos); arch_phys_wc_del(dev_priv->ggtt.mtrr); io_mapping_free(dev_priv->ggtt.mappable); - i915_global_gtt_cleanup(dev); + i915_ggtt_cleanup_hw(dev); } /** diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c7a997a..4cbf223 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4967,7 +4967,7 @@ int i915_gem_init(struct drm_device *dev) if (ret) goto out_unlock; - i915_gem_init_global_gtt(dev); + i915_gem_init_ggtt(dev); ret = i915_gem_context_init(dev); if (ret) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 7cfafdc..292a4fd 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2804,7 +2804,11 @@ static int i915_gem_setup_global_gtt(struct drm_device *dev, return 0; } -void i915_gem_init_global_gtt(struct drm_device *dev) +/** + * i915_gem_init_ggtt - Initialize GEM for Global GTT + * @dev: DRM device + */ +void i915_gem_init_ggtt(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; u64 gtt_size, mappable_size; @@ -2815,7 +2819,11 @@ void i915_gem_init_global_gtt(struct drm_device *dev) i915_gem_setup_global_gtt(dev, 0, mappable_size, gtt_size); } -void i915_global_gtt_cleanup(struct drm_device *dev) +/** + * i915_ggtt_cleanup_hw - Clean up GGTT hardware initialization + * @dev: DRM device + */ +void i915_ggtt_cleanup_hw(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct i915_address_space *vm = &dev_priv->ggtt.base; @@ -3153,7 +3161,11 @@ static void i915_gmch_remove(struct i915_address_space *vm) intel_gmch_remove(); } -int i915_gem_gtt_init(struct drm_device *dev) +/** + * i915_ggtt_init_hw - Initialize GGTT hardware + * @dev: DRM device + */ +int i915_ggtt_init_hw(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; struct i915_ggtt *ggtt = &dev_priv->ggtt; diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h index d804be0..242a13b 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.h +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h @@ -513,10 +513,9 @@ i915_page_dir_dma_addr(const struct i915_hw_ppgtt *ppgtt, const unsigned n) px_dma(ppgtt->base.scratch_pd); } -int i915_gem_gtt_init(struct drm_device *dev); -void i915_gem_init_global_gtt(struct drm_device *dev); -void i915_global_gtt_cleanup(struct drm_device *dev); - +int i915_ggtt_init_hw(struct drm_device *dev); +void i915_gem_init_ggtt(struct drm_device *dev); +void i915_ggtt_cleanup_hw(struct drm_device *dev); int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt); int i915_ppgtt_init_hw(struct drm_device *dev);