diff mbox series

fbdev: mx3fb: avoid warning about psABI change

Message ID 20200408162551.3928330-1-arnd@arndb.de
State Accepted
Commit 3f6c93ec9254b387ad7f8706c32c9d529ac9796e
Headers show
Series fbdev: mx3fb: avoid warning about psABI change | expand

Commit Message

Arnd Bergmann April 8, 2020, 4:25 p.m. UTC 
The arm64 gcc-9 release warns about a change in the calling
conventions:

drivers/video/fbdev/mx3fb.c: In function 'sdc_init_panel':
drivers/video/fbdev/mx3fb.c:506:12: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1
  506 | static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
      |            ^~~~~~~~~~~~~~
drivers/video/fbdev/mx3fb.c: In function '__set_par':
drivers/video/fbdev/mx3fb.c:848:7: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

Change the file to just pass the struct by reference, which is
unambiguous and avoids the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/video/fbdev/mx3fb.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

-- 
2.26.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Laurent Pinchart April 8, 2020, 5:16 p.m. UTC | #1 
Hi Arnd,

Thank you for the patch.

On Wed, Apr 08, 2020 at 06:25:38PM +0200, Arnd Bergmann wrote:
> The arm64 gcc-9 release warns about a change in the calling

> conventions:

> 

> drivers/video/fbdev/mx3fb.c: In function 'sdc_init_panel':

> drivers/video/fbdev/mx3fb.c:506:12: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

>   506 | static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>       |            ^~~~~~~~~~~~~~

> drivers/video/fbdev/mx3fb.c: In function '__set_par':

> drivers/video/fbdev/mx3fb.c:848:7: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

> 

> Change the file to just pass the struct by reference, which is

> unambiguous and avoids the warning.

> 

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/video/fbdev/mx3fb.c | 20 ++++++++++----------

>  1 file changed, 10 insertions(+), 10 deletions(-)

> 

> diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c

> index 4af28e4421e5..e13fea3a292f 100644

> --- a/drivers/video/fbdev/mx3fb.c

> +++ b/drivers/video/fbdev/mx3fb.c

> @@ -509,7 +509,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  			  uint16_t h_start_width, uint16_t h_sync_width,

>  			  uint16_t h_end_width, uint16_t v_start_width,

>  			  uint16_t v_sync_width, uint16_t v_end_width,

> -			  struct ipu_di_signal_cfg sig)

> +			  struct ipu_di_signal_cfg *sig)


How about making it a const pointer ? The current code doesn't change
the contents of the caller's structure as it passes it by value, let's
ensure that stays the same. With this fixed,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


>  {

>  	unsigned long lock_flags;

>  	uint32_t reg;

> @@ -591,17 +591,17 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  

>  	/* DI settings */

>  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF) & 0x78FFFFFF;

> -	old_conf |= sig.datamask_en << DI_D3_DATAMSK_SHIFT |

> -		sig.clksel_en << DI_D3_CLK_SEL_SHIFT |

> -		sig.clkidle_en << DI_D3_CLK_IDLE_SHIFT;

> +	old_conf |= sig->datamask_en << DI_D3_DATAMSK_SHIFT |

> +		sig->clksel_en << DI_D3_CLK_SEL_SHIFT |

> +		sig->clkidle_en << DI_D3_CLK_IDLE_SHIFT;

>  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_IF_CONF);

>  

>  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL) & 0xE0FFFFFF;

> -	old_conf |= sig.data_pol << DI_D3_DATA_POL_SHIFT |

> -		sig.clk_pol << DI_D3_CLK_POL_SHIFT |

> -		sig.enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> -		sig.Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> -		sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

> +	old_conf |= sig->data_pol << DI_D3_DATA_POL_SHIFT |

> +		sig->clk_pol << DI_D3_CLK_POL_SHIFT |

> +		sig->enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> +		sig->Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> +		sig->Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

>  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);

>  

>  	map = &di_mappings[mx3fb->disp_data_fmt];

> @@ -855,7 +855,7 @@ static int __set_par(struct fb_info *fbi, bool lock)

>  				   fbi->var.upper_margin,

>  				   fbi->var.vsync_len,

>  				   fbi->var.lower_margin +

> -				   fbi->var.vsync_len, sig_cfg) != 0) {

> +				   fbi->var.vsync_len, &sig_cfg) != 0) {

>  			dev_err(fbi->device,

>  				"mx3fb: Error initializing panel.\n");

>  			return -EINVAL;


-- 
Regards,

Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Jani Nikula April 8, 2020, 5:20 p.m. UTC | #2 
On Wed, 08 Apr 2020, Arnd Bergmann <arnd@arndb.de> wrote:
> The arm64 gcc-9 release warns about a change in the calling

> conventions:

>

> drivers/video/fbdev/mx3fb.c: In function 'sdc_init_panel':

> drivers/video/fbdev/mx3fb.c:506:12: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

>   506 | static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>       |            ^~~~~~~~~~~~~~

> drivers/video/fbdev/mx3fb.c: In function '__set_par':

> drivers/video/fbdev/mx3fb.c:848:7: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

>

> Change the file to just pass the struct by reference, which is

> unambiguous and avoids the warning.

>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/video/fbdev/mx3fb.c | 20 ++++++++++----------

>  1 file changed, 10 insertions(+), 10 deletions(-)

>

> diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c

> index 4af28e4421e5..e13fea3a292f 100644

> --- a/drivers/video/fbdev/mx3fb.c

> +++ b/drivers/video/fbdev/mx3fb.c

> @@ -509,7 +509,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  			  uint16_t h_start_width, uint16_t h_sync_width,

>  			  uint16_t h_end_width, uint16_t v_start_width,

>  			  uint16_t v_sync_width, uint16_t v_end_width,

> -			  struct ipu_di_signal_cfg sig)

> +			  struct ipu_di_signal_cfg *sig)


I have no idea why get_maintainer.pl (I presume) is Cc'ing me... but
since it is, I'll note that the pointer could be const, while the patch
is

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


either way.

>  {

>  	unsigned long lock_flags;

>  	uint32_t reg;

> @@ -591,17 +591,17 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  

>  	/* DI settings */

>  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF) & 0x78FFFFFF;

> -	old_conf |= sig.datamask_en << DI_D3_DATAMSK_SHIFT |

> -		sig.clksel_en << DI_D3_CLK_SEL_SHIFT |

> -		sig.clkidle_en << DI_D3_CLK_IDLE_SHIFT;

> +	old_conf |= sig->datamask_en << DI_D3_DATAMSK_SHIFT |

> +		sig->clksel_en << DI_D3_CLK_SEL_SHIFT |

> +		sig->clkidle_en << DI_D3_CLK_IDLE_SHIFT;

>  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_IF_CONF);

>  

>  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL) & 0xE0FFFFFF;

> -	old_conf |= sig.data_pol << DI_D3_DATA_POL_SHIFT |

> -		sig.clk_pol << DI_D3_CLK_POL_SHIFT |

> -		sig.enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> -		sig.Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> -		sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

> +	old_conf |= sig->data_pol << DI_D3_DATA_POL_SHIFT |

> +		sig->clk_pol << DI_D3_CLK_POL_SHIFT |

> +		sig->enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> +		sig->Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> +		sig->Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

>  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);

>  

>  	map = &di_mappings[mx3fb->disp_data_fmt];

> @@ -855,7 +855,7 @@ static int __set_par(struct fb_info *fbi, bool lock)

>  				   fbi->var.upper_margin,

>  				   fbi->var.vsync_len,

>  				   fbi->var.lower_margin +

> -				   fbi->var.vsync_len, sig_cfg) != 0) {

> +				   fbi->var.vsync_len, &sig_cfg) != 0) {

>  			dev_err(fbi->device,

>  				"mx3fb: Error initializing panel.\n");

>  			return -EINVAL;


-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sam Ravnborg April 8, 2020, 5:22 p.m. UTC | #3 
Hi Arnd.

On Wed, Apr 08, 2020 at 06:25:38PM +0200, Arnd Bergmann wrote:
> The arm64 gcc-9 release warns about a change in the calling

> conventions:

> 

> drivers/video/fbdev/mx3fb.c: In function 'sdc_init_panel':

> drivers/video/fbdev/mx3fb.c:506:12: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

>   506 | static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>       |            ^~~~~~~~~~~~~~

> drivers/video/fbdev/mx3fb.c: In function '__set_par':

> drivers/video/fbdev/mx3fb.c:848:7: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

> 

> Change the file to just pass the struct by reference, which is

> unambiguous and avoids the warning.

> 

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Simple fix - thanks.
Applied and pushed to drm-misc-next.

I did not queue this in -fixes as it is no regression
just a compiler trying to help a bit more.

	Sam

> ---

>  drivers/video/fbdev/mx3fb.c | 20 ++++++++++----------

>  1 file changed, 10 insertions(+), 10 deletions(-)

> 

> diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c

> index 4af28e4421e5..e13fea3a292f 100644

> --- a/drivers/video/fbdev/mx3fb.c

> +++ b/drivers/video/fbdev/mx3fb.c

> @@ -509,7 +509,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  			  uint16_t h_start_width, uint16_t h_sync_width,

>  			  uint16_t h_end_width, uint16_t v_start_width,

>  			  uint16_t v_sync_width, uint16_t v_end_width,

> -			  struct ipu_di_signal_cfg sig)

> +			  struct ipu_di_signal_cfg *sig)

>  {

>  	unsigned long lock_flags;

>  	uint32_t reg;

> @@ -591,17 +591,17 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  

>  	/* DI settings */

>  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF) & 0x78FFFFFF;

> -	old_conf |= sig.datamask_en << DI_D3_DATAMSK_SHIFT |

> -		sig.clksel_en << DI_D3_CLK_SEL_SHIFT |

> -		sig.clkidle_en << DI_D3_CLK_IDLE_SHIFT;

> +	old_conf |= sig->datamask_en << DI_D3_DATAMSK_SHIFT |

> +		sig->clksel_en << DI_D3_CLK_SEL_SHIFT |

> +		sig->clkidle_en << DI_D3_CLK_IDLE_SHIFT;

>  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_IF_CONF);

>  

>  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL) & 0xE0FFFFFF;

> -	old_conf |= sig.data_pol << DI_D3_DATA_POL_SHIFT |

> -		sig.clk_pol << DI_D3_CLK_POL_SHIFT |

> -		sig.enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> -		sig.Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> -		sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

> +	old_conf |= sig->data_pol << DI_D3_DATA_POL_SHIFT |

> +		sig->clk_pol << DI_D3_CLK_POL_SHIFT |

> +		sig->enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> +		sig->Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> +		sig->Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

>  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);

>  

>  	map = &di_mappings[mx3fb->disp_data_fmt];

> @@ -855,7 +855,7 @@ static int __set_par(struct fb_info *fbi, bool lock)

>  				   fbi->var.upper_margin,

>  				   fbi->var.vsync_len,

>  				   fbi->var.lower_margin +

> -				   fbi->var.vsync_len, sig_cfg) != 0) {

> +				   fbi->var.vsync_len, &sig_cfg) != 0) {

>  			dev_err(fbi->device,

>  				"mx3fb: Error initializing panel.\n");

>  			return -EINVAL;

> -- 

> 2.26.0

> 

> _______________________________________________

> dri-devel mailing list

> dri-devel@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sam Ravnborg April 8, 2020, 6:02 p.m. UTC | #4 
Hi Jani & Laurent.

On Wed, Apr 08, 2020 at 08:20:11PM +0300, Jani Nikula wrote:
> On Wed, 08 Apr 2020, Arnd Bergmann <arnd@arndb.de> wrote:

> > The arm64 gcc-9 release warns about a change in the calling

> > conventions:

> >

> > drivers/video/fbdev/mx3fb.c: In function 'sdc_init_panel':

> > drivers/video/fbdev/mx3fb.c:506:12: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

> >   506 | static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

> >       |            ^~~~~~~~~~~~~~

> > drivers/video/fbdev/mx3fb.c: In function '__set_par':

> > drivers/video/fbdev/mx3fb.c:848:7: note: parameter passing for argument of type 'struct ipu_di_signal_cfg' changed in GCC 9.1

> >

> > Change the file to just pass the struct by reference, which is

> > unambiguous and avoids the warning.

> >

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > ---

> >  drivers/video/fbdev/mx3fb.c | 20 ++++++++++----------

> >  1 file changed, 10 insertions(+), 10 deletions(-)

> >

> > diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c

> > index 4af28e4421e5..e13fea3a292f 100644

> > --- a/drivers/video/fbdev/mx3fb.c

> > +++ b/drivers/video/fbdev/mx3fb.c

> > @@ -509,7 +509,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

> >  			  uint16_t h_start_width, uint16_t h_sync_width,

> >  			  uint16_t h_end_width, uint16_t v_start_width,

> >  			  uint16_t v_sync_width, uint16_t v_end_width,

> > -			  struct ipu_di_signal_cfg sig)

> > +			  struct ipu_di_signal_cfg *sig)

> 

> I have no idea why get_maintainer.pl (I presume) is Cc'ing me... but

> since it is, I'll note that the pointer could be const, while the patch

> is

> 

> Reviewed-by: Jani Nikula <jani.nikula@intel.com>


I was too quick to apply this - sorry.
I will follow-up with a const fix.

	Sam

> 

> either way.

> 

> >  {

> >  	unsigned long lock_flags;

> >  	uint32_t reg;

> > @@ -591,17 +591,17 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

> >  

> >  	/* DI settings */

> >  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF) & 0x78FFFFFF;

> > -	old_conf |= sig.datamask_en << DI_D3_DATAMSK_SHIFT |

> > -		sig.clksel_en << DI_D3_CLK_SEL_SHIFT |

> > -		sig.clkidle_en << DI_D3_CLK_IDLE_SHIFT;

> > +	old_conf |= sig->datamask_en << DI_D3_DATAMSK_SHIFT |

> > +		sig->clksel_en << DI_D3_CLK_SEL_SHIFT |

> > +		sig->clkidle_en << DI_D3_CLK_IDLE_SHIFT;

> >  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_IF_CONF);

> >  

> >  	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL) & 0xE0FFFFFF;

> > -	old_conf |= sig.data_pol << DI_D3_DATA_POL_SHIFT |

> > -		sig.clk_pol << DI_D3_CLK_POL_SHIFT |

> > -		sig.enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> > -		sig.Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> > -		sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

> > +	old_conf |= sig->data_pol << DI_D3_DATA_POL_SHIFT |

> > +		sig->clk_pol << DI_D3_CLK_POL_SHIFT |

> > +		sig->enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |

> > +		sig->Hsync_pol << DI_D3_HSYNC_POL_SHIFT |

> > +		sig->Vsync_pol << DI_D3_VSYNC_POL_SHIFT;

> >  	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);

> >  

> >  	map = &di_mappings[mx3fb->disp_data_fmt];

> > @@ -855,7 +855,7 @@ static int __set_par(struct fb_info *fbi, bool lock)

> >  				   fbi->var.upper_margin,

> >  				   fbi->var.vsync_len,

> >  				   fbi->var.lower_margin +

> > -				   fbi->var.vsync_len, sig_cfg) != 0) {

> > +				   fbi->var.vsync_len, &sig_cfg) != 0) {

> >  			dev_err(fbi->device,

> >  				"mx3fb: Error initializing panel.\n");

> >  			return -EINVAL;

> 

> -- 

> Jani Nikula, Intel Open Source Graphics Center

> _______________________________________________

> dri-devel mailing list

> dri-devel@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Laurent Pinchart April 8, 2020, 8:01 p.m. UTC | #5 
Hi Sam,

Thank you for the patch.

On Wed, Apr 08, 2020 at 08:29:26PM +0200, Sam Ravnborg wrote:
> Laurent Pinchart <laurent.pinchart@ideasonboard.com> and

> Jani Nikula <jani.nikula@intel.com> both

> suggested to make the pointer to struct ipu_di_signal_cfg const.

> 

> Fix this.

> 

> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

> Fixes: 3f6c93ec9254 ("fbdev: mx3fb: avoid warning about psABI change")

> Cc: Jani Nikula <jani.nikula@intel.com>

> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> Cc: Arnd Bergmann <arnd@arndb.de>

> Cc: Sam Ravnborg <sam@ravnborg.org>

> Cc: Enrico Weigelt <info@metux.net>

> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

> Cc: linux-fbdev@vger.kernel.org


Assuming this is compile-tested,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


> ---

> 

> Again, sorry. I should have waited a day before applying.

> 

> 	Sam

> 

>  drivers/video/fbdev/mx3fb.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c

> index e13fea3a292f..603731a5a72e 100644

> --- a/drivers/video/fbdev/mx3fb.c

> +++ b/drivers/video/fbdev/mx3fb.c

> @@ -509,7 +509,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

>  			  uint16_t h_start_width, uint16_t h_sync_width,

>  			  uint16_t h_end_width, uint16_t v_start_width,

>  			  uint16_t v_sync_width, uint16_t v_end_width,

> -			  struct ipu_di_signal_cfg *sig)

> +			  const struct ipu_di_signal_cfg *sig)

>  {

>  	unsigned long lock_flags;

>  	uint32_t reg;


-- 
Regards,

Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sam Ravnborg April 12, 2020, 8:34 p.m. UTC | #6 
On Wed, Apr 08, 2020 at 11:01:41PM +0300, Laurent Pinchart wrote:
> Hi Sam,

> 

> Thank you for the patch.

> 

> On Wed, Apr 08, 2020 at 08:29:26PM +0200, Sam Ravnborg wrote:

> > Laurent Pinchart <laurent.pinchart@ideasonboard.com> and

> > Jani Nikula <jani.nikula@intel.com> both

> > suggested to make the pointer to struct ipu_di_signal_cfg const.

> > 

> > Fix this.

> > 

> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

> > Fixes: 3f6c93ec9254 ("fbdev: mx3fb: avoid warning about psABI change")

> > Cc: Jani Nikula <jani.nikula@intel.com>

> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> > Cc: Arnd Bergmann <arnd@arndb.de>

> > Cc: Sam Ravnborg <sam@ravnborg.org>

> > Cc: Enrico Weigelt <info@metux.net>

> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

> > Cc: linux-fbdev@vger.kernel.org

> 

> Assuming this is compile-tested,

> 

> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


Thanks. Applied and pushed out to drm-misc-next.

	Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox series

Patch

diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index 4af28e4421e5..e13fea3a292f 100644
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -509,7 +509,7 @@  static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
 			  uint16_t h_start_width, uint16_t h_sync_width,
 			  uint16_t h_end_width, uint16_t v_start_width,
 			  uint16_t v_sync_width, uint16_t v_end_width,
-			  struct ipu_di_signal_cfg sig)
+			  struct ipu_di_signal_cfg *sig)
 {
 	unsigned long lock_flags;
 	uint32_t reg;
@@ -591,17 +591,17 @@  static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
 
 	/* DI settings */
 	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_IF_CONF) & 0x78FFFFFF;
-	old_conf |= sig.datamask_en << DI_D3_DATAMSK_SHIFT |
-		sig.clksel_en << DI_D3_CLK_SEL_SHIFT |
-		sig.clkidle_en << DI_D3_CLK_IDLE_SHIFT;
+	old_conf |= sig->datamask_en << DI_D3_DATAMSK_SHIFT |
+		sig->clksel_en << DI_D3_CLK_SEL_SHIFT |
+		sig->clkidle_en << DI_D3_CLK_IDLE_SHIFT;
 	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_IF_CONF);
 
 	old_conf = mx3fb_read_reg(mx3fb, DI_DISP_SIG_POL) & 0xE0FFFFFF;
-	old_conf |= sig.data_pol << DI_D3_DATA_POL_SHIFT |
-		sig.clk_pol << DI_D3_CLK_POL_SHIFT |
-		sig.enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |
-		sig.Hsync_pol << DI_D3_HSYNC_POL_SHIFT |
-		sig.Vsync_pol << DI_D3_VSYNC_POL_SHIFT;
+	old_conf |= sig->data_pol << DI_D3_DATA_POL_SHIFT |
+		sig->clk_pol << DI_D3_CLK_POL_SHIFT |
+		sig->enable_pol << DI_D3_DRDY_SHARP_POL_SHIFT |
+		sig->Hsync_pol << DI_D3_HSYNC_POL_SHIFT |
+		sig->Vsync_pol << DI_D3_VSYNC_POL_SHIFT;
 	mx3fb_write_reg(mx3fb, old_conf, DI_DISP_SIG_POL);
 
 	map = &di_mappings[mx3fb->disp_data_fmt];
@@ -855,7 +855,7 @@  static int __set_par(struct fb_info *fbi, bool lock)
 				   fbi->var.upper_margin,
 				   fbi->var.vsync_len,
 				   fbi->var.lower_margin +
-				   fbi->var.vsync_len, sig_cfg) != 0) {
+				   fbi->var.vsync_len, &sig_cfg) != 0) {
 			dev_err(fbi->device,
 				"mx3fb: Error initializing panel.\n");
 			return -EINVAL;