drm/i915/icl: Fix DC9 Suspend for ICL.
diff mbox series

Message ID 20181031202726.4021-1-anusha.srivatsa@intel.com
State New
Headers show
Series
  • drm/i915/icl: Fix DC9 Suspend for ICL.
Related show

Commit Message

Srivatsa, Anusha Oct. 31, 2018, 8:27 p.m. UTC
Fixes: 3e68928b7d4c ("drm/i915/icl: Enable DC9 as lowest possible state during screen-off")

Cc: Imre Deak <imre.deak@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Animesh Manna <animesh.manna@intel.com>
Cc: James Ausmus <james.ausmus@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rodrigo Vivi Oct. 31, 2018, 9:15 p.m. UTC | #1
On Wed, Oct 31, 2018 at 01:27:26PM -0700, Anusha Srivatsa wrote:

I intend to modify this commit message while merging with the following:

Add missing block that takes care of inline intel_suspend_complete
for DC9 on ICL.

Daniele noticed this was part of original patch but missed on
on merged commit ("drm/i915/icl: Enable DC9 as lowest possible
 state during screen-off").

With this or something like this:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

(But if my proposed message is not ok, please send a v2)

> Fixes: 3e68928b7d4c ("drm/i915/icl: Enable DC9 as lowest possible state during screen-off")
>

^ remove this empty line

> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Animesh Manna <animesh.manna@intel.com>
> Cc: James Ausmus <james.ausmus@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 198d625f2871..acb516308262 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1962,7 +1962,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
>  				    get_suspend_mode(dev_priv, hibernation));
>  
>  	ret = 0;
> -	if (IS_GEN9_LP(dev_priv))
> +	if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv))
>  		bxt_enable_dc9(dev_priv);
>  	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
>  		hsw_enable_pc8(dev_priv);
> -- 
> 2.17.1
>
Rodrigo Vivi Nov. 1, 2018, 6:22 p.m. UTC | #2
On Wed, Oct 31, 2018 at 02:15:09PM -0700, Rodrigo Vivi wrote:
> On Wed, Oct 31, 2018 at 01:27:26PM -0700, Anusha Srivatsa wrote:
> 
> I intend to modify this commit message while merging with the following:
> 
> Add missing block that takes care of inline intel_suspend_complete
> for DC9 on ICL.
> 
> Daniele noticed this was part of original patch but missed on
> on merged commit ("drm/i915/icl: Enable DC9 as lowest possible
>  state during screen-off").
> 
> With this or something like this:
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> (But if my proposed message is not ok, please send a v2)
> 
> > Fixes: 3e68928b7d4c ("drm/i915/icl: Enable DC9 as lowest possible state during screen-off")
> >
> 
> ^ remove this empty line

added commit message while pushing.

pushed to dinq, thanks for the patch and for report.

> 
> > Cc: Imre Deak <imre.deak@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Animesh Manna <animesh.manna@intel.com>
> > Cc: James Ausmus <james.ausmus@intel.com>
> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index 198d625f2871..acb516308262 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -1962,7 +1962,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
> >  				    get_suspend_mode(dev_priv, hibernation));
> >  
> >  	ret = 0;
> > -	if (IS_GEN9_LP(dev_priv))
> > +	if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv))
> >  		bxt_enable_dc9(dev_priv);
> >  	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> >  		hsw_enable_pc8(dev_priv);
> > -- 
> > 2.17.1
> > 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 198d625f2871..acb516308262 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1962,7 +1962,7 @@  static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
 				    get_suspend_mode(dev_priv, hibernation));
 
 	ret = 0;
-	if (IS_GEN9_LP(dev_priv))
+	if (INTEL_GEN(dev_priv) >= 11 || IS_GEN9_LP(dev_priv))
 		bxt_enable_dc9(dev_priv);
 	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
 		hsw_enable_pc8(dev_priv);