Re: [Intel-gfx] [PATCH] drm/i915/dg2: DG2 intermediate DP source rates are different from CNL+

2021-08-16 Thread Jani Nikula 
On Mon, 16 Aug 2021, Matt Roper  wrote:
> On Fri, Aug 13, 2021 at 03:33:30PM +0300, Jani Nikula wrote:
>> DG2 has 243000 but not 648000.
>
> Am I looking in the wrong place?  When I check the bspec page I still
> see:
>
> eDP/DP link bit rates: 1.62, 2.16, 2.7, 3.24, 4.32, 5.4, 6.48,
> 8.1 GHz, SSC and Non-SSC
>
> which matches the ICL rates list (i.e., 648000 included, but no
> reference to 243000).

I see the same thing. I can see no recent edits on the page either, so I
can only assume I've screwed up something, somehow when I wrote the
patch.

Never mind, and sorry for the noise.

BR,
Jani.



>
>
> Matt
>
>> 
>> Bspec: 54034
>> Signed-off-by: Jani Nikula 
>> ---
>>  drivers/gpu/drm/i915/display/intel_dp.c | 8 +++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
>> b/drivers/gpu/drm/i915/display/intel_dp.c
>> index 75d4ebc66941..e21de08fea32 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> @@ -247,6 +247,9 @@ static void
>>  intel_dp_set_source_rates(struct intel_dp *intel_dp)
>>  {
>>  /* The values must be in increasing order */
>> +static const int dg2_rates[] = {
>> +162000, 216000, 243000, 27, 324000, 432000, 54, 81,
>> +};
>>  static const int icl_rates[] = {
>>  162000, 216000, 27, 324000, 432000, 54, 648000, 81
>>  };
>> @@ -272,7 +275,10 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
>>  drm_WARN_ON(&dev_priv->drm,
>>  intel_dp->source_rates || intel_dp->num_source_rates);
>>  
>> -if (DISPLAY_VER(dev_priv) >= 11) {
>> +if (IS_DG2(dev_priv)) {
>> +source_rates = dg2_rates;
>> +size = ARRAY_SIZE(dg2_rates);
>> +} else if (DISPLAY_VER(dev_priv) >= 11) {
>>  source_rates = icl_rates;
>>  size = ARRAY_SIZE(icl_rates);
>>  if (IS_JSL_EHL(dev_priv))
>> -- 
>> 2.20.1
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center

Re: [Intel-gfx] [PATCH] drm/i915/dg2: DG2 intermediate DP source rates are different from CNL+

2021-08-16 Thread Matt Roper 
On Fri, Aug 13, 2021 at 03:33:30PM +0300, Jani Nikula wrote:
> DG2 has 243000 but not 648000.

Am I looking in the wrong place?  When I check the bspec page I still
see:

eDP/DP link bit rates: 1.62, 2.16, 2.7, 3.24, 4.32, 5.4, 6.48,
8.1 GHz, SSC and Non-SSC

which matches the ICL rates list (i.e., 648000 included, but no
reference to 243000).


Matt

> 
> Bspec: 54034
> Signed-off-by: Jani Nikula 
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 8 +++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index 75d4ebc66941..e21de08fea32 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -247,6 +247,9 @@ static void
>  intel_dp_set_source_rates(struct intel_dp *intel_dp)
>  {
>   /* The values must be in increasing order */
> + static const int dg2_rates[] = {
> + 162000, 216000, 243000, 27, 324000, 432000, 54, 81,
> + };
>   static const int icl_rates[] = {
>   162000, 216000, 27, 324000, 432000, 54, 648000, 81
>   };
> @@ -272,7 +275,10 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
>   drm_WARN_ON(&dev_priv->drm,
>   intel_dp->source_rates || intel_dp->num_source_rates);
>  
> - if (DISPLAY_VER(dev_priv) >= 11) {
> + if (IS_DG2(dev_priv)) {
> + source_rates = dg2_rates;
> + size = ARRAY_SIZE(dg2_rates);
> + } else if (DISPLAY_VER(dev_priv) >= 11) {
>   source_rates = icl_rates;
>   size = ARRAY_SIZE(icl_rates);
>   if (IS_JSL_EHL(dev_priv))
> -- 
> 2.20.1
> 

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795

[Intel-gfx] [PATCH] drm/i915/dg2: DG2 intermediate DP source rates are different from CNL+

2021-08-13 Thread Jani Nikula 
DG2 has 243000 but not 648000.

Bspec: 54034
Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 75d4ebc66941..e21de08fea32 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -247,6 +247,9 @@ static void
 intel_dp_set_source_rates(struct intel_dp *intel_dp)
 {
/* The values must be in increasing order */
+   static const int dg2_rates[] = {
+   162000, 216000, 243000, 27, 324000, 432000, 54, 81,
+   };
static const int icl_rates[] = {
162000, 216000, 27, 324000, 432000, 54, 648000, 81
};
@@ -272,7 +275,10 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
drm_WARN_ON(&dev_priv->drm,
intel_dp->source_rates || intel_dp->num_source_rates);
 
-   if (DISPLAY_VER(dev_priv) >= 11) {
+   if (IS_DG2(dev_priv)) {
+   source_rates = dg2_rates;
+   size = ARRAY_SIZE(dg2_rates);
+   } else if (DISPLAY_VER(dev_priv) >= 11) {
source_rates = icl_rates;
size = ARRAY_SIZE(icl_rates);
if (IS_JSL_EHL(dev_priv))
-- 
2.20.1