drm/i915/guc: Media domain bit needed when notify GuC rc6 state
Subsystems (2)
PATCH 1/1 drm/i915/guc: Media domain bit needed when notify GuC rc6 state
From: Alex Dai <[email protected]>
GuC expects two bits for Render and Media domain separately when driver sends data via host2guc SAMPLE_FORCEWAKE. Bit 0 is for Render and bit 1 is for Media domain.
v2: Keep sync with code for WaRsDoubleRc6WrlWithCoarsePowerGating
v1: Add parameters definition to avoid magic value
--- drivers/gpu/drm/i915/i915_guc_submission.c | 13 +++++++++++-- drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +11 -2
@@ -155,12 +155,21 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, struct i915_guc_client *client) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); +struct drm_device *dev = dev_priv->dev;u32 data[2 ]; data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ; - data[1 ] = (intel_enable_rc6 (dev_priv->dev)) ?1 :0 ; +/* WaRsDisableCoarsePowerGating:skl,bxt */ +if (!intel_enable_rc6 (dev_priv->dev) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || + (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) + data[1 ] =0 ; +else +/* bit 0 and 1 are for Render and Media domain separately */ + data[1 ] =GUC_FORCEWAKE_RENDER |GUC_FORCEWAKE_MEDIA ; -return host2guc_action (guc, data,2 ); +return host2guc_action (guc, data,ARRAY_SIZE (data)); }/*
drivers/gpu/drm/i915/intel_guc_fwif.h +3 -0
@@ -296,6 +296,9 @@ struct guc_context_desc {#define GUC_POWER_D2 3#define GUC_POWER_D3 4 +#define GUC_FORCEWAKE_RENDER (1 << 0) +#define GUC_FORCEWAKE_MEDIA (1 << 1) +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · On Fri, Sep 25, 2015 at 11:46:56AM -0700, [email protected] wrote:
From: Alex Dai <[email protected]>
GuC expects two bits for Render and Media domain separately when driver sends data via host2guc
SAMPLE_FORCEWAKE. Bit 0 is for Render and bit 1 is for Media domain.v2: Keep sync with code for WaRsDoubleRc6WrlWithCoarsePowerGating
v1: Add parameters definition to avoid magic value
Signed-off-by Alex Dai <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/i915/i915_guc_submission.c | 13 +++++++++++-- drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_guc_submission.c +11
-2@@ -155,12 +155,21 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, struct i915_guc_client *client) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); +struct drm_device *dev = dev_priv->dev;u32 data[2 ]; data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ; - data[1 ] = (intel_enable_rc6 (dev_priv->dev)) ?1 :0 ; +/* WaRsDisableCoarsePowerGating:skl,bxt */ +if (!intel_enable_rc6 (dev_priv->dev) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || + (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) + data[1 ] =0 ; +else +/* bit 0 and 1 are for Render and Media domain separately */ + data[1 ] =GUC_FORCEWAKE_RENDER |GUC_FORCEWAKE_MEDIA ; -return host2guc_action (guc, data,2 ); +return host2guc_action (guc, data,ARRAY_SIZE (data)); }/* drivers/gpu/drm/i915/intel_guc_fwif.h +3
-0@@ -296,6 +296,9 @@ struct guc_context_desc {#define GUC_POWER_D2 3#define GUC_POWER_D3 4 +#define GUC_FORCEWAKE_RENDER (1 << 0) +#define GUC_FORCEWAKE_MEDIA (1 << 1) +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,Signature · 6 lines
1.9.1 _______________________________________________ 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
Daniel Vetter
AppliedQuoted 7 lines · Tom
Quoted 6 lines · On Fri, Sep 25, 2015 at 11:46:56AM -0700, [email protected] wrote:
From: Alex Dai <[email protected]>
GuC expects two bits for Render and Media domain separately when driver sends data via host2guc
SAMPLE_FORCEWAKE. Bit 0 is for Render and bit 1 is for Media domain.
Quoted 7 lines
Quoted 5 lines
v2: Keep sync with code for WaRsDoubleRc6WrlWithCoarsePowerGating
v1: Add parameters definition to avoid magic value
Signed-off-by Alex Dai <[email protected]>Reviewed-by Tom O'Rourke <Tom.O'[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 59 lines
Quoted 55 lines
--- drivers/gpu/drm/i915/i915_guc_submission.c | 13 +++++++++++-- drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_guc_submission.c +11
-2@@ -155,12 +155,21 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, struct i915_guc_client *client) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); +struct drm_device *dev = dev_priv->dev;u32 data[2 ]; data[0 ] =HOST2GUC_ACTION_SAMPLE_FORCEWAKE ; - data[1 ] = (intel_enable_rc6 (dev_priv->dev)) ?1 :0 ; +/* WaRsDisableCoarsePowerGating:skl,bxt */ +if (!intel_enable_rc6 (dev_priv->dev) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) <BXT_REVID_B0 )) || + (IS_SKL_GT3 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 )) || + (IS_SKL_GT4 (dev) && (INTEL_REVID (dev) <=SKL_REVID_E0 ))) + data[1 ] =0 ; +else +/* bit 0 and 1 are for Render and Media domain separately */ + data[1 ] =GUC_FORCEWAKE_RENDER |GUC_FORCEWAKE_MEDIA ; -return host2guc_action (guc, data,2 ); +return host2guc_action (guc, data,ARRAY_SIZE (data)); }/* drivers/gpu/drm/i915/intel_guc_fwif.h +3
-0@@ -296,6 +296,9 @@ struct guc_context_desc {#define GUC_POWER_D2 3#define GUC_POWER_D3 4 +#define GUC_FORCEWAKE_RENDER (1 << 0) +#define GUC_FORCEWAKE_MEDIA (1 << 1) +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum host2guc_action {HOST2GUC_ACTION_DEFAULT =0x0 ,Signature · 6 lines
1.9.1 _______________________________________________ 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
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