Re: [Intel-gfx] [PATCH 5/5] drm/i915/fdi: move intel_fdi_link_freq() to intel_fdi.[ch]

2021-08-20 Thread Jani Nikula 
On Thu, 19 Aug 2021, Ville Syrjälä  wrote:
> On Wed, Aug 18, 2021 at 01:11:09PM +0300, Jani Nikula wrote:
>> There's no performance reason to have it as static inline; move it out
>> of intel_display_types.h to reduce clutter and dependency on i915_drv.h.
>> 
>> Signed-off-by: Jani Nikula 
>> ---
>>  drivers/gpu/drm/i915/display/intel_display_types.h | 9 -
>>  drivers/gpu/drm/i915/display/intel_fdi.c   | 9 +
>>  drivers/gpu/drm/i915/display/intel_fdi.h   | 4 
>>  3 files changed, 13 insertions(+), 9 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
>> b/drivers/gpu/drm/i915/display/intel_display_types.h
>> index 7b5d7b1ae501..c2725d07b930 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
>> @@ -2040,15 +2040,6 @@ static inline u32 i9xx_dpll_compute_fp(struct dpll 
>> *dpll)
>>  return dpll->n << 16 | dpll->m1 << 8 | dpll->m2;
>>  }
>>  
>> -static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,
>> -  const struct intel_crtc_state 
>> *pipe_config)
>> -{
>> -if (HAS_DDI(dev_priv))
>> -return pipe_config->port_clock; /* SPLL */
>> -else
>> -return dev_priv->fdi_pll_freq;
>> -}
>> -
>>  static inline bool is_ccs_modifier(u64 modifier)
>>  {
>>  return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
>> diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c 
>> b/drivers/gpu/drm/i915/display/intel_fdi.c
>> index e10b9cd8e86e..970a57369b05 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fdi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_fdi.c
>> @@ -95,6 +95,15 @@ static int ilk_check_fdi_lanes(struct drm_device *dev, 
>> enum pipe pipe,
>>  }
>>  }
>>  
>> +u32 intel_fdi_link_freq(struct drm_i915_private *i915,
>
> Could just change it to 'int' while at it.

Left this for a future change to avoid the CI run now.

>
> Series is
> Reviewed-by: Ville Syrjälä 

Thanks, pushed.

BR,
Jani.


>
>> +const struct intel_crtc_state *pipe_config)
>> +{
>> +if (HAS_DDI(i915))
>> +return pipe_config->port_clock; /* SPLL */
>> +else
>> +return i915->fdi_pll_freq;
>> +}
>> +
>>  int ilk_fdi_compute_config(struct intel_crtc *crtc,
>> struct intel_crtc_state *pipe_config)
>>  {
>> diff --git a/drivers/gpu/drm/i915/display/intel_fdi.h 
>> b/drivers/gpu/drm/i915/display/intel_fdi.h
>> index af01d2c173a8..fd63a6a53fca 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fdi.h
>> +++ b/drivers/gpu/drm/i915/display/intel_fdi.h
>> @@ -6,12 +6,16 @@
>>  #ifndef _INTEL_FDI_H_
>>  #define _INTEL_FDI_H_
>>  
>> +#include 
>> +
>>  struct drm_i915_private;
>>  struct intel_crtc;
>>  struct intel_crtc_state;
>>  struct intel_encoder;
>>  
>>  #define I915_DISPLAY_CONFIG_RETRY 1
>> +u32 intel_fdi_link_freq(struct drm_i915_private *i915,
>> +const struct intel_crtc_state *pipe_config);
>>  int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
>> struct intel_crtc_state *pipe_config);
>>  void intel_fdi_normal_train(struct intel_crtc *crtc);
>> -- 
>> 2.20.1

-- 
Jani Nikula, Intel Open Source Graphics Center

Re: [Intel-gfx] [PATCH 5/5] drm/i915/fdi: move intel_fdi_link_freq() to intel_fdi.[ch]

2021-08-19 Thread Ville Syrjälä 
On Wed, Aug 18, 2021 at 01:11:09PM +0300, Jani Nikula wrote:
> There's no performance reason to have it as static inline; move it out
> of intel_display_types.h to reduce clutter and dependency on i915_drv.h.
> 
> Signed-off-by: Jani Nikula 
> ---
>  drivers/gpu/drm/i915/display/intel_display_types.h | 9 -
>  drivers/gpu/drm/i915/display/intel_fdi.c   | 9 +
>  drivers/gpu/drm/i915/display/intel_fdi.h   | 4 
>  3 files changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
> b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 7b5d7b1ae501..c2725d07b930 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -2040,15 +2040,6 @@ static inline u32 i9xx_dpll_compute_fp(struct dpll 
> *dpll)
>   return dpll->n << 16 | dpll->m1 << 8 | dpll->m2;
>  }
>  
> -static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,
> -   const struct intel_crtc_state 
> *pipe_config)
> -{
> - if (HAS_DDI(dev_priv))
> - return pipe_config->port_clock; /* SPLL */
> - else
> - return dev_priv->fdi_pll_freq;
> -}
> -
>  static inline bool is_ccs_modifier(u64 modifier)
>  {
>   return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c 
> b/drivers/gpu/drm/i915/display/intel_fdi.c
> index e10b9cd8e86e..970a57369b05 100644
> --- a/drivers/gpu/drm/i915/display/intel_fdi.c
> +++ b/drivers/gpu/drm/i915/display/intel_fdi.c
> @@ -95,6 +95,15 @@ static int ilk_check_fdi_lanes(struct drm_device *dev, 
> enum pipe pipe,
>   }
>  }
>  
> +u32 intel_fdi_link_freq(struct drm_i915_private *i915,

Could just change it to 'int' while at it.

Series is
Reviewed-by: Ville Syrjälä 

> + const struct intel_crtc_state *pipe_config)
> +{
> + if (HAS_DDI(i915))
> + return pipe_config->port_clock; /* SPLL */
> + else
> + return i915->fdi_pll_freq;
> +}
> +
>  int ilk_fdi_compute_config(struct intel_crtc *crtc,
>  struct intel_crtc_state *pipe_config)
>  {
> diff --git a/drivers/gpu/drm/i915/display/intel_fdi.h 
> b/drivers/gpu/drm/i915/display/intel_fdi.h
> index af01d2c173a8..fd63a6a53fca 100644
> --- a/drivers/gpu/drm/i915/display/intel_fdi.h
> +++ b/drivers/gpu/drm/i915/display/intel_fdi.h
> @@ -6,12 +6,16 @@
>  #ifndef _INTEL_FDI_H_
>  #define _INTEL_FDI_H_
>  
> +#include 
> +
>  struct drm_i915_private;
>  struct intel_crtc;
>  struct intel_crtc_state;
>  struct intel_encoder;
>  
>  #define I915_DISPLAY_CONFIG_RETRY 1
> +u32 intel_fdi_link_freq(struct drm_i915_private *i915,
> + const struct intel_crtc_state *pipe_config);
>  int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
>  struct intel_crtc_state *pipe_config);
>  void intel_fdi_normal_train(struct intel_crtc *crtc);
> -- 
> 2.20.1

-- 
Ville Syrjälä
Intel

[Intel-gfx] [PATCH 5/5] drm/i915/fdi: move intel_fdi_link_freq() to intel_fdi.[ch]

2021-08-18 Thread Jani Nikula 
There's no performance reason to have it as static inline; move it out
of intel_display_types.h to reduce clutter and dependency on i915_drv.h.

Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/i915/display/intel_display_types.h | 9 -
 drivers/gpu/drm/i915/display/intel_fdi.c   | 9 +
 drivers/gpu/drm/i915/display/intel_fdi.h   | 4 
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
b/drivers/gpu/drm/i915/display/intel_display_types.h
index 7b5d7b1ae501..c2725d07b930 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -2040,15 +2040,6 @@ static inline u32 i9xx_dpll_compute_fp(struct dpll *dpll)
return dpll->n << 16 | dpll->m1 << 8 | dpll->m2;
 }
 
-static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,
- const struct intel_crtc_state 
*pipe_config)
-{
-   if (HAS_DDI(dev_priv))
-   return pipe_config->port_clock; /* SPLL */
-   else
-   return dev_priv->fdi_pll_freq;
-}
-
 static inline bool is_ccs_modifier(u64 modifier)
 {
return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c 
b/drivers/gpu/drm/i915/display/intel_fdi.c
index e10b9cd8e86e..970a57369b05 100644
--- a/drivers/gpu/drm/i915/display/intel_fdi.c
+++ b/drivers/gpu/drm/i915/display/intel_fdi.c
@@ -95,6 +95,15 @@ static int ilk_check_fdi_lanes(struct drm_device *dev, enum 
pipe pipe,
}
 }
 
+u32 intel_fdi_link_freq(struct drm_i915_private *i915,
+   const struct intel_crtc_state *pipe_config)
+{
+   if (HAS_DDI(i915))
+   return pipe_config->port_clock; /* SPLL */
+   else
+   return i915->fdi_pll_freq;
+}
+
 int ilk_fdi_compute_config(struct intel_crtc *crtc,
   struct intel_crtc_state *pipe_config)
 {
diff --git a/drivers/gpu/drm/i915/display/intel_fdi.h 
b/drivers/gpu/drm/i915/display/intel_fdi.h
index af01d2c173a8..fd63a6a53fca 100644
--- a/drivers/gpu/drm/i915/display/intel_fdi.h
+++ b/drivers/gpu/drm/i915/display/intel_fdi.h
@@ -6,12 +6,16 @@
 #ifndef _INTEL_FDI_H_
 #define _INTEL_FDI_H_
 
+#include 
+
 struct drm_i915_private;
 struct intel_crtc;
 struct intel_crtc_state;
 struct intel_encoder;
 
 #define I915_DISPLAY_CONFIG_RETRY 1
+u32 intel_fdi_link_freq(struct drm_i915_private *i915,
+   const struct intel_crtc_state *pipe_config);
 int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
   struct intel_crtc_state *pipe_config);
 void intel_fdi_normal_train(struct intel_crtc *crtc);
-- 
2.20.1