Re: [Intel-gfx] [PATCH 1/2] drm/i915: introduce dp_to_i915() helper

2018-08-28 Thread Rodrigo Vivi 
On Tue, Aug 28, 2018 at 03:43:28PM +0300, Ville Syrjälä wrote:
> On Mon, Aug 27, 2018 at 03:30:20PM -0700, Rodrigo Vivi wrote:
> > No functional change. But let's get first i915 pointer
> > directly from intel_dp so we can clean up a lot of code
> > later.
> 
> Pretty sure I have a cocci script for this somewhere, just never posted
> the results :)

a script would be easier indeed specially consider possible internal
conflict on rebasing.

but anyway let it be now...

> 
> But manual conversion works fine too, so
> Reviewed-by: Ville Syrjälä 

... pushed, thanks

> 
> > 
> > Signed-off-by: Rodrigo Vivi 
> > ---
> >  drivers/gpu/drm/i915/intel_dp.c  | 109 +++
> >  drivers/gpu/drm/i915/intel_drv.h |   6 ++
> >  2 files changed, 57 insertions(+), 58 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c 
> > b/drivers/gpu/drm/i915/intel_dp.c
> > index db8515171270..436c22de33b6 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -107,13 +107,6 @@ bool intel_dp_is_edp(struct intel_dp *intel_dp)
> > return intel_dig_port->base.type == INTEL_OUTPUT_EDP;
> >  }
> >  
> > -static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp)
> > -{
> > -   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > -
> > -   return intel_dig_port->base.base.dev;
> > -}
> > -
> >  static struct intel_dp *intel_attached_dp(struct drm_connector *connector)
> >  {
> > return enc_to_intel_dp(_attached_encoder(connector)->base);
> > @@ -232,7 +225,7 @@ intel_dp_link_required(int pixel_clock, int bpp)
> >  void icl_program_mg_dp_mode(struct intel_dp *intel_dp)
> >  {
> > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > enum port port = intel_dig_port->base.port;
> > enum tc_port tc_port = intel_port_to_tc(dev_priv, port);
> > u32 ln0, ln1, lane_info;
> > @@ -661,7 +654,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);
> >  
> >  static void pps_lock(struct intel_dp *intel_dp)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> >  
> > /*
> >  * See intel_power_sequencer_reset() why we need
> > @@ -674,7 +667,7 @@ static void pps_lock(struct intel_dp *intel_dp)
> >  
> >  static void pps_unlock(struct intel_dp *intel_dp)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> >  
> > mutex_unlock(_priv->pps_mutex);
> >  
> > @@ -684,7 +677,7 @@ static void pps_unlock(struct intel_dp *intel_dp)
> >  static void
> >  vlv_power_sequencer_kick(struct intel_dp *intel_dp)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > enum pipe pipe = intel_dp->pps_pipe;
> > bool pll_enabled, release_cl_override = false;
> > @@ -789,7 +782,7 @@ static enum pipe vlv_find_free_pps(struct 
> > drm_i915_private *dev_priv)
> >  static enum pipe
> >  vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > enum pipe pipe;
> >  
> > @@ -836,7 +829,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
> >  static int
> >  bxt_power_sequencer_idx(struct intel_dp *intel_dp)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > int backlight_controller = dev_priv->vbt.backlight.controller;
> >  
> > lockdep_assert_held(_priv->pps_mutex);
> > @@ -905,7 +898,7 @@ vlv_initial_pps_pipe(struct drm_i915_private *dev_priv,
> >  static void
> >  vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > enum port port = intel_dig_port->base.port;
> >  
> > @@ -982,7 +975,7 @@ struct pps_registers {
> >  static void intel_pps_get_registers(struct intel_dp *intel_dp,
> > struct pps_registers *regs)
> >  {
> > -   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> > +   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
> > int pps_idx = 0;
> >  
> > memset(regs, 0, sizeof(*regs));
> > @@ -1028,7 +1021,7 @@ static int

Re: [Intel-gfx] [PATCH 1/2] drm/i915: introduce dp_to_i915() helper

2018-08-28 Thread Ville Syrjälä 
On Mon, Aug 27, 2018 at 03:30:20PM -0700, Rodrigo Vivi wrote:
> No functional change. But let's get first i915 pointer
> directly from intel_dp so we can clean up a lot of code
> later.

Pretty sure I have a cocci script for this somewhere, just never posted
the results :)

But manual conversion works fine too, so
Reviewed-by: Ville Syrjälä 

> 
> Signed-off-by: Rodrigo Vivi 
> ---
>  drivers/gpu/drm/i915/intel_dp.c  | 109 +++
>  drivers/gpu/drm/i915/intel_drv.h |   6 ++
>  2 files changed, 57 insertions(+), 58 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index db8515171270..436c22de33b6 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -107,13 +107,6 @@ bool intel_dp_is_edp(struct intel_dp *intel_dp)
>   return intel_dig_port->base.type == INTEL_OUTPUT_EDP;
>  }
>  
> -static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp)
> -{
> - struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> -
> - return intel_dig_port->base.base.dev;
> -}
> -
>  static struct intel_dp *intel_attached_dp(struct drm_connector *connector)
>  {
>   return enc_to_intel_dp(_attached_encoder(connector)->base);
> @@ -232,7 +225,7 @@ intel_dp_link_required(int pixel_clock, int bpp)
>  void icl_program_mg_dp_mode(struct intel_dp *intel_dp)
>  {
>   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>   enum port port = intel_dig_port->base.port;
>   enum tc_port tc_port = intel_port_to_tc(dev_priv, port);
>   u32 ln0, ln1, lane_info;
> @@ -661,7 +654,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);
>  
>  static void pps_lock(struct intel_dp *intel_dp)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>  
>   /*
>* See intel_power_sequencer_reset() why we need
> @@ -674,7 +667,7 @@ static void pps_lock(struct intel_dp *intel_dp)
>  
>  static void pps_unlock(struct intel_dp *intel_dp)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>  
>   mutex_unlock(_priv->pps_mutex);
>  
> @@ -684,7 +677,7 @@ static void pps_unlock(struct intel_dp *intel_dp)
>  static void
>  vlv_power_sequencer_kick(struct intel_dp *intel_dp)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
>   enum pipe pipe = intel_dp->pps_pipe;
>   bool pll_enabled, release_cl_override = false;
> @@ -789,7 +782,7 @@ static enum pipe vlv_find_free_pps(struct 
> drm_i915_private *dev_priv)
>  static enum pipe
>  vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
>   enum pipe pipe;
>  
> @@ -836,7 +829,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
>  static int
>  bxt_power_sequencer_idx(struct intel_dp *intel_dp)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>   int backlight_controller = dev_priv->vbt.backlight.controller;
>  
>   lockdep_assert_held(_priv->pps_mutex);
> @@ -905,7 +898,7 @@ vlv_initial_pps_pipe(struct drm_i915_private *dev_priv,
>  static void
>  vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
>   enum port port = intel_dig_port->base.port;
>  
> @@ -982,7 +975,7 @@ struct pps_registers {
>  static void intel_pps_get_registers(struct intel_dp *intel_dp,
>   struct pps_registers *regs)
>  {
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>   int pps_idx = 0;
>  
>   memset(regs, 0, sizeof(*regs));
> @@ -1028,7 +1021,7 @@ static int edp_notify_handler(struct notifier_block 
> *this, unsigned long code,
>  {
>   struct intel_dp *intel_dp = container_of(this, typeof(* intel_dp),
>edp_notifier);
> - struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
> + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>

[Intel-gfx] [PATCH 1/2] drm/i915: introduce dp_to_i915() helper

2018-08-27 Thread Rodrigo Vivi 
No functional change. But let's get first i915 pointer
directly from intel_dp so we can clean up a lot of code
later.

Signed-off-by: Rodrigo Vivi 
---
 drivers/gpu/drm/i915/intel_dp.c  | 109 +++
 drivers/gpu/drm/i915/intel_drv.h |   6 ++
 2 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index db8515171270..436c22de33b6 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -107,13 +107,6 @@ bool intel_dp_is_edp(struct intel_dp *intel_dp)
return intel_dig_port->base.type == INTEL_OUTPUT_EDP;
 }
 
-static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp)
-{
-   struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-
-   return intel_dig_port->base.base.dev;
-}
-
 static struct intel_dp *intel_attached_dp(struct drm_connector *connector)
 {
return enc_to_intel_dp(_attached_encoder(connector)->base);
@@ -232,7 +225,7 @@ intel_dp_link_required(int pixel_clock, int bpp)
 void icl_program_mg_dp_mode(struct intel_dp *intel_dp)
 {
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
enum port port = intel_dig_port->base.port;
enum tc_port tc_port = intel_port_to_tc(dev_priv, port);
u32 ln0, ln1, lane_info;
@@ -661,7 +654,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);
 
 static void pps_lock(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 
/*
 * See intel_power_sequencer_reset() why we need
@@ -674,7 +667,7 @@ static void pps_lock(struct intel_dp *intel_dp)
 
 static void pps_unlock(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 
mutex_unlock(_priv->pps_mutex);
 
@@ -684,7 +677,7 @@ static void pps_unlock(struct intel_dp *intel_dp)
 static void
 vlv_power_sequencer_kick(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
enum pipe pipe = intel_dp->pps_pipe;
bool pll_enabled, release_cl_override = false;
@@ -789,7 +782,7 @@ static enum pipe vlv_find_free_pps(struct drm_i915_private 
*dev_priv)
 static enum pipe
 vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
enum pipe pipe;
 
@@ -836,7 +829,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
 static int
 bxt_power_sequencer_idx(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
int backlight_controller = dev_priv->vbt.backlight.controller;
 
lockdep_assert_held(_priv->pps_mutex);
@@ -905,7 +898,7 @@ vlv_initial_pps_pipe(struct drm_i915_private *dev_priv,
 static void
 vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
enum port port = intel_dig_port->base.port;
 
@@ -982,7 +975,7 @@ struct pps_registers {
 static void intel_pps_get_registers(struct intel_dp *intel_dp,
struct pps_registers *regs)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
int pps_idx = 0;
 
memset(regs, 0, sizeof(*regs));
@@ -1028,7 +1021,7 @@ static int edp_notify_handler(struct notifier_block 
*this, unsigned long code,
 {
struct intel_dp *intel_dp = container_of(this, typeof(* intel_dp),
 edp_notifier);
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+   struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 
if (!intel_dp_is_edp(intel_dp) || code != SYS_RESTART)
return 0;
@@ -1058,7 +1051,7 @@ static int edp_notify_handler(struct notifier_block 
*this, unsigned long code,
 
 static bool edp_have_panel_power(struct intel_dp *intel_dp)
 {
-   struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
+