Commit 1da248a5 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm: s/int crtc/unsigned int pipe/ straggles

Finish the recent replacement of 'int pipe' with 'unsigned int pipe'

Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 646db260
...@@ -74,11 +74,11 @@ module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600); ...@@ -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_precision_usec, drm_timestamp_precision, int, 0600);
module_param_named(timestamp_monotonic, drm_timestamp_monotonic, 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, u32 vblank_count_inc,
struct timeval *t_vblank) struct timeval *t_vblank)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u32 tslot; u32 tslot;
assert_spin_locked(&dev->vblank_time_lock); assert_spin_locked(&dev->vblank_time_lock);
...@@ -88,7 +88,7 @@ static void store_vblank(struct drm_device *dev, int crtc, ...@@ -88,7 +88,7 @@ static void store_vblank(struct drm_device *dev, int crtc,
* the latching of vblank->count below. * the latching of vblank->count below.
*/ */
tslot = vblank->count + vblank_count_inc; tslot = vblank->count + vblank_count_inc;
vblanktimestamp(dev, crtc, tslot) = *t_vblank; vblanktimestamp(dev, pipe, tslot) = *t_vblank;
} }
/* /*
...@@ -110,7 +110,7 @@ static void store_vblank(struct drm_device *dev, int crtc, ...@@ -110,7 +110,7 @@ static void store_vblank(struct drm_device *dev, int crtc,
* @pipe: counter to update * @pipe: counter to update
* *
* Call back into the driver to update the appropriate vblank counter * Call back into the driver to update the appropriate vblank counter
* (specified by @crtc). Deal with wraparound, if it occurred, and * (specified by @pipe). Deal with wraparound, if it occurred, and
* update the last read value so we can deal with wraparound on the next * update the last read value so we can deal with wraparound on the next
* call if necessary. * call if necessary.
* *
...@@ -1154,8 +1154,8 @@ EXPORT_SYMBOL(drm_crtc_vblank_put); ...@@ -1154,8 +1154,8 @@ EXPORT_SYMBOL(drm_crtc_vblank_put);
* @dev: DRM device * @dev: DRM device
* @pipe: CRTC index * @pipe: CRTC index
* *
* This waits for one vblank to pass on @crtc, using the irq driver interfaces. * This waits for one vblank to pass on @pipe, using the irq driver interfaces.
* It is a failure to call this when the vblank irq for @crtc is disabled, e.g. * It is a failure to call this when the vblank irq for @pipe is disabled, e.g.
* due to lack of driver support or because the crtc is off. * due to lack of driver support or because the crtc is off.
*/ */
void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe) void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
...@@ -1288,8 +1288,8 @@ void drm_crtc_vblank_reset(struct drm_crtc *drm_crtc) ...@@ -1288,8 +1288,8 @@ void drm_crtc_vblank_reset(struct drm_crtc *drm_crtc)
{ {
struct drm_device *dev = drm_crtc->dev; struct drm_device *dev = drm_crtc->dev;
unsigned long irqflags; unsigned long irqflags;
int crtc = drm_crtc_index(drm_crtc); unsigned int pipe = drm_crtc_index(drm_crtc);
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
spin_lock_irqsave(&dev->vbl_lock, irqflags); spin_lock_irqsave(&dev->vbl_lock, irqflags);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment