diff mbox series

[2/2] drm/i915/icl/dsi: Fix port disable sequence

Message ID 1553076539-12556-2-git-send-email-vandita.kulkarni@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915/icl/dsi: Ungate clocks if gated | expand

Commit Message

Kulkarni, Vandita March 20, 2019, 10:08 a.m. UTC
Re-enable clock gating of DDI clocks.

Fixes: 1026bea00381 (drm/i915/icl: Ungate DSI clocks)
Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
---
 drivers/gpu/drm/i915/icl_dsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Imre Deak March 20, 2019, 11:07 a.m. UTC | #1
On Wed, Mar 20, 2019 at 03:38:59PM +0530, Vandita Kulkarni wrote:
> Re-enable clock gating of DDI clocks.
> 
> Fixes: 1026bea00381 (drm/i915/icl: Ungate DSI clocks)
> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
> ---
>  drivers/gpu/drm/i915/icl_dsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c
> index f02504d..716be38 100644
> --- a/drivers/gpu/drm/i915/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/icl_dsi.c
> @@ -1125,7 +1125,7 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)
>  			DRM_ERROR("DDI port:%c buffer not idle\n",
>  				  port_name(port));
>  	}
> -	gen11_dsi_ungate_clocks(encoder);
> +	gen11_dsi_gate_clocks(encoder);

This also requires updating icl_sanitize_encoder_pll_mapping().
Currently it assumes that the DDI clock needs to be ungated if the
corresponding DSI port is disabled and gated if the port is enabled.

The changes in this patchset mean that the DDI clock should be gated for
DSI ports regardless of whether the port is enabled or not.
 
>  }
>  
>  static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Shankar, Uma March 20, 2019, 12:02 p.m. UTC | #2
>-----Original Message-----
>From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of Imre
>Deak
>Sent: Wednesday, March 20, 2019 4:38 PM
>To: Kulkarni, Vandita <vandita.kulkarni@intel.com>
>Cc: Nikula, Jani <jani.nikula@intel.com>; intel-gfx@lists.freedesktop.org
>Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/icl/dsi: Fix port disable sequence

You can drop the dsi from drm/i915/icl/. Add at description or commit header. Like
drm/i915/icl: Fix DSI port disable sequence

>
>On Wed, Mar 20, 2019 at 03:38:59PM +0530, Vandita Kulkarni wrote:
>> Re-enable clock gating of DDI clocks.
>>
>> Fixes: 1026bea00381 (drm/i915/icl: Ungate DSI clocks)
>> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
>> ---
>>  drivers/gpu/drm/i915/icl_dsi.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/icl_dsi.c
>> b/drivers/gpu/drm/i915/icl_dsi.c index f02504d..716be38 100644
>> --- a/drivers/gpu/drm/i915/icl_dsi.c
>> +++ b/drivers/gpu/drm/i915/icl_dsi.c
>> @@ -1125,7 +1125,7 @@ static void gen11_dsi_disable_port(struct intel_encoder
>*encoder)
>>  			DRM_ERROR("DDI port:%c buffer not idle\n",
>>  				  port_name(port));
>>  	}
>> -	gen11_dsi_ungate_clocks(encoder);
>> +	gen11_dsi_gate_clocks(encoder);
>
>This also requires updating icl_sanitize_encoder_pll_mapping().
>Currently it assumes that the DDI clock needs to be ungated if the corresponding DSI
>port is disabled and gated if the port is enabled.
>
>The changes in this patchset mean that the DDI clock should be gated for DSI ports
>regardless of whether the port is enabled or not.

I agree. This change look fine, but there is an issue there with 
icl_sanitize_encoder_pll_mapping. 

>>  }
>>
>>  static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Kulkarni, Vandita March 21, 2019, 1:56 p.m. UTC | #3
> -----Original Message-----
> From: Deak, Imre
> Sent: Wednesday, March 20, 2019 4:38 PM
> To: Kulkarni, Vandita <vandita.kulkarni@intel.com>
> Cc: intel-gfx@lists.freedesktop.org; Nikula, Jani <jani.nikula@intel.com>
> Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/icl/dsi: Fix port disable sequence
> 
> On Wed, Mar 20, 2019 at 03:38:59PM +0530, Vandita Kulkarni wrote:
> > Re-enable clock gating of DDI clocks.
> >
> > Fixes: 1026bea00381 (drm/i915/icl: Ungate DSI clocks)
> > Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
> > ---
> >  drivers/gpu/drm/i915/icl_dsi.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/icl_dsi.c
> > b/drivers/gpu/drm/i915/icl_dsi.c index f02504d..716be38 100644
> > --- a/drivers/gpu/drm/i915/icl_dsi.c
> > +++ b/drivers/gpu/drm/i915/icl_dsi.c
> > @@ -1125,7 +1125,7 @@ static void gen11_dsi_disable_port(struct
> intel_encoder *encoder)
> >  			DRM_ERROR("DDI port:%c buffer not idle\n",
> >  				  port_name(port));
> >  	}
> > -	gen11_dsi_ungate_clocks(encoder);
> > +	gen11_dsi_gate_clocks(encoder);
> 
> This also requires updating icl_sanitize_encoder_pll_mapping().

Thank you. Will send the fix in v2.
-Vandita

> Currently it assumes that the DDI clock needs to be ungated if the corresponding
> DSI port is disabled and gated if the port is enabled.
> 
> The changes in this patchset mean that the DDI clock should be gated for DSI
> ports regardless of whether the port is enabled or not.

> 
> >  }
> >
> >  static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)
> > --
> > 1.9.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Kulkarni, Vandita March 21, 2019, 1:57 p.m. UTC | #4
> -----Original Message-----
> From: Shankar, Uma
> Sent: Wednesday, March 20, 2019 5:32 PM
> To: Deak, Imre <imre.deak@intel.com>; Kulkarni, Vandita
> <vandita.kulkarni@intel.com>
> Cc: Nikula, Jani <jani.nikula@intel.com>; intel-gfx@lists.freedesktop.org
> Subject: RE: [Intel-gfx] [PATCH 2/2] drm/i915/icl/dsi: Fix port disable sequence
> 
> 
> 
> >-----Original Message-----
> >From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On
> >Behalf Of Imre Deak
> >Sent: Wednesday, March 20, 2019 4:38 PM
> >To: Kulkarni, Vandita <vandita.kulkarni@intel.com>
> >Cc: Nikula, Jani <jani.nikula@intel.com>;
> >intel-gfx@lists.freedesktop.org
> >Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/icl/dsi: Fix port disable
> >sequence
> 
> You can drop the dsi from drm/i915/icl/. Add at description or commit header.
> Like
> drm/i915/icl: Fix DSI port disable sequence
Okay. 
> 
> >
> >On Wed, Mar 20, 2019 at 03:38:59PM +0530, Vandita Kulkarni wrote:
> >> Re-enable clock gating of DDI clocks.
> >>
> >> Fixes: 1026bea00381 (drm/i915/icl: Ungate DSI clocks)
> >> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/icl_dsi.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/icl_dsi.c
> >> b/drivers/gpu/drm/i915/icl_dsi.c index f02504d..716be38 100644
> >> --- a/drivers/gpu/drm/i915/icl_dsi.c
> >> +++ b/drivers/gpu/drm/i915/icl_dsi.c
> >> @@ -1125,7 +1125,7 @@ static void gen11_dsi_disable_port(struct
> >> intel_encoder
> >*encoder)
> >>  			DRM_ERROR("DDI port:%c buffer not idle\n",
> >>  				  port_name(port));
> >>  	}
> >> -	gen11_dsi_ungate_clocks(encoder);
> >> +	gen11_dsi_gate_clocks(encoder);
> >
> >This also requires updating icl_sanitize_encoder_pll_mapping().
> >Currently it assumes that the DDI clock needs to be ungated if the
> >corresponding DSI port is disabled and gated if the port is enabled.
> >
> >The changes in this patchset mean that the DDI clock should be gated
> >for DSI ports regardless of whether the port is enabled or not.
> 
> I agree. This change look fine, but there is an issue there with
> icl_sanitize_encoder_pll_mapping.

Thank you. Will send the fix in V2.
-Vandita
> 
> >>  }
> >>
> >>  static void gen11_dsi_disable_io_power(struct intel_encoder
> >> *encoder)
> >> --
> >> 1.9.1
> >>
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >_______________________________________________
> >Intel-gfx mailing list
> >Intel-gfx@lists.freedesktop.org
> >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c
index f02504d..716be38 100644
--- a/drivers/gpu/drm/i915/icl_dsi.c
+++ b/drivers/gpu/drm/i915/icl_dsi.c
@@ -1125,7 +1125,7 @@  static void gen11_dsi_disable_port(struct intel_encoder *encoder)
 			DRM_ERROR("DDI port:%c buffer not idle\n",
 				  port_name(port));
 	}
-	gen11_dsi_ungate_clocks(encoder);
+	gen11_dsi_gate_clocks(encoder);
 }
 
 static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)