reorder scratch page allocation so that memory regions are available
to allocate the buffers
Signed-off-by: Robert Beckett <[email protected]>
---
drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 20 ++++++++++++++++++--
drivers/gpu/drm/i915/gt/intel_gt_gmch.h | 6 ++++++
drivers/gpu/drm/i915/i915_driver.c | 16 ++++++++++------
3 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_gmch.c b/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
index 18e488672d1b..5411df1734ac 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
@@ -440,8 +440,6 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
struct drm_i915_private *i915 = ggtt->vm.i915;
struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
phys_addr_t phys_addr;
- u32 pte_flags;
- int ret;
GEM_WARN_ON(pci_resource_len(pdev, 0) != gen6_gttmmadr_size(i915));
phys_addr = pci_resource_start(pdev, 0) + gen6_gttadr_offset(i915);
@@ -463,6 +461,24 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
}
kref_init(&ggtt->vm.resv_ref);
+
+ return 0;
+}
+
+/**
+ * i915_ggtt_setup_scratch_page - setup ggtt scratch page
+ * @i915: i915 device
+ */
+int i915_ggtt_setup_scratch_page(struct drm_i915_private *i915)
+{
+ struct i915_ggtt *ggtt = to_gt(i915)->ggtt;
+ u32 pte_flags;
+ int ret;
+
+ /* gen5- scratch setup currently happens in @intel_gtt_init */
+ if (GRAPHICS_VER(i915) <= 5)
+ return 0;
+
ret = setup_scratch_page(&ggtt->vm);
if (ret) {
drm_err(&i915->drm, "Scratch setup failed\n");
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_gmch.h b/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
index 75ed55c1f30a..c6b79cb78637 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
@@ -15,6 +15,7 @@ int intel_gt_gmch_gen6_probe(struct i915_ggtt *ggtt);
int intel_gt_gmch_gen8_probe(struct i915_ggtt *ggtt);
int intel_gt_gmch_gen5_probe(struct i915_ggtt *ggtt);
int intel_gt_gmch_gen5_enable_hw(struct drm_i915_private *i915);
+int i915_ggtt_setup_scratch_page(struct drm_i915_private *i915);
/* Stubs for non-x86 platforms */
#else
@@ -41,6 +42,11 @@ static inline int intel_gt_gmch_gen5_enable_hw(struct drm_i915_private *i915)
/* No HW should be enabled for this case yet, return fail */
return -ENODEV;
}
+
+static inline int i915_ggtt_setup_scratch_page(struct drm_i915_private *i915)
+{
+ return 0;
+}
#endif
#endif /* __INTEL_GT_GMCH_H__ */
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 90b0ce5051af..f67476b2f349 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -69,6 +69,7 @@
#include "gem/i915_gem_mman.h"
#include "gem/i915_gem_pm.h"
#include "gt/intel_gt.h"
+#include "gt/intel_gt_gmch.h"
#include "gt/intel_gt_pm.h"
#include "gt/intel_rc6.h"
@@ -589,12 +590,16 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
ret = intel_gt_tiles_init(dev_priv);
if (ret)
- goto err_mem_regions;
+ goto err_ggtt;
+
+ ret = i915_ggtt_setup_scratch_page(dev_priv);
+ if (ret)
+ goto err_ggtt;
ret = i915_ggtt_enable_hw(dev_priv);
if (ret) {
drm_err(&dev_priv->drm, "failed to enable GGTT\n");
- goto err_mem_regions;
+ goto err_ggtt;
}
pci_set_master(pdev);
@@ -646,11 +651,10 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
err_msi:
if (pdev->msi_enabled)
pci_disable_msi(pdev);
-err_mem_regions:
- intel_memory_regions_driver_release(dev_priv);
err_ggtt:
i915_ggtt_driver_release(dev_priv);
i915_gem_drain_freed_objects(dev_priv);
+ intel_memory_regions_driver_release(dev_priv);
i915_ggtt_driver_late_release(dev_priv);
err_perf:
i915_perf_fini(dev_priv);
@@ -896,9 +900,9 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
intel_modeset_driver_remove_nogem(i915);
out_cleanup_hw:
i915_driver_hw_remove(i915);
- intel_memory_regions_driver_release(i915);
i915_ggtt_driver_release(i915);
i915_gem_drain_freed_objects(i915);
+ intel_memory_regions_driver_release(i915);
i915_ggtt_driver_late_release(i915);
out_cleanup_mmio:
i915_driver_mmio_release(i915);
@@ -955,9 +959,9 @@ static void i915_driver_release(struct drm_device *dev)
i915_gem_driver_release(dev_priv);
- intel_memory_regions_driver_release(dev_priv);
i915_ggtt_driver_release(dev_priv);
i915_gem_drain_freed_objects(dev_priv);
+ intel_memory_regions_driver_release(dev_priv);
i915_ggtt_driver_late_release(dev_priv);
i915_driver_mmio_release(dev_priv);
--
2.25.1
On Tue, 2022-05-03 at 19:13 +0000, Robert Beckett wrote:
> reorder scratch page allocation so that memory regions are available
Nit: s/reorder/Reorder/
Reviewed-by: Thomas Hellström <[email protected]>
> to allocate the buffers
>
> Signed-off-by: Robert Beckett <[email protected]>
> ---
> drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 20 ++++++++++++++++++--
> drivers/gpu/drm/i915/gt/intel_gt_gmch.h | 6 ++++++
> drivers/gpu/drm/i915/i915_driver.c | 16 ++++++++++------
> 3 files changed, 34 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
> b/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
> index 18e488672d1b..5411df1734ac 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_gmch.c
> @@ -440,8 +440,6 @@ static int ggtt_probe_common(struct i915_ggtt
> *ggtt, u64 size)
> struct drm_i915_private *i915 = ggtt->vm.i915;
> struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
> phys_addr_t phys_addr;
> - u32 pte_flags;
> - int ret;
>
> GEM_WARN_ON(pci_resource_len(pdev, 0) !=
> gen6_gttmmadr_size(i915));
> phys_addr = pci_resource_start(pdev, 0) +
> gen6_gttadr_offset(i915);
> @@ -463,6 +461,24 @@ static int ggtt_probe_common(struct i915_ggtt
> *ggtt, u64 size)
> }
>
> kref_init(&ggtt->vm.resv_ref);
> +
> + return 0;
> +}
> +
> +/**
> + * i915_ggtt_setup_scratch_page - setup ggtt scratch page
> + * @i915: i915 device
> + */
> +int i915_ggtt_setup_scratch_page(struct drm_i915_private *i915)
> +{
> + struct i915_ggtt *ggtt = to_gt(i915)->ggtt;
> + u32 pte_flags;
> + int ret;
> +
> + /* gen5- scratch setup currently happens in @intel_gtt_init
> */
> + if (GRAPHICS_VER(i915) <= 5)
> + return 0;
> +
> ret = setup_scratch_page(&ggtt->vm);
> if (ret) {
> drm_err(&i915->drm, "Scratch setup failed\n");
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
> b/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
> index 75ed55c1f30a..c6b79cb78637 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_gmch.h
> @@ -15,6 +15,7 @@ int intel_gt_gmch_gen6_probe(struct i915_ggtt
> *ggtt);
> int intel_gt_gmch_gen8_probe(struct i915_ggtt *ggtt);
> int intel_gt_gmch_gen5_probe(struct i915_ggtt *ggtt);
> int intel_gt_gmch_gen5_enable_hw(struct drm_i915_private *i915);
> +int i915_ggtt_setup_scratch_page(struct drm_i915_private *i915);
>
> /* Stubs for non-x86 platforms */
> #else
> @@ -41,6 +42,11 @@ static inline int
> intel_gt_gmch_gen5_enable_hw(struct drm_i915_private *i915)
> /* No HW should be enabled for this case yet, return fail */
> return -ENODEV;
> }
> +
> +static inline int i915_ggtt_setup_scratch_page(struct
> drm_i915_private *i915)
> +{
> + return 0;
> +}
> #endif
>
> #endif /* __INTEL_GT_GMCH_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_driver.c
> b/drivers/gpu/drm/i915/i915_driver.c
> index 90b0ce5051af..f67476b2f349 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -69,6 +69,7 @@
> #include "gem/i915_gem_mman.h"
> #include "gem/i915_gem_pm.h"
> #include "gt/intel_gt.h"
> +#include "gt/intel_gt_gmch.h"
> #include "gt/intel_gt_pm.h"
> #include "gt/intel_rc6.h"
>
> @@ -589,12 +590,16 @@ static int i915_driver_hw_probe(struct
> drm_i915_private *dev_priv)
>
> ret = intel_gt_tiles_init(dev_priv);
> if (ret)
> - goto err_mem_regions;
> + goto err_ggtt;
> +
> + ret = i915_ggtt_setup_scratch_page(dev_priv);
> + if (ret)
> + goto err_ggtt;
>
> ret = i915_ggtt_enable_hw(dev_priv);
> if (ret) {
> drm_err(&dev_priv->drm, "failed to enable GGTT\n");
> - goto err_mem_regions;
> + goto err_ggtt;
> }
>
> pci_set_master(pdev);
> @@ -646,11 +651,10 @@ static int i915_driver_hw_probe(struct
> drm_i915_private *dev_priv)
> err_msi:
> if (pdev->msi_enabled)
> pci_disable_msi(pdev);
> -err_mem_regions:
> - intel_memory_regions_driver_release(dev_priv);
> err_ggtt:
> i915_ggtt_driver_release(dev_priv);
> i915_gem_drain_freed_objects(dev_priv);
> + intel_memory_regions_driver_release(dev_priv);
> i915_ggtt_driver_late_release(dev_priv);
> err_perf:
> i915_perf_fini(dev_priv);
> @@ -896,9 +900,9 @@ int i915_driver_probe(struct pci_dev *pdev, const
> struct pci_device_id *ent)
> intel_modeset_driver_remove_nogem(i915);
> out_cleanup_hw:
> i915_driver_hw_remove(i915);
> - intel_memory_regions_driver_release(i915);
> i915_ggtt_driver_release(i915);
> i915_gem_drain_freed_objects(i915);
> + intel_memory_regions_driver_release(i915);
> i915_ggtt_driver_late_release(i915);
> out_cleanup_mmio:
> i915_driver_mmio_release(i915);
> @@ -955,9 +959,9 @@ static void i915_driver_release(struct drm_device
> *dev)
>
> i915_gem_driver_release(dev_priv);
>
> - intel_memory_regions_driver_release(dev_priv);
> i915_ggtt_driver_release(dev_priv);
> i915_gem_drain_freed_objects(dev_priv);
> + intel_memory_regions_driver_release(dev_priv);
> i915_ggtt_driver_late_release(dev_priv);
>
> i915_driver_mmio_release(dev_priv);