On Thu, Aug 13, 2015 at 11:38:51AM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> Commit cc1ef118fc09 ("drm/irq: Make pipe unsigned and name consistent")
> missed a few occurrences of int pipe/crtc across various rebases. Clean
> the remaining ones up now.
>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
Applied to drm-misc, thanks.
-Daniel
> ---
> drivers/gpu/drm/drm_irq.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 20cf5776ce70..3960168503f1 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -74,11 +74,11 @@ module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);
> module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
> module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
>
> -static void store_vblank(struct drm_device *dev, int crtc,
> +static void store_vblank(struct drm_device *dev, unsigned int pipe,
> u32 vblank_count_inc,
> struct timeval *t_vblank)
> {
> - struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
> + struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> u32 tslot;
>
> assert_spin_locked(&dev->vblank_time_lock);
> @@ -88,7 +88,7 @@ static void store_vblank(struct drm_device *dev, int crtc,
> * the latching of vblank->count below.
> */
> tslot = vblank->count + vblank_count_inc;
> - vblanktimestamp(dev, crtc, tslot) = *t_vblank;
> + vblanktimestamp(dev, pipe, tslot) = *t_vblank;
> }
>
> /*
> @@ -867,7 +867,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];
>
> @@ -1292,7 +1292,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_off);
>
> /**
> * drm_crtc_vblank_reset - reset vblank state to off on a CRTC
> - * @drm_crtc: CRTC in question
> + * @crtc: CRTC in question
> *
> * Drivers can use this function to reset the vblank state to off at load time.
> * Drivers should use this together with the drm_crtc_vblank_off() and
> @@ -1300,12 +1300,12 @@ EXPORT_SYMBOL(drm_crtc_vblank_off);
> * drm_crtc_vblank_off() is that this function doesn't save the vblank counter
> * and hence doesn't need to call any driver hooks.
> */
> -void drm_crtc_vblank_reset(struct drm_crtc *drm_crtc)
> +void drm_crtc_vblank_reset(struct drm_crtc *crtc)
> {
> struct drm_device *dev = drm_crtc->dev;
> unsigned long irqflags;
> - int crtc = drm_crtc_index(drm_crtc);
> - struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
> + unsigned int pipe = drm_crtc_index(crtc);
> + struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
>
> spin_lock_irqsave(&dev->vbl_lock, irqflags);
> /*
> --
> 2.4.5
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
