drm/i915/guc: Add host2guc notification for suspend and resume
Subsystems (2)
PATCH 1/1 drm/i915/guc: Add host2guc notification for suspend and resume
From: Alex Dai <[email protected]>
Add host2guc interfaces to nofigy GuC power state changes when enter or resume from power saving state.
v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
--- drivers/gpu/drm/i915/i915_drv.c | 5 +++ drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 6 files changed, 70 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +5 -0
@@ -737,6 +737,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);
@@ -1476,6 +1478,7 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev);intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);
@@ -1535,6 +1538,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -4460,6 +4460,8 @@ i915_gem_suspend(struct drm_device *dev)i915_gem_stop_ringbuffers (dev);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev); +cancel_delayed_work_sync (&dev_priv->gpu_error.hangcheck_work);cancel_delayed_work_sync (&dev_priv->mm.retire_work);flush_delayed_work (&dev_priv->mm.idle_work);
drivers/gpu/drm/i915/i915_guc_submission.c +50 -0
53 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +2 -0
@@ -116,6 +116,8 @@ extern void intel_guc_ucode_init(struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);extern void intel_guc_ucode_fini (struct drm_device *dev);extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern int intel_guc_suspend (struct drm_device *dev); +extern int intel_guc_resume (struct drm_device *dev);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_guc_fwif.h +8 -0
@@ -290,12 +290,20 @@ struct guc_context_desc {u64 desc_private; } __packed; +#define GUC_POWER_UNSPECIFIED 0 +#define GUC_POWER_D0 1 +#define GUC_POWER_D1 2 +#define GUC_POWER_D2 3 +#define GUC_POWER_D3 4 +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,HOST2GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,HOST2GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,HOST2GUC_ACTION_DEALLOCATE_DOORBELL =0x20 , +HOST2GUC_ACTION_ENTER_S_STATE =0x501 , +HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 ,HOST2GUC_ACTION_LIMIT };
drivers/gpu/drm/i915/intel_guc_loader.c +3 -1
@@ -379,7 +379,6 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));direct_interrupts_to_host (dev_priv); -i915_guc_submission_disable (dev);if (guc_fw->guc_fw_fetch_status ==GUC_FIRMWARE_NONE )return 0 ;
@@ -429,6 +428,9 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));if (i915.enable_guc_submission) { +/* The execbuf_client will be recreated. Release it first. */ +i915_guc_submission_disable (dev); + err =i915_guc_submission_enable (dev);if (err) goto fail;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thanks for the updated patch. Minor comment below.
Thanks
Sagar
Quoted 55 lines · On 9/26/2015 12:16 AM, [email protected] wrote:
From: Alex Dai <[email protected]>
Add host2guc interfaces to nofigy GuC power state changes when enter or resume from power saving state.
v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
Signed-off-by Alex Dai <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 5 +++ drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 6 files changed, 70 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +5
-0@@ -737,6 +737,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);@@ -1476,6 +1478,7 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev);intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);@@ -1535,6 +1538,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);drivers/gpu/drm/i915/i915_gem.c +0
-0
drivers/gpu/drm/i915/i915_gem.c i915_gem_suspend(struct drm_device *dev) · line 4464
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c +2
-0@@ -4460,6 +4460,8 @@ i915_gem_suspend(struct drm_device *dev)i915_gem_stop_ringbuffers (dev);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev); +
Should this be called as part of i915_drm_suspend for consistency instead of i915_gem_suspend?
Quoted 112 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0cancel_delayed_work_sync (&dev_priv->gpu_error.hangcheck_work);cancel_delayed_work_sync (&dev_priv->mm.retire_work);flush_delayed_work (&dev_priv->mm.idle_work);drivers/gpu/drm/i915/i915_guc_submission.c +50
-0@@ -914,3 +914,53 @@ void i915_guc_submission_fini(struct drm_device *dev)gem_release_guc_obj (guc->ctx_pool_obj); guc->ctx_pool_obj =NULL ; } + +/** +* intel_guc_suspend() - notify GuC entering suspend state +* @dev: drm device +*/ +int intel_guc_suspend (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct intel_context *ctx; +u32 data[3 ]; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->ring[RCS ].default_context; + + data[0 ] =HOST2GUC_ACTION_ENTER_S_STATE ; +/* any value greater than GUC_POWER_D0 */ + data[1 ] =GUC_POWER_D1 ; +/* first page is shared data with GuC */ + data[2 ] =i915_gem_obj_ggtt_offset (ctx->engine[RCS ].state); + +return host2guc_action (guc, data,ARRAY_SIZE (data)); +} + + +/** +* intel_guc_resume() - notify GuC resuming from suspend state +* @dev: drm device +*/ +int intel_guc_resume (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct intel_context *ctx; +u32 data[3 ]; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->ring[RCS ].default_context; + + data[0 ] =HOST2GUC_ACTION_EXIT_S_STATE ; + data[1 ] =GUC_POWER_D0 ; +/* first page is shared data with GuC */ + data[2 ] =i915_gem_obj_ggtt_offset (ctx->engine[RCS ].state); + +return host2guc_action (guc, data,ARRAY_SIZE (data)); +}drivers/gpu/drm/i915/intel_guc.h +2
-0@@ -116,6 +116,8 @@ extern void intel_guc_ucode_init(struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);extern void intel_guc_ucode_fini (struct drm_device *dev);extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern int intel_guc_suspend (struct drm_device *dev); +extern int intel_guc_resume (struct drm_device *dev);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_device *dev);drivers/gpu/drm/i915/intel_guc_fwif.h +8
-0@@ -290,12 +290,20 @@ struct guc_context_desc {u64 desc_private; } __packed; +#define GUC_POWER_UNSPECIFIED 0 +#define GUC_POWER_D0 1 +#define GUC_POWER_D1 2 +#define GUC_POWER_D2 3 +#define GUC_POWER_D3 4 +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,HOST2GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,HOST2GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,HOST2GUC_ACTION_DEALLOCATE_DOORBELL =0x20 , +HOST2GUC_ACTION_ENTER_S_STATE =0x501 , +HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 ,HOST2GUC_ACTION_LIMIT };drivers/gpu/drm/i915/intel_guc_loader.c +0
-1@@ -379,7 +379,6 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));direct_interrupts_to_host (dev_priv); -i915_guc_submission_disable (dev);if (guc_fw->guc_fw_fetch_status ==GUC_FIRMWARE_NONE )return 0 ;
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_ucode_load(struct drm_device *dev) · line 436
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0@@ -429,6 +428,9 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));if (i915.enable_guc_submission) { +/* The execbuf_client will be recreated. Release it first. */ +i915_guc_submission_disable (dev); + err =i915_guc_submission_enable (dev);if (err) goto fail;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 64 lines · Sagar A
Thanks for the updated patch. Minor comment below.
Thanks
SagarQuoted 58 lines · On 9/26/2015 12:16 AM, [email protected] wrote:
From: Alex Dai <[email protected]>
Add host2guc interfaces to nofigy GuC power state changes when enter or resume from power saving state.
v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
Signed-off-by Alex Dai <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 5 +++ drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 6 files changed, 70 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +5
-0@@ -737,6 +737,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);@@ -1476,6 +1478,7 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev);intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);@@ -1535,6 +1538,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);drivers/gpu/drm/i915/i915_gem.c +0
-0@@ -4460,6 +4460,8 @@ i915_gem_suspend(struct drm_device *dev)i915_gem_stop_ringbuffers (dev);mutex_unlock (&dev->struct_mutex);
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c i915_gem_suspend(struct drm_device *dev) · line 4464
Quoted 2 lines
drivers/gpu/drm/i915/i915_gem.c +2
-0+intel_guc_suspend (dev); +Should this be called as part of
i915_drm_suspendfor consistency instead ofi915_gem_suspend?
Yes, I will change it accordingly. i915_gem_suspend is called during unload, where we won't need to suspend guc - it will be unloaded anyway.
Thanks for the review,
Alex
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Yu Dai
Quoted 2 lines · Sagar A
Thanks for the updated patch. Minor comment below.
Quoted 7 lines
Quoted 7 lines
Thanks
SagarQuoted 3 lines · On 9/26/2015 12:16 AM, [email protected] wrote:
From: Alex Dai <[email protected]>
Add host2guc interfaces to nofigy GuC power state changes when
[TOR:] Is "nofigy" a typo?
Thanks,
Tom
Quoted 65 lines
Quoted 55 lines
Quoted 55 lines
enter or resume from power saving state.
v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
Signed-off-by Alex Dai <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 5 +++ drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 6 files changed, 70 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +5
-0@@ -737,6 +737,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);@@ -1476,6 +1478,7 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev);intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);@@ -1535,6 +1538,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);drivers/gpu/drm/i915/i915_gem.c +0
-0@@ -4460,6 +4460,8 @@ i915_gem_suspend(struct drm_device *dev)i915_gem_stop_ringbuffers (dev);mutex_unlock (&dev->struct_mutex);Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c i915_gem_suspend(struct drm_device *dev) · line 4464
Quoted 2 lines
drivers/gpu/drm/i915/i915_gem.c +2
-0+intel_guc_suspend (dev); +Should this be called as part of
i915_drm_suspendfor consistency instead ofi915_gem_suspend?Yes, I will change it accordingly.
i915_gem_suspendis called during unload, where we won't need to suspend guc - it will be unloaded anyway.
Quoted 6 lines
Thanks for the review,
Alex
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/guc: Add host2guc notification for suspend and resume
In reply to [email protected]From: Alex Dai <[email protected]>
Add host2guc interface to notify GuC power state changes when enter or resume from power saving state.
v3: Move intel_guc_suspend to i915_drm_suspend for consistency.
v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
--- drivers/gpu/drm/i915/i915_drv.c | 8 +++++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 5 files changed, 71 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +8 -0
@@ -638,6 +638,8 @@ static int i915_drm_suspend(struct drm_device *dev)return error; } +intel_guc_suspend (dev); +intel_suspend_gt_powersave (dev);/*
@@ -767,6 +769,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);
@@ -1500,6 +1504,8 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev); +intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);
@@ -1559,6 +1565,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);
drivers/gpu/drm/i915/i915_guc_submission.c +50 -0
53 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +2 -0
@@ -116,6 +116,8 @@ extern void intel_guc_ucode_init(struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);extern void intel_guc_ucode_fini (struct drm_device *dev);extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern int intel_guc_suspend (struct drm_device *dev); +extern int intel_guc_resume (struct drm_device *dev);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_guc_fwif.h +8 -0
@@ -293,12 +293,20 @@ struct guc_context_desc {#define GUC_FORCEWAKE_RENDER (1 << 0)#define GUC_FORCEWAKE_MEDIA (1 << 1) +#define GUC_POWER_UNSPECIFIED 0 +#define GUC_POWER_D0 1 +#define GUC_POWER_D1 2 +#define GUC_POWER_D2 3 +#define GUC_POWER_D3 4 +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,HOST2GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,HOST2GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,HOST2GUC_ACTION_DEALLOCATE_DOORBELL =0x20 , +HOST2GUC_ACTION_ENTER_S_STATE =0x501 , +HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 ,HOST2GUC_ACTION_LIMIT };
drivers/gpu/drm/i915/intel_guc_loader.c +3 -1
@@ -379,7 +379,6 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));direct_interrupts_to_host (dev_priv); -i915_guc_submission_disable (dev);if (guc_fw->guc_fw_fetch_status ==GUC_FIRMWARE_NONE )return 0 ;
@@ -429,6 +428,9 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));if (i915.enable_guc_submission) { +/* The execbuf_client will be recreated. Release it first. */ +i915_guc_submission_disable (dev); + err =i915_guc_submission_enable (dev);if (err) goto fail;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 170 lines · On 9/30/2015 10:16 PM, [email protected] wrote:
From: Alex Dai <[email protected]>
Add host2guc interface to notify GuC power state changes when enter or resume from power saving state.
v3: Move
intel_guc_suspendtoi915_drm_suspendfor consistency.v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
Signed-off-by Alex Dai <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 8 +++++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 5 files changed, 71 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +8
-0@@ -638,6 +638,8 @@ static int i915_drm_suspend(struct drm_device *dev)return error; } +intel_guc_suspend (dev); +intel_suspend_gt_powersave (dev);/* @@ -767,6 +769,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);@@ -1500,6 +1504,8 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev); +intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);@@ -1559,6 +1565,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);drivers/gpu/drm/i915/i915_guc_submission.c +50
-0@@ -923,3 +923,53 @@ void i915_guc_submission_fini(struct drm_device *dev)gem_release_guc_obj (guc->ctx_pool_obj); guc->ctx_pool_obj =NULL ; } + +/** +* intel_guc_suspend() - notify GuC entering suspend state +* @dev: drm device +*/ +int intel_guc_suspend (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct intel_context *ctx; +u32 data[3 ]; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->ring[RCS ].default_context; + + data[0 ] =HOST2GUC_ACTION_ENTER_S_STATE ; +/* any value greater than GUC_POWER_D0 */ + data[1 ] =GUC_POWER_D1 ; +/* first page is shared data with GuC */ + data[2 ] =i915_gem_obj_ggtt_offset (ctx->engine[RCS ].state); + +return host2guc_action (guc, data,ARRAY_SIZE (data)); +} + + +/** +* intel_guc_resume() - notify GuC resuming from suspend state +* @dev: drm device +*/ +int intel_guc_resume (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct intel_context *ctx; +u32 data[3 ]; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->ring[RCS ].default_context; + + data[0 ] =HOST2GUC_ACTION_EXIT_S_STATE ; + data[1 ] =GUC_POWER_D0 ; +/* first page is shared data with GuC */ + data[2 ] =i915_gem_obj_ggtt_offset (ctx->engine[RCS ].state); + +return host2guc_action (guc, data,ARRAY_SIZE (data)); +}drivers/gpu/drm/i915/intel_guc.h +2
-0@@ -116,6 +116,8 @@ extern void intel_guc_ucode_init(struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);extern void intel_guc_ucode_fini (struct drm_device *dev);extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern int intel_guc_suspend (struct drm_device *dev); +extern int intel_guc_resume (struct drm_device *dev);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_device *dev);drivers/gpu/drm/i915/intel_guc_fwif.h +8
-0@@ -293,12 +293,20 @@ struct guc_context_desc {#define GUC_FORCEWAKE_RENDER (1 << 0)#define GUC_FORCEWAKE_MEDIA (1 << 1) +#define GUC_POWER_UNSPECIFIED 0 +#define GUC_POWER_D0 1 +#define GUC_POWER_D1 2 +#define GUC_POWER_D2 3 +#define GUC_POWER_D3 4 +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,HOST2GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,HOST2GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,HOST2GUC_ACTION_DEALLOCATE_DOORBELL =0x20 , +HOST2GUC_ACTION_ENTER_S_STATE =0x501 , +HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 ,HOST2GUC_ACTION_LIMIT };drivers/gpu/drm/i915/intel_guc_loader.c +0
-1@@ -379,7 +379,6 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));direct_interrupts_to_host (dev_priv); -i915_guc_submission_disable (dev);if (guc_fw->guc_fw_fetch_status ==GUC_FIRMWARE_NONE )return 0 ;
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_ucode_load(struct drm_device *dev) · line 436
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0@@ -429,6 +428,9 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));if (i915.enable_guc_submission) { +/* The execbuf_client will be recreated. Release it first. */ +i915_guc_submission_disable (dev); + err =i915_guc_submission_enable (dev);if (err) goto fail;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 16 lines · Sagar A
Reviewed-by Sagar Arun Kamble <[email protected]>Quoted 13 lines · On 9/30/2015 10:16 PM, [email protected] wrote:
From: Alex Dai <[email protected]>
Add host2guc interface to notify GuC power state changes when enter or resume from power saving state.
v3: Move
intel_guc_suspendtoi915_drm_suspendfor consistency.v2: Add GuC suspend/resume to runtime suspend/resume too
v1: Change to a more flexible way when fill host to GuC scratch data in order to remove hard coding.
Signed-off-by Alex Dai <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 158 lines
Quoted 145 lines
--- drivers/gpu/drm/i915/i915_drv.c | 8 +++++ drivers/gpu/drm/i915/i915_guc_submission.c | 50 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ drivers/gpu/drm/i915/intel_guc_fwif.h | 8 +++++ drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++- 5 files changed, 71 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +8
-0@@ -638,6 +638,8 @@ static int i915_drm_suspend(struct drm_device *dev)return error; } +intel_guc_suspend (dev); +intel_suspend_gt_powersave (dev);/* @@ -767,6 +769,8 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); +intel_guc_resume (dev); +intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);@@ -1500,6 +1504,8 @@ static int intel_runtime_suspend(struct device *device)i915_gem_release_all_mmaps (dev_priv);mutex_unlock (&dev->struct_mutex); +intel_guc_suspend (dev); +intel_suspend_gt_powersave (dev);intel_runtime_pm_disable_interrupts (dev_priv);@@ -1559,6 +1565,8 @@ static int intel_runtime_resume(struct device *device)intel_opregion_notify_adapter (dev,PCI_D0 ); dev_priv->pm.suspended = false; +intel_guc_resume (dev); +if (IS_GEN6 (dev_priv))intel_init_pch_refclk (dev);drivers/gpu/drm/i915/i915_guc_submission.c +50
-0@@ -923,3 +923,53 @@ void i915_guc_submission_fini(struct drm_device *dev)gem_release_guc_obj (guc->ctx_pool_obj); guc->ctx_pool_obj =NULL ; } + +/** +* intel_guc_suspend() - notify GuC entering suspend state +* @dev: drm device +*/ +int intel_guc_suspend (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct intel_context *ctx; +u32 data[3 ]; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->ring[RCS ].default_context; + + data[0 ] =HOST2GUC_ACTION_ENTER_S_STATE ; +/* any value greater than GUC_POWER_D0 */ + data[1 ] =GUC_POWER_D1 ; +/* first page is shared data with GuC */ + data[2 ] =i915_gem_obj_ggtt_offset (ctx->engine[RCS ].state); + +return host2guc_action (guc, data,ARRAY_SIZE (data)); +} + + +/** +* intel_guc_resume() - notify GuC resuming from suspend state +* @dev: drm device +*/ +int intel_guc_resume (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_guc *guc = &dev_priv->guc; +struct intel_context *ctx; +u32 data[3 ]; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->ring[RCS ].default_context; + + data[0 ] =HOST2GUC_ACTION_EXIT_S_STATE ; + data[1 ] =GUC_POWER_D0 ; +/* first page is shared data with GuC */ + data[2 ] =i915_gem_obj_ggtt_offset (ctx->engine[RCS ].state); + +return host2guc_action (guc, data,ARRAY_SIZE (data)); +}drivers/gpu/drm/i915/intel_guc.h +2
-0@@ -116,6 +116,8 @@ extern void intel_guc_ucode_init(struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);extern void intel_guc_ucode_fini (struct drm_device *dev);extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern int intel_guc_suspend (struct drm_device *dev); +extern int intel_guc_resume (struct drm_device *dev);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_device *dev);drivers/gpu/drm/i915/intel_guc_fwif.h +8
-0@@ -293,12 +293,20 @@ struct guc_context_desc {#define GUC_FORCEWAKE_RENDER (1 << 0)#define GUC_FORCEWAKE_MEDIA (1 << 1) +#define GUC_POWER_UNSPECIFIED 0 +#define GUC_POWER_D0 1 +#define GUC_POWER_D1 2 +#define GUC_POWER_D2 3 +#define GUC_POWER_D3 4 +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,HOST2GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,HOST2GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,HOST2GUC_ACTION_DEALLOCATE_DOORBELL =0x20 , +HOST2GUC_ACTION_ENTER_S_STATE =0x501 , +HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 ,HOST2GUC_ACTION_LIMIT };drivers/gpu/drm/i915/intel_guc_loader.c +0
-1@@ -379,7 +379,6 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));direct_interrupts_to_host (dev_priv); -i915_guc_submission_disable (dev);if (guc_fw->guc_fw_fetch_status ==GUC_FIRMWARE_NONE )return 0 ;drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_ucode_load(struct drm_device *dev) · line 435
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0@@ -429,6 +428,9 @@ int intel_guc_ucode_load(struct drm_device *dev) intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));if (i915.enable_guc_submission) { +/* The execbuf_client will be recreated. Release it first. */ +i915_guc_submission_disable (dev); + err =i915_guc_submission_enable (dev);if (err) goto fail;_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx