[v3,12/12] HAX: drm/i915/guc: enable GuC submission/logging for CI
diff mbox

Message ID 1515082914-4111-13-git-send-email-sagar.a.kamble@intel.com
State New
Headers show

Commit Message

sagar.a.kamble@intel.com Jan. 4, 2018, 4:21 p.m. UTC
Also 1) revert ("drm/i915/guc: Assert that we switch between
known ggtt->invalidate functions")
2) fix RPM resume interrupt enabling w.r.t GuC resume
3) disable guc log streaming DRM logs
---
 drivers/gpu/drm/i915/i915_drv.c      | 4 ++--
 drivers/gpu/drm/i915/i915_gem_gtt.c  | 8 ++------
 drivers/gpu/drm/i915/i915_params.h   | 4 ++--
 drivers/gpu/drm/i915/intel_guc_log.c | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

Comments

Chris Wilson Jan. 4, 2018, 4:29 p.m. UTC | #1
Quoting Sagar Arun Kamble (2018-01-04 16:21:54)
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 6c8da9d..c8460c5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -2659,6 +2659,8 @@ static int intel_runtime_resume(struct device *kdev)
>         if (intel_uncore_unclaimed_mmio(dev_priv))
>                 DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
>  
> +       intel_runtime_pm_enable_interrupts(dev_priv);
> +
>         intel_guc_resume(dev_priv);
>  
>         if (IS_GEN9_LP(dev_priv)) {
> @@ -2682,8 +2684,6 @@ static int intel_runtime_resume(struct device *kdev)
>         i915_gem_init_swizzling(dev_priv);
>         i915_gem_restore_fences(dev_priv);
>  
> -       intel_runtime_pm_enable_interrupts(dev_priv);

Have I missed the pending patch?
-Chris
sagar.a.kamble@intel.com Jan. 5, 2018, 4:37 a.m. UTC | #2
On 1/4/2018 9:59 PM, Chris Wilson wrote:
> Quoting Sagar Arun Kamble (2018-01-04 16:21:54)
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 6c8da9d..c8460c5 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -2659,6 +2659,8 @@ static int intel_runtime_resume(struct device *kdev)
>>          if (intel_uncore_unclaimed_mmio(dev_priv))
>>                  DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
>>   
>> +       intel_runtime_pm_enable_interrupts(dev_priv);
>> +
>>          intel_guc_resume(dev_priv);
>>   
>>          if (IS_GEN9_LP(dev_priv)) {
>> @@ -2682,8 +2684,6 @@ static int intel_runtime_resume(struct device *kdev)
>>          i915_gem_init_swizzling(dev_priv);
>>          i915_gem_restore_fences(dev_priv);
>>   
>> -       intel_runtime_pm_enable_interrupts(dev_priv);
> Have I missed the pending patch?
There is suspend/resume related restructuring series for GuC/GEM that is 
in queue post this series.
Was reviewed partly some time back.

Thanks
Sagar
> -Chris

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6c8da9d..c8460c5 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2659,6 +2659,8 @@  static int intel_runtime_resume(struct device *kdev)
 	if (intel_uncore_unclaimed_mmio(dev_priv))
 		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
 
+	intel_runtime_pm_enable_interrupts(dev_priv);
+
 	intel_guc_resume(dev_priv);
 
 	if (IS_GEN9_LP(dev_priv)) {
@@ -2682,8 +2684,6 @@  static int intel_runtime_resume(struct device *kdev)
 	i915_gem_init_swizzling(dev_priv);
 	i915_gem_restore_fences(dev_priv);
 
-	intel_runtime_pm_enable_interrupts(dev_priv);
-
 	/*
 	 * On VLV/CHV display interrupts are part of the display
 	 * power well, so hpd is reinitialized from there. For
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index c5f3938..fdd3345 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3549,8 +3549,6 @@  int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)
 
 void i915_ggtt_enable_guc(struct drm_i915_private *i915)
 {
-	GEM_BUG_ON(i915->ggtt.invalidate != gen6_ggtt_invalidate);
-
 	i915->ggtt.invalidate = guc_ggtt_invalidate;
 
 	i915_ggtt_invalidate(i915);
@@ -3558,10 +3556,8 @@  void i915_ggtt_enable_guc(struct drm_i915_private *i915)
 
 void i915_ggtt_disable_guc(struct drm_i915_private *i915)
 {
-	/* We should only be called after i915_ggtt_enable_guc() */
-	GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
-
-	i915->ggtt.invalidate = gen6_ggtt_invalidate;
+	if (i915->ggtt.invalidate == guc_ggtt_invalidate)
+		i915->ggtt.invalidate = gen6_ggtt_invalidate;
 
 	i915_ggtt_invalidate(i915);
 }
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index c963603..25b7e88 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,8 +47,8 @@ 
 	param(int, disable_power_well, -1) \
 	param(int, enable_ips, 1) \
 	param(int, invert_brightness, 0) \
-	param(int, enable_guc, 0) \
-	param(int, guc_log_level, -1) \
+	param(int, enable_guc, -1) \
+	param(int, guc_log_level, 1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index ddd4f6d..da0554c 100644
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -339,7 +339,7 @@  static void guc_read_update_log_buffer(struct intel_guc *guc)
 		/* Used rate limited to avoid deluge of messages, logs might be
 		 * getting consumed by User at a slow rate.
 		 */
-		DRM_ERROR_RATELIMITED("no sub-buffer to capture logs\n");
+		//DRM_ERROR_RATELIMITED("no sub-buffer to capture logs\n");
 		guc->log.capture_miss_count++;
 	}
 }