[PATCH 2/2] drm: s/int pipe/unsigned int pipe/

Thierry Reding treding at nvidia.com
Tue Oct 6 02:36:39 PDT 2015


On Fri, Oct 02, 2015 at 04:12:49PM +0300, Ville Syrjälä wrote:
> On Fri, Oct 02, 2015 at 03:07:50PM +0200, Vincent ABRIOU wrote:
> > Hi,
> > 
> > On 09/30/2015 03:46 PM, ville.syrjala at linux.intel.com wrote:
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > >
> > > Make the 'pipe' argument to drm_vblank_count() unsigned as it is
> > > everwhere else.
> > >
> > > Cc: Vincent Abriou <vincent.abriou at st.com>
> > > Cc: Thierry Reding <treding at nvidia.com>
> > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > ---
> > >   drivers/gpu/drm/drm_irq.c | 2 +-
> > >   include/drm/drmP.h        | 2 +-
> > >   2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > > index 7d70b7c..f24c57c 100644
> > > --- a/drivers/gpu/drm/drm_irq.c
> > > +++ b/drivers/gpu/drm/drm_irq.c
> > > @@ -876,7 +876,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
> > >    * Returns:
> > >    * The software vblank counter.
> > >    */
> > > -u32 drm_vblank_count(struct drm_device *dev, int pipe)
> > > +u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
> > >   {
> > >   	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> > >
> > > diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> > > index f563333..8df4de7 100644
> > > --- a/include/drm/drmP.h
> > > +++ b/include/drm/drmP.h
> > > @@ -928,7 +928,7 @@ extern int drm_irq_uninstall(struct drm_device *dev);
> > >   extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
> > >   extern int drm_wait_vblank(struct drm_device *dev, void *data,
> > >   			   struct drm_file *filp);
> > > -extern u32 drm_vblank_count(struct drm_device *dev, int pipe);
> > > +extern u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe);
> > >   extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
> > >   extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
> > >   				     struct timeval *vblanktime);
> > >
> > 
> > 
> > If you update drm_vblank_count you also need to update 
> > drm_vblank_no_hw_counter and need to change the u32 
> > (*get_vblank_counter) prototype.
> 
> No. drm_vblank_count() != .get_vblank_counter()
> 
> > 
> > Thierry already done the job with "drm/irq: Use unsigned int pipe in 
> > public API" patch
> 
> Yes I know. Except all the driver hooks still have signed ints. I looked
> at changing that, and it looked like quite a bit of work, so probably
> a job for coccinelle. I wonder if it has a way to figure out which
> functions are plugged into these hooks and do the job entirely
> automatically...

Actually the above-mentioned patch updated drivers as well, otherwise
there would've been tons of warnings from mismatched types.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20151006/f75309f1/attachment.sig>


More information about the dri-devel mailing list