Message ID | 1443112538-9616-8-git-send-email-thierry.reding@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Sep 24, 2015 at 06:35:30PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Since the original crtc parameter was renamed to pipe, there is no > longer a need to artificially prefix the CRTC parameter. > > Signed-off-by: Thierry Reding <treding@nvidia.com> Applied to drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/drm_irq.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c > index 88fbee4cf4b7..29a6dcd674f8 100644 > --- a/drivers/gpu/drm/drm_irq.c > +++ b/drivers/gpu/drm/drm_irq.c > @@ -1280,7 +1280,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 > @@ -1288,11 +1288,11 @@ 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; > + struct drm_device *dev = crtc->dev; > unsigned long irqflags; > - unsigned int pipe = drm_crtc_index(drm_crtc); > + unsigned int pipe = drm_crtc_index(crtc); > struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; > > spin_lock_irqsave(&dev->vbl_lock, irqflags); > -- > 2.5.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 88fbee4cf4b7..29a6dcd674f8 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1280,7 +1280,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 @@ -1288,11 +1288,11 @@ 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; + struct drm_device *dev = crtc->dev; unsigned long irqflags; - unsigned int pipe = drm_crtc_index(drm_crtc); + unsigned int pipe = drm_crtc_index(crtc); struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; spin_lock_irqsave(&dev->vbl_lock, irqflags);