On Fri, Oct 02, 2015 at 03:22:16PM +0200, Vincent ABRIOU wrote:
>
>
> On 10/02/2015 03:12 PM, 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@xxxxxxxxxxxxxxx wrote:
> >>> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> >>>
> >>> Make the 'pipe' argument to drm_vblank_count() unsigned as it is
> >>> everwhere else.
> >>>
> >>> Cc: Vincent Abriou <vincent.abriou@xxxxxx>
> >>> Cc: Thierry Reding <treding@xxxxxxxxxx>
> >>> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> >>> ---
> >>> 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()
>
> I surely miss something but before your patch in drivers that did not
> support hw vblank counter we had:
> .get_vblank_counter = drm_vblank_count;
That was what patch 1/2 fixed.
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
