[Intel-gfx] [PATCH 03/10] drm/i915: Make various init functions take dev_priv

[Tvrtko Ursulin]

From: Tvrtko Ursulin 

Like GEM init, GUC init, MOCS init and context creation.

Enables them to lose dev_priv locals.

Signed-off-by: Tvrtko Ursulin 
Reviewed-by: Chris Wilson 
Reviewed-by: Joonas Lahtinen 
---
 drivers/gpu/drm/i915/i915_drv.c| 31 ++--
 drivers/gpu/drm/i915/i915_drv.h| 10 -
 drivers/gpu/drm/i915/i915_gem.c| 28 -
 drivers/gpu/drm/i915/i915_gem_context.c| 31 +---
 drivers/gpu/drm/i915/i915_guc_submission.c | 10 -
 drivers/gpu/drm/i915/intel_engine_cs.c |  5 ++---
 drivers/gpu/drm/i915/intel_guc_loader.c| 33 ++
 drivers/gpu/drm/i915/intel_lrc.h   |  2 +-
 drivers/gpu/drm/i915/intel_mocs.c  |  5 ++---
 drivers/gpu/drm/i915/intel_mocs.h  |  2 +-
 drivers/gpu/drm/i915/intel_uc.h| 10 -
 11 files changed, 77 insertions(+), 90 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 89af78eb5c32..a7f85bdf8d66 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -603,9 +603,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret)
goto cleanup_irq;
 
-   intel_guc_init(dev);
+   intel_guc_init(dev_priv);
 
-   ret = i915_gem_init(dev);
+   ret = i915_gem_init(dev_priv);
if (ret)
goto cleanup_irq;
 
@@ -626,11 +626,11 @@ static int i915_load_modeset_init(struct drm_device *dev)
return 0;
 
 cleanup_gem:
-   if (i915_gem_suspend(dev))
+   if (i915_gem_suspend(dev_priv))
DRM_ERROR("failed to idle hardware; continuing to unload!\n");
i915_gem_fini(dev_priv);
 cleanup_irq:
-   intel_guc_fini(dev);
+   intel_guc_fini(dev_priv);
drm_irq_uninstall(dev);
intel_teardown_gmbus(dev);
 cleanup_csr:
@@ -1283,7 +1283,7 @@ void i915_driver_unload(struct drm_device *dev)
 
intel_fbdev_fini(dev);
 
-   if (i915_gem_suspend(dev))
+   if (i915_gem_suspend(dev_priv))
DRM_ERROR("failed to idle hardware; continuing to unload!\n");
 
intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
@@ -1320,7 +1320,7 @@ void i915_driver_unload(struct drm_device *dev)
/* Flush any outstanding unpin_work. */
drain_workqueue(dev_priv->wq);
 
-   intel_guc_fini(dev);
+   intel_guc_fini(dev_priv);
i915_gem_fini(dev_priv);
intel_fbc_cleanup_cfb(dev_priv);
 
@@ -1425,14 +1425,14 @@ static int i915_drm_suspend(struct drm_device *dev)
 
pci_save_state(pdev);
 
-   error = i915_gem_suspend(dev);
+   error = i915_gem_suspend(dev_priv);
if (error) {
dev_err(>dev,
"GEM idle failed, resume might fail\n");
goto out;
}
 
-   intel_guc_suspend(dev);
+   intel_guc_suspend(dev_priv);
 
intel_display_suspend(dev);
 
@@ -1568,7 +1568,7 @@ static int i915_drm_resume(struct drm_device *dev)
 
intel_csr_ucode_resume(dev_priv);
 
-   i915_gem_resume(dev);
+   i915_gem_resume(dev_priv);
 
i915_restore_state(dev);
intel_pps_unlock_regs_wa(dev_priv);
@@ -1591,13 +1591,13 @@ static int i915_drm_resume(struct drm_device *dev)
drm_mode_config_reset(dev);
 
mutex_lock(>struct_mutex);
-   if (i915_gem_init_hw(dev)) {
+   if (i915_gem_init_hw(dev_priv)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
i915_gem_set_wedged(dev_priv);
}
mutex_unlock(>struct_mutex);
 
-   intel_guc_resume(dev);
+   intel_guc_resume(dev_priv);
 
intel_modeset_init_hw(dev);
 
@@ -1770,11 +1770,10 @@ static void enable_engines_irq(struct drm_i915_private 
*dev_priv)
  */
 void i915_reset(struct drm_i915_private *dev_priv)
 {
-   struct drm_device *dev = _priv->drm;
struct i915_gpu_error *error = _priv->gpu_error;
int ret;
 
-   lockdep_assert_held(>struct_mutex);
+   lockdep_assert_held(_priv->drm.struct_mutex);
 
if (!test_and_clear_bit(I915_RESET_IN_PROGRESS, >flags))
return;
@@ -1814,7 +1813,7 @@ void i915_reset(struct drm_i915_private *dev_priv)
 * was running at the time of the reset (i.e. we weren't VT
 * switched away).
 */
-   ret = i915_gem_init_hw(dev);
+   ret = i915_gem_init_hw(dev_priv);
if (ret) {
DRM_ERROR("Failed hw init on reset %d\n", ret);
goto error;
@@ -2328,7 +2327,7 @@ static int intel_runtime_suspend(struct device *kdev)
 */
i915_gem_runtime_suspend(dev_priv);
 
-   intel_guc_suspend(dev);
+   intel_guc_suspend(dev_priv);
 
intel_runtime_pm_disable_interrupts(dev_priv);
 

Re: [Intel-gfx] [PATCH 03/10] drm/i915: Make various init functions take dev_priv

[Joonas Lahtinen]

On ke, 2016-11-30 at 11:35 +, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin 
> 
> Like GEM init, GUC init, MOCS init and context creation.
> 
> Enables them to lose dev_priv locals.
> 
> Signed-off-by: Tvrtko Ursulin 

Keeps pdev \o/

Reviewed-by: Joonas Lahtinen 

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 03/10] drm/i915: Make various init functions take dev_priv

[Tvrtko Ursulin]

From: Tvrtko Ursulin 

Like GEM init, GUC init, MOCS init and context creation.

Enables them to lose dev_priv locals.

Signed-off-by: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/i915_drv.c| 31 ++--
 drivers/gpu/drm/i915/i915_drv.h| 10 -
 drivers/gpu/drm/i915/i915_gem.c| 28 -
 drivers/gpu/drm/i915/i915_gem_context.c| 31 +---
 drivers/gpu/drm/i915/i915_guc_submission.c | 10 -
 drivers/gpu/drm/i915/intel_engine_cs.c |  5 ++---
 drivers/gpu/drm/i915/intel_guc_loader.c| 33 ++
 drivers/gpu/drm/i915/intel_lrc.h   |  2 +-
 drivers/gpu/drm/i915/intel_mocs.c  |  5 ++---
 drivers/gpu/drm/i915/intel_mocs.h  |  2 +-
 drivers/gpu/drm/i915/intel_uc.h| 10 -
 11 files changed, 77 insertions(+), 90 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8dac298461c0..55efff69fcd0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -603,9 +603,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret)
goto cleanup_irq;
 
-   intel_guc_init(dev);
+   intel_guc_init(dev_priv);
 
-   ret = i915_gem_init(dev);
+   ret = i915_gem_init(dev_priv);
if (ret)
goto cleanup_irq;
 
@@ -626,11 +626,11 @@ static int i915_load_modeset_init(struct drm_device *dev)
return 0;
 
 cleanup_gem:
-   if (i915_gem_suspend(dev))
+   if (i915_gem_suspend(dev_priv))
DRM_ERROR("failed to idle hardware; continuing to unload!\n");
i915_gem_fini(dev_priv);
 cleanup_irq:
-   intel_guc_fini(dev);
+   intel_guc_fini(dev_priv);
drm_irq_uninstall(dev);
intel_teardown_gmbus(dev);
 cleanup_csr:
@@ -1290,7 +1290,7 @@ void i915_driver_unload(struct drm_device *dev)
 
intel_fbdev_fini(dev);
 
-   if (i915_gem_suspend(dev))
+   if (i915_gem_suspend(dev_priv))
DRM_ERROR("failed to idle hardware; continuing to unload!\n");
 
intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
@@ -1327,7 +1327,7 @@ void i915_driver_unload(struct drm_device *dev)
/* Flush any outstanding unpin_work. */
drain_workqueue(dev_priv->wq);
 
-   intel_guc_fini(dev);
+   intel_guc_fini(dev_priv);
i915_gem_fini(dev_priv);
intel_fbc_cleanup_cfb(dev_priv);
 
@@ -1432,14 +1432,14 @@ static int i915_drm_suspend(struct drm_device *dev)
 
pci_save_state(pdev);
 
-   error = i915_gem_suspend(dev);
+   error = i915_gem_suspend(dev_priv);
if (error) {
dev_err(>dev,
"GEM idle failed, resume might fail\n");
goto out;
}
 
-   intel_guc_suspend(dev);
+   intel_guc_suspend(dev_priv);
 
intel_display_suspend(dev);
 
@@ -1575,7 +1575,7 @@ static int i915_drm_resume(struct drm_device *dev)
 
intel_csr_ucode_resume(dev_priv);
 
-   i915_gem_resume(dev);
+   i915_gem_resume(dev_priv);
 
i915_restore_state(dev);
intel_pps_unlock_regs_wa(dev_priv);
@@ -1595,13 +1595,13 @@ static int i915_drm_resume(struct drm_device *dev)
intel_runtime_pm_enable_interrupts(dev_priv);
 
mutex_lock(>struct_mutex);
-   if (i915_gem_init_hw(dev)) {
+   if (i915_gem_init_hw(dev_priv)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
i915_gem_set_wedged(dev_priv);
}
mutex_unlock(>struct_mutex);
 
-   intel_guc_resume(dev);
+   intel_guc_resume(dev_priv);
 
intel_modeset_init_hw(dev);
 
@@ -1774,11 +1774,10 @@ static void enable_engines_irq(struct drm_i915_private 
*dev_priv)
  */
 void i915_reset(struct drm_i915_private *dev_priv)
 {
-   struct drm_device *dev = _priv->drm;
struct i915_gpu_error *error = _priv->gpu_error;
int ret;
 
-   lockdep_assert_held(>struct_mutex);
+   lockdep_assert_held(_priv->drm.struct_mutex);
 
if (!test_and_clear_bit(I915_RESET_IN_PROGRESS, >flags))
return;
@@ -1818,7 +1817,7 @@ void i915_reset(struct drm_i915_private *dev_priv)
 * was running at the time of the reset (i.e. we weren't VT
 * switched away).
 */
-   ret = i915_gem_init_hw(dev);
+   ret = i915_gem_init_hw(dev_priv);
if (ret) {
DRM_ERROR("Failed hw init on reset %d\n", ret);
goto error;
@@ -2332,7 +2331,7 @@ static int intel_runtime_suspend(struct device *kdev)
 */
i915_gem_runtime_suspend(dev_priv);
 
-   intel_guc_suspend(dev);
+   intel_guc_suspend(dev_priv);
 
intel_runtime_pm_disable_interrupts(dev_priv);
 
@@ -2417,7 +2416,7 @@ static int intel_runtime_resume(struct device *kdev)
if