Skip to content

L
linux
Commit cc1ef118 authored by Thierry Reding's avatar Thierry Reding Committed by Daniel Vetter
Browse files
Options

drm/irq: Make pipe unsigned and name consistent 

Name all references to the pipe number (CRTC index) consistently to make
it easier to distinguish which is a pipe number and which is a pointer
to struct drm_crtc.

While at it also make all references to the pipe number unsigned because
there is no longer any reason why it should ever be negative.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7d1de851
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 173 deletions
drivers/gpu/drm/drm_irq.c
View file @ cc1ef118
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#include <linux/export.h> #include <linux/export.h>
/* Access macro for slots in vblank timestamp ringbuffer. */ /* Access macro for slots in vblank timestamp ringbuffer. */
#define vblanktimestamp(dev, crtc, count) \ #define vblanktimestamp(dev, pipe, count) \
((dev)->vblank[crtc].time[(count) % DRM_VBLANKTIME_RBSIZE]) ((dev)->vblank[pipe].time[(count) % DRM_VBLANKTIME_RBSIZE])
/* Retry timestamp calculation up to 3 times to satisfy /* Retry timestamp calculation up to 3 times to satisfy
* drm_timestamp_precision before giving up. * drm_timestamp_precision before giving up.
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000 #define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
static bool static bool
drm_get_last_vbltimestamp(struct drm_device *dev, int crtc, drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
struct timeval *tvblank, unsigned flags); struct timeval *tvblank, unsigned flags);
static unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */ static unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */
...@@ -107,7 +107,7 @@ static void store_vblank(struct drm_device *dev, int crtc, ...@@ -107,7 +107,7 @@ static void store_vblank(struct drm_device *dev, int crtc,
/** /**
* drm_update_vblank_count - update the master vblank counter * drm_update_vblank_count - update the master vblank counter
* @dev: DRM device * @dev: DRM device
* @crtc: 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 @crtc). Deal with wraparound, if it occurred, and
...@@ -120,9 +120,9 @@ static void store_vblank(struct drm_device *dev, int crtc, ...@@ -120,9 +120,9 @@ static void store_vblank(struct drm_device *dev, int crtc,
* Note: caller must hold dev->vbl_lock since this reads & writes * Note: caller must hold dev->vbl_lock since this reads & writes
* device vblank fields. * device vblank fields.
*/ */
static void drm_update_vblank_count(struct drm_device *dev, int crtc) static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u32 cur_vblank, diff; u32 cur_vblank, diff;
bool rc; bool rc;
struct timeval t_vblank; struct timeval t_vblank;
...@@ -140,21 +140,21 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc) ...@@ -140,21 +140,21 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
* corresponding vblank timestamp. * corresponding vblank timestamp.
*/ */
do { do {
cur_vblank = dev->driver->get_vblank_counter(dev, crtc); cur_vblank = dev->driver->get_vblank_counter(dev, pipe);
rc = drm_get_last_vbltimestamp(dev, crtc, &t_vblank, 0); rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, 0);
} while (cur_vblank != dev->driver->get_vblank_counter(dev, crtc)); } while (cur_vblank != dev->driver->get_vblank_counter(dev, pipe));
/* Deal with counter wrap */ /* Deal with counter wrap */
diff = cur_vblank - vblank->last; diff = cur_vblank - vblank->last;
if (cur_vblank < vblank->last) { if (cur_vblank < vblank->last) {
diff += dev->max_vblank_count + 1; diff += dev->max_vblank_count + 1;
DRM_DEBUG("last_vblank[%d]=0x%x, cur_vblank=0x%x => diff=0x%x\n", DRM_DEBUG("last_vblank[%u]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
crtc, vblank->last, cur_vblank, diff); pipe, vblank->last, cur_vblank, diff);
} }
DRM_DEBUG("updating vblank count on crtc %d, missed %d\n", DRM_DEBUG("updating vblank count on crtc %u, missed %d\n",
crtc, diff); pipe, diff);
if (diff == 0) if (diff == 0)
return; return;
...@@ -167,7 +167,7 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc) ...@@ -167,7 +167,7 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
if (!rc) if (!rc)
t_vblank = (struct timeval) {0, 0}; t_vblank = (struct timeval) {0, 0};
store_vblank(dev, crtc, diff, &t_vblank); store_vblank(dev, pipe, diff, &t_vblank);
} }
/* /*
...@@ -176,9 +176,9 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc) ...@@ -176,9 +176,9 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
* are preserved, even if there are any spurious vblank irq's after * are preserved, even if there are any spurious vblank irq's after
* disable. * disable.
*/ */
static void vblank_disable_and_save(struct drm_device *dev, int crtc) static void vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
unsigned long irqflags; unsigned long irqflags;
u32 vblcount; u32 vblcount;
s64 diff_ns; s64 diff_ns;
...@@ -206,8 +206,8 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) ...@@ -206,8 +206,8 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
* vblank interrupt is disabled. * vblank interrupt is disabled.
*/ */
if (!vblank->enabled && if (!vblank->enabled &&
drm_get_last_vbltimestamp(dev, crtc, &tvblank, 0)) { drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0)) {
drm_update_vblank_count(dev, crtc); drm_update_vblank_count(dev, pipe);
spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
return; return;
} }
...@@ -218,7 +218,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) ...@@ -218,7 +218,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
* hardware potentially runtime suspended. * hardware potentially runtime suspended.
*/ */
if (vblank->enabled) { if (vblank->enabled) {
dev->driver->disable_vblank(dev, crtc); dev->driver->disable_vblank(dev, pipe);
vblank->enabled = false; vblank->enabled = false;
} }
...@@ -235,9 +235,9 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) ...@@ -235,9 +235,9 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
* delayed gpu counter increment. * delayed gpu counter increment.
*/ */
do { do {
vblank->last = dev->driver->get_vblank_counter(dev, crtc); vblank->last = dev->driver->get_vblank_counter(dev, pipe);
vblrc = drm_get_last_vbltimestamp(dev, crtc, &tvblank, 0); vblrc = drm_get_last_vbltimestamp(dev, pipe, &tvblank, 0);
} while (vblank->last != dev->driver->get_vblank_counter(dev, crtc) && (--count) && vblrc); } while (vblank->last != dev->driver->get_vblank_counter(dev, pipe) && (--count) && vblrc);
if (!count) if (!count)
vblrc = 0; vblrc = 0;
...@@ -247,7 +247,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) ...@@ -247,7 +247,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
*/ */
vblcount = vblank->count; vblcount = vblank->count;
diff_ns = timeval_to_ns(&tvblank) - diff_ns = timeval_to_ns(&tvblank) -
timeval_to_ns(&vblanktimestamp(dev, crtc, vblcount)); timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
/* If there is at least 1 msec difference between the last stored /* If there is at least 1 msec difference between the last stored
* timestamp and tvblank, then we are currently executing our * timestamp and tvblank, then we are currently executing our
...@@ -262,7 +262,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) ...@@ -262,7 +262,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
* hope for the best. * hope for the best.
*/ */
if (vblrc && (abs64(diff_ns) > 1000000)) if (vblrc && (abs64(diff_ns) > 1000000))
store_vblank(dev, crtc, 1, &tvblank); store_vblank(dev, pipe, 1, &tvblank);
spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
} }
...@@ -271,16 +271,16 @@ static void vblank_disable_fn(unsigned long arg) ...@@ -271,16 +271,16 @@ static void vblank_disable_fn(unsigned long arg)
{ {
struct drm_vblank_crtc *vblank = (void *)arg; struct drm_vblank_crtc *vblank = (void *)arg;
struct drm_device *dev = vblank->dev; struct drm_device *dev = vblank->dev;
unsigned int pipe = vblank->pipe;
unsigned long irqflags; unsigned long irqflags;
int crtc = vblank->crtc;
if (!dev->vblank_disable_allowed) if (!dev->vblank_disable_allowed)
return; return;
spin_lock_irqsave(&dev->vbl_lock, irqflags); spin_lock_irqsave(&dev->vbl_lock, irqflags);
if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) { if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
DRM_DEBUG("disabling vblank on crtc %d\n", crtc); DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
vblank_disable_and_save(dev, crtc); vblank_disable_and_save(dev, pipe);
} }
spin_unlock_irqrestore(&dev->vbl_lock, irqflags); spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
} }
...@@ -293,14 +293,14 @@ static void vblank_disable_fn(unsigned long arg) ...@@ -293,14 +293,14 @@ static void vblank_disable_fn(unsigned long arg)
*/ */
void drm_vblank_cleanup(struct drm_device *dev) void drm_vblank_cleanup(struct drm_device *dev)
{ {
int crtc; unsigned int pipe;
/* Bail if the driver didn't call drm_vblank_init() */ /* Bail if the driver didn't call drm_vblank_init() */
if (dev->num_crtcs == 0) if (dev->num_crtcs == 0)
return; return;
for (crtc = 0; crtc < dev->num_crtcs; crtc++) { for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
WARN_ON(vblank->enabled && WARN_ON(vblank->enabled &&
drm_core_check_feature(dev, DRIVER_MODESET)); drm_core_check_feature(dev, DRIVER_MODESET));
...@@ -316,17 +316,18 @@ EXPORT_SYMBOL(drm_vblank_cleanup); ...@@ -316,17 +316,18 @@ EXPORT_SYMBOL(drm_vblank_cleanup);
/** /**
* drm_vblank_init - initialize vblank support * drm_vblank_init - initialize vblank support
* @dev: drm_device * @dev: DRM device
* @num_crtcs: number of crtcs supported by @dev * @num_crtcs: number of CRTCs supported by @dev
* *
* This function initializes vblank support for @num_crtcs display pipelines. * This function initializes vblank support for @num_crtcs display pipelines.
* *
* Returns: * Returns:
* Zero on success or a negative error code on failure. * Zero on success or a negative error code on failure.
*/ */
int drm_vblank_init(struct drm_device *dev, int num_crtcs) int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
{ {
int i, ret = -ENOMEM; int ret = -ENOMEM;
unsigned int i;
spin_lock_init(&dev->vbl_lock); spin_lock_init(&dev->vbl_lock);
spin_lock_init(&dev->vblank_time_lock); spin_lock_init(&dev->vblank_time_lock);
...@@ -341,7 +342,7 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs) ...@@ -341,7 +342,7 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
struct drm_vblank_crtc *vblank = &dev->vblank[i]; struct drm_vblank_crtc *vblank = &dev->vblank[i];
vblank->dev = dev; vblank->dev = dev;
vblank->crtc = i; vblank->pipe = i;
init_waitqueue_head(&vblank->queue); init_waitqueue_head(&vblank->queue);
setup_timer(&vblank->disable_timer, vblank_disable_fn, setup_timer(&vblank->disable_timer, vblank_disable_fn,
(unsigned long)vblank); (unsigned long)vblank);
...@@ -624,17 +625,17 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc, ...@@ -624,17 +625,17 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
if (mode->flags & DRM_MODE_FLAG_INTERLACE) if (mode->flags & DRM_MODE_FLAG_INTERLACE)
framedur_ns /= 2; framedur_ns /= 2;
} else } else
DRM_ERROR("crtc %d: Can't calculate constants, dotclock = 0!\n", DRM_ERROR("crtc %u: Can't calculate constants, dotclock = 0!\n",
crtc->base.id); crtc->base.id);
crtc->pixeldur_ns = pixeldur_ns; crtc->pixeldur_ns = pixeldur_ns;
crtc->linedur_ns = linedur_ns; crtc->linedur_ns = linedur_ns;
crtc->framedur_ns = framedur_ns; crtc->framedur_ns = framedur_ns;
DRM_DEBUG("crtc %d: hwmode: htotal %d, vtotal %d, vdisplay %d\n", DRM_DEBUG("crtc %u: hwmode: htotal %d, vtotal %d, vdisplay %d\n",
crtc->base.id, mode->crtc_htotal, crtc->base.id, mode->crtc_htotal,
mode->crtc_vtotal, mode->crtc_vdisplay); mode->crtc_vtotal, mode->crtc_vdisplay);
DRM_DEBUG("crtc %d: clock %d kHz framedur %d linedur %d, pixeldur %d\n", DRM_DEBUG("crtc %u: clock %d kHz framedur %d linedur %d, pixeldur %d\n",
crtc->base.id, dotclock, framedur_ns, crtc->base.id, dotclock, framedur_ns,
linedur_ns, pixeldur_ns); linedur_ns, pixeldur_ns);
} }
...@@ -643,7 +644,7 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants); ...@@ -643,7 +644,7 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants);
/** /**
* drm_calc_vbltimestamp_from_scanoutpos - precise vblank timestamp helper * drm_calc_vbltimestamp_from_scanoutpos - precise vblank timestamp helper
* @dev: DRM device * @dev: DRM device
* @crtc: Which CRTC's vblank timestamp to retrieve * @pipe: index of CRTC whose vblank timestamp to retrieve
* @max_error: Desired maximum allowable error in timestamps (nanosecs) * @max_error: Desired maximum allowable error in timestamps (nanosecs)
* On return contains true maximum error of timestamp * On return contains true maximum error of timestamp
* @vblank_time: Pointer to struct timeval which should receive the timestamp * @vblank_time: Pointer to struct timeval which should receive the timestamp
...@@ -686,7 +687,8 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants); ...@@ -686,7 +687,8 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants);
* DRM_VBLANKTIME_INVBL - Timestamp taken while scanout was in vblank interval. * DRM_VBLANKTIME_INVBL - Timestamp taken while scanout was in vblank interval.
* *
*/ */
int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
unsigned int pipe,
int *max_error, int *max_error,
struct timeval *vblank_time, struct timeval *vblank_time,
unsigned flags, unsigned flags,
...@@ -700,8 +702,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, ...@@ -700,8 +702,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
int framedur_ns, linedur_ns, pixeldur_ns, delta_ns, duration_ns; int framedur_ns, linedur_ns, pixeldur_ns, delta_ns, duration_ns;
bool invbl; bool invbl;
if (crtc < 0 || crtc >= dev->num_crtcs) { if (pipe >= dev->num_crtcs) {
DRM_ERROR("Invalid crtc %d\n", crtc); DRM_ERROR("Invalid crtc %u\n", pipe);
return -EINVAL; return -EINVAL;
} }
...@@ -720,7 +722,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, ...@@ -720,7 +722,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
* Happens during initial modesetting of a crtc. * Happens during initial modesetting of a crtc.
*/ */
if (framedur_ns == 0) { if (framedur_ns == 0) {
DRM_DEBUG("crtc %d: Noop due to uninitialized mode.\n", crtc); DRM_DEBUG("crtc %u: Noop due to uninitialized mode.\n", pipe);
return -EAGAIN; return -EAGAIN;
} }
...@@ -736,13 +738,13 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, ...@@ -736,13 +738,13 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
* Get vertical and horizontal scanout position vpos, hpos, * Get vertical and horizontal scanout position vpos, hpos,
* and bounding timestamps stime, etime, pre/post query. * and bounding timestamps stime, etime, pre/post query.
*/ */
vbl_status = dev->driver->get_scanout_position(dev, crtc, flags, &vpos, vbl_status = dev->driver->get_scanout_position(dev, pipe, flags, &vpos,
&hpos, &stime, &etime); &hpos, &stime, &etime);
/* Return as no-op if scanout query unsupported or failed. */ /* Return as no-op if scanout query unsupported or failed. */
if (!(vbl_status & DRM_SCANOUTPOS_VALID)) { if (!(vbl_status & DRM_SCANOUTPOS_VALID)) {
DRM_DEBUG("crtc %d : scanoutpos query failed [%d].\n", DRM_DEBUG("crtc %u : scanoutpos query failed [%d].\n",
crtc, vbl_status); pipe, vbl_status);
return -EIO; return -EIO;
} }
...@@ -756,8 +758,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, ...@@ -756,8 +758,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
/* Noisy system timing? */ /* Noisy system timing? */
if (i == DRM_TIMESTAMP_MAXRETRIES) { if (i == DRM_TIMESTAMP_MAXRETRIES) {
DRM_DEBUG("crtc %d: Noisy timestamp %d us > %d us [%d reps].\n", DRM_DEBUG("crtc %u: Noisy timestamp %d us > %d us [%d reps].\n",
crtc, duration_ns/1000, *max_error/1000, i); pipe, duration_ns/1000, *max_error/1000, i);
} }
/* Return upper bound of timestamp precision error. */ /* Return upper bound of timestamp precision error. */
...@@ -790,8 +792,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, ...@@ -790,8 +792,8 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc,
etime = ktime_sub_ns(etime, delta_ns); etime = ktime_sub_ns(etime, delta_ns);
*vblank_time = ktime_to_timeval(etime); *vblank_time = ktime_to_timeval(etime);
DRM_DEBUG("crtc %d : v %d p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n", DRM_DEBUG("crtc %u : v %d p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n",
crtc, (int)vbl_status, hpos, vpos, pipe, (int)vbl_status, hpos, vpos,
(long)tv_etime.tv_sec, (long)tv_etime.tv_usec, (long)tv_etime.tv_sec, (long)tv_etime.tv_usec,
(long)vblank_time->tv_sec, (long)vblank_time->tv_usec, (long)vblank_time->tv_sec, (long)vblank_time->tv_usec,
duration_ns/1000, i); duration_ns/1000, i);
...@@ -816,7 +818,7 @@ static struct timeval get_drm_timestamp(void) ...@@ -816,7 +818,7 @@ static struct timeval get_drm_timestamp(void)
* drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent * drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
* vblank interval * vblank interval
* @dev: DRM device * @dev: DRM device
* @crtc: which CRTC's vblank timestamp to retrieve * @pipe: index of CRTC whose vblank timestamp to retrieve
* @tvblank: Pointer to target struct timeval which should receive the timestamp * @tvblank: Pointer to target struct timeval which should receive the timestamp
* @flags: Flags to pass to driver: * @flags: Flags to pass to driver:
* 0 = Default, * 0 = Default,
...@@ -833,7 +835,7 @@ static struct timeval get_drm_timestamp(void) ...@@ -833,7 +835,7 @@ static struct timeval get_drm_timestamp(void)
* True if timestamp is considered to be very precise, false otherwise. * True if timestamp is considered to be very precise, false otherwise.
*/ */
static bool static bool
drm_get_last_vbltimestamp(struct drm_device *dev, int crtc, drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
struct timeval *tvblank, unsigned flags) struct timeval *tvblank, unsigned flags)
{ {
int ret; int ret;
...@@ -843,7 +845,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc, ...@@ -843,7 +845,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
/* Query driver if possible and precision timestamping enabled. */ /* Query driver if possible and precision timestamping enabled. */
if (dev->driver->get_vblank_timestamp && (max_error > 0)) { if (dev->driver->get_vblank_timestamp && (max_error > 0)) {
ret = dev->driver->get_vblank_timestamp(dev, crtc, &max_error, ret = dev->driver->get_vblank_timestamp(dev, pipe, &max_error,
tvblank, flags); tvblank, flags);
if (ret > 0) if (ret > 0)
return true; return true;
...@@ -860,7 +862,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc, ...@@ -860,7 +862,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
/** /**
* drm_vblank_count - retrieve "cooked" vblank counter value * drm_vblank_count - retrieve "cooked" vblank counter value
* @dev: DRM device * @dev: DRM device
* @crtc: which counter to retrieve * @pipe: index of CRTC for which to retrieve the counter
* *
* Fetches the "cooked" vblank count value that represents the number of * Fetches the "cooked" vblank count value that represents the number of
* vblank events since the system was booted, including lost events due to * vblank events since the system was booted, including lost events due to
...@@ -871,11 +873,11 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc, ...@@ -871,11 +873,11 @@ drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
* Returns: * Returns:
* The software vblank counter. * The software vblank counter.
*/ */
u32 drm_vblank_count(struct drm_device *dev, int crtc) u32 drm_vblank_count(struct drm_device *dev, int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return 0; return 0;
return vblank->count; return vblank->count;
...@@ -902,11 +904,10 @@ u32 drm_crtc_vblank_count(struct drm_crtc *crtc) ...@@ -902,11 +904,10 @@ u32 drm_crtc_vblank_count(struct drm_crtc *crtc)
EXPORT_SYMBOL(drm_crtc_vblank_count); EXPORT_SYMBOL(drm_crtc_vblank_count);
/** /**
* drm_vblank_count_and_time - retrieve "cooked" vblank counter value * drm_vblank_count_and_time - retrieve "cooked" vblank counter value and the
* and the system timestamp corresponding to that vblank counter value. * system timestamp corresponding to that vblank counter value.
*
* @dev: DRM device * @dev: DRM device
* @crtc: which counter to retrieve * @pipe: index of CRTC whose counter to retrieve
* @vblanktime: Pointer to struct timeval to receive the vblank timestamp. * @vblanktime: Pointer to struct timeval to receive the vblank timestamp.
* *
* Fetches the "cooked" vblank count value that represents the number of * Fetches the "cooked" vblank count value that represents the number of
...@@ -914,13 +915,13 @@ EXPORT_SYMBOL(drm_crtc_vblank_count); ...@@ -914,13 +915,13 @@ EXPORT_SYMBOL(drm_crtc_vblank_count);
* modesetting activity. Returns corresponding system timestamp of the time * modesetting activity. Returns corresponding system timestamp of the time
* of the vblank interval that corresponds to the current vblank counter value. * of the vblank interval that corresponds to the current vblank counter value.
*/ */
u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc, u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
struct timeval *vblanktime) struct timeval *vblanktime)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u32 cur_vblank; u32 cur_vblank;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return 0; return 0;
/* /*
...@@ -931,7 +932,7 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc, ...@@ -931,7 +932,7 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
do { do {
cur_vblank = vblank->count; cur_vblank = vblank->count;
smp_rmb(); smp_rmb();
*vblanktime = vblanktimestamp(dev, crtc, cur_vblank); *vblanktime = vblanktimestamp(dev, pipe, cur_vblank);
smp_rmb(); smp_rmb();
} while (cur_vblank != vblank->count); } while (cur_vblank != vblank->count);
...@@ -958,7 +959,7 @@ static void send_vblank_event(struct drm_device *dev, ...@@ -958,7 +959,7 @@ static void send_vblank_event(struct drm_device *dev,
/** /**
* drm_send_vblank_event - helper to send vblank event after pageflip * drm_send_vblank_event - helper to send vblank event after pageflip
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @pipe: CRTC index
* @e: the event to send * @e: the event to send
* *
* Updates sequence # and timestamp on event, and sends it to userspace. * Updates sequence # and timestamp on event, and sends it to userspace.
...@@ -966,20 +967,20 @@ static void send_vblank_event(struct drm_device *dev, ...@@ -966,20 +967,20 @@ static void send_vblank_event(struct drm_device *dev,
* *
* This is the legacy version of drm_crtc_send_vblank_event(). * This is the legacy version of drm_crtc_send_vblank_event().
*/ */
void drm_send_vblank_event(struct drm_device *dev, int crtc, void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
struct drm_pending_vblank_event *e) struct drm_pending_vblank_event *e)
{ {
struct timeval now; struct timeval now;
unsigned int seq; unsigned int seq;
if (dev->num_crtcs > 0) { if (dev->num_crtcs > 0) {
seq = drm_vblank_count_and_time(dev, crtc, &now); seq = drm_vblank_count_and_time(dev, pipe, &now);
} else { } else {
seq = 0; seq = 0;
now = get_drm_timestamp(); now = get_drm_timestamp();
} }
e->pipe = crtc; e->pipe = pipe;
send_vblank_event(dev, e, seq, &now); send_vblank_event(dev, e, seq, &now);
} }
EXPORT_SYMBOL(drm_send_vblank_event); EXPORT_SYMBOL(drm_send_vblank_event);
...@@ -1004,11 +1005,11 @@ EXPORT_SYMBOL(drm_crtc_send_vblank_event); ...@@ -1004,11 +1005,11 @@ EXPORT_SYMBOL(drm_crtc_send_vblank_event);
/** /**
* drm_vblank_enable - enable the vblank interrupt on a CRTC * drm_vblank_enable - enable the vblank interrupt on a CRTC
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @pipe: CRTC index
*/ */
static int drm_vblank_enable(struct drm_device *dev, int crtc) static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
int ret = 0; int ret = 0;
assert_spin_locked(&dev->vbl_lock); assert_spin_locked(&dev->vbl_lock);
...@@ -1023,13 +1024,13 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc) ...@@ -1023,13 +1024,13 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc)
* timestamps. Filtercode in drm_handle_vblank() will * timestamps. Filtercode in drm_handle_vblank() will
* prevent double-accounting of same vblank interval. * prevent double-accounting of same vblank interval.
*/ */
ret = dev->driver->enable_vblank(dev, crtc); ret = dev->driver->enable_vblank(dev, pipe);
DRM_DEBUG("enabling vblank on crtc %d, ret: %d\n", crtc, ret); DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
if (ret) if (ret)
atomic_dec(&vblank->refcount); atomic_dec(&vblank->refcount);
else { else {
vblank->enabled = true; vblank->enabled = true;
drm_update_vblank_count(dev, crtc); drm_update_vblank_count(dev, pipe);
} }
} }
...@@ -1041,7 +1042,7 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc) ...@@ -1041,7 +1042,7 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc)
/** /**
* drm_vblank_get - get a reference count on vblank events * drm_vblank_get - get a reference count on vblank events
* @dev: DRM device * @dev: DRM device
* @crtc: which CRTC to own * @pipe: index of CRTC to own
* *
* Acquire a reference count on vblank events to avoid having them disabled * Acquire a reference count on vblank events to avoid having them disabled
* while in use. * while in use.
...@@ -1051,22 +1052,22 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc) ...@@ -1051,22 +1052,22 @@ static int drm_vblank_enable(struct drm_device *dev, int crtc)
* Returns: * Returns:
* Zero on success, nonzero on failure. * Zero on success, nonzero on failure.
*/ */
int drm_vblank_get(struct drm_device *dev, int crtc) int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
unsigned long irqflags; unsigned long irqflags;
int ret = 0; int ret = 0;
if (!dev->num_crtcs) if (!dev->num_crtcs)
return -EINVAL; return -EINVAL;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&dev->vbl_lock, irqflags); spin_lock_irqsave(&dev->vbl_lock, irqflags);
/* Going from 0->1 means we have to enable interrupts again */ /* Going from 0->1 means we have to enable interrupts again */
if (atomic_add_return(1, &vblank->refcount) == 1) { if (atomic_add_return(1, &vblank->refcount) == 1) {
ret = drm_vblank_enable(dev, crtc); ret = drm_vblank_enable(dev, pipe);
} else { } else {
if (!vblank->enabled) { if (!vblank->enabled) {
atomic_dec(&vblank->refcount); atomic_dec(&vblank->refcount);
...@@ -1098,20 +1099,20 @@ int drm_crtc_vblank_get(struct drm_crtc *crtc) ...@@ -1098,20 +1099,20 @@ int drm_crtc_vblank_get(struct drm_crtc *crtc)
EXPORT_SYMBOL(drm_crtc_vblank_get); EXPORT_SYMBOL(drm_crtc_vblank_get);
/** /**
* drm_vblank_put - give up ownership of vblank events * drm_vblank_put - release ownership of vblank events
* @dev: DRM device * @dev: DRM device
* @crtc: which counter to give up * @pipe: index of CRTC to release
* *
* Release ownership of a given vblank counter, turning off interrupts * Release ownership of a given vblank counter, turning off interrupts
* if possible. Disable interrupts after drm_vblank_offdelay milliseconds. * if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
* *
* This is the legacy version of drm_crtc_vblank_put(). * This is the legacy version of drm_crtc_vblank_put().
*/ */
void drm_vblank_put(struct drm_device *dev, int crtc) void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return; return;
if (WARN_ON(atomic_read(&vblank->refcount) == 0)) if (WARN_ON(atomic_read(&vblank->refcount) == 0))
...@@ -1148,33 +1149,34 @@ EXPORT_SYMBOL(drm_crtc_vblank_put); ...@@ -1148,33 +1149,34 @@ EXPORT_SYMBOL(drm_crtc_vblank_put);
/** /**
* drm_wait_one_vblank - wait for one vblank * drm_wait_one_vblank - wait for one vblank
* @dev: DRM device * @dev: DRM device
* @crtc: 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 @crtc, 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 @crtc 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, int crtc) void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
int ret; int ret;
u32 last; u32 last;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return; return;
ret = drm_vblank_get(dev, crtc); ret = drm_vblank_get(dev, pipe);
if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", crtc, ret)) if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
return; return;
last = drm_vblank_count(dev, crtc); last = drm_vblank_count(dev, pipe);
ret = wait_event_timeout(dev->vblank[crtc].queue, ret = wait_event_timeout(vblank->queue,
last != drm_vblank_count(dev, crtc), last != drm_vblank_count(dev, pipe),
msecs_to_jiffies(100)); msecs_to_jiffies(100));
WARN(ret == 0, "vblank wait timed out on crtc %i\n", crtc); WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
drm_vblank_put(dev, crtc); drm_vblank_put(dev, pipe);
} }
EXPORT_SYMBOL(drm_wait_one_vblank); EXPORT_SYMBOL(drm_wait_one_vblank);
...@@ -1195,7 +1197,7 @@ EXPORT_SYMBOL(drm_crtc_wait_one_vblank); ...@@ -1195,7 +1197,7 @@ EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
/** /**
* drm_vblank_off - disable vblank events on a CRTC * drm_vblank_off - disable vblank events on a CRTC
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @pipe: CRTC index
* *
* Drivers can use this function to shut down the vblank interrupt handling when * Drivers can use this function to shut down the vblank interrupt handling when
* disabling a crtc. This function ensures that the latest vblank frame count is * disabling a crtc. This function ensures that the latest vblank frame count is
...@@ -1206,21 +1208,21 @@ EXPORT_SYMBOL(drm_crtc_wait_one_vblank); ...@@ -1206,21 +1208,21 @@ EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
* *
* This is the legacy version of drm_crtc_vblank_off(). * This is the legacy version of drm_crtc_vblank_off().
*/ */
void drm_vblank_off(struct drm_device *dev, int crtc) void drm_vblank_off(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
struct drm_pending_vblank_event *e, *t; struct drm_pending_vblank_event *e, *t;
struct timeval now; struct timeval now;
unsigned long irqflags; unsigned long irqflags;
unsigned int seq; unsigned int seq;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return; return;
spin_lock_irqsave(&dev->event_lock, irqflags); spin_lock_irqsave(&dev->event_lock, irqflags);
spin_lock(&dev->vbl_lock); spin_lock(&dev->vbl_lock);
vblank_disable_and_save(dev, crtc); vblank_disable_and_save(dev, pipe);
wake_up(&vblank->queue); wake_up(&vblank->queue);
/* /*
...@@ -1234,16 +1236,16 @@ void drm_vblank_off(struct drm_device *dev, int crtc) ...@@ -1234,16 +1236,16 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
spin_unlock(&dev->vbl_lock); spin_unlock(&dev->vbl_lock);
/* Send any queued vblank events, lest the natives grow disquiet */ /* Send any queued vblank events, lest the natives grow disquiet */
seq = drm_vblank_count_and_time(dev, crtc, &now); seq = drm_vblank_count_and_time(dev, pipe, &now);
list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) { list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
if (e->pipe != crtc) if (e->pipe != pipe)
continue; continue;
DRM_DEBUG("Sending premature vblank event on disable: \ DRM_DEBUG("Sending premature vblank event on disable: \
wanted %d, current %d\n", wanted %d, current %d\n",
e->event.sequence, seq); e->event.sequence, seq);
list_del(&e->base.link); list_del(&e->base.link);
drm_vblank_put(dev, e->pipe); drm_vblank_put(dev, pipe);
send_vblank_event(dev, e, seq, &now); send_vblank_event(dev, e, seq, &now);
} }
spin_unlock_irqrestore(&dev->event_lock, irqflags); spin_unlock_irqrestore(&dev->event_lock, irqflags);
...@@ -1304,7 +1306,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_reset); ...@@ -1304,7 +1306,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_reset);
/** /**
* drm_vblank_on - enable vblank events on a CRTC * drm_vblank_on - enable vblank events on a CRTC
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @pipe: CRTC index
* *
* This functions restores the vblank interrupt state captured with * This functions restores the vblank interrupt state captured with
* drm_vblank_off() again. Note that calls to drm_vblank_on() and * drm_vblank_off() again. Note that calls to drm_vblank_on() and
...@@ -1313,12 +1315,12 @@ EXPORT_SYMBOL(drm_crtc_vblank_reset); ...@@ -1313,12 +1315,12 @@ EXPORT_SYMBOL(drm_crtc_vblank_reset);
* *
* This is the legacy version of drm_crtc_vblank_on(). * This is the legacy version of drm_crtc_vblank_on().
*/ */
void drm_vblank_on(struct drm_device *dev, int crtc) void drm_vblank_on(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
unsigned long irqflags; unsigned long irqflags;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return; return;
spin_lock_irqsave(&dev->vbl_lock, irqflags); spin_lock_irqsave(&dev->vbl_lock, irqflags);
...@@ -1336,7 +1338,7 @@ void drm_vblank_on(struct drm_device *dev, int crtc) ...@@ -1336,7 +1338,7 @@ void drm_vblank_on(struct drm_device *dev, int crtc)
* vblank counter value before and after a modeset * vblank counter value before and after a modeset
*/ */
vblank->last = vblank->last =
(dev->driver->get_vblank_counter(dev, crtc) - 1) & (dev->driver->get_vblank_counter(dev, pipe) - 1) &
dev->max_vblank_count; dev->max_vblank_count;
/* /*
* re-enable interrupts if there are users left, or the * re-enable interrupts if there are users left, or the
...@@ -1344,7 +1346,7 @@ void drm_vblank_on(struct drm_device *dev, int crtc) ...@@ -1344,7 +1346,7 @@ void drm_vblank_on(struct drm_device *dev, int crtc)
*/ */
if (atomic_read(&vblank->refcount) != 0 || if (atomic_read(&vblank->refcount) != 0 ||
(!dev->vblank_disable_immediate && drm_vblank_offdelay == 0)) (!dev->vblank_disable_immediate && drm_vblank_offdelay == 0))
WARN_ON(drm_vblank_enable(dev, crtc)); WARN_ON(drm_vblank_enable(dev, pipe));
spin_unlock_irqrestore(&dev->vbl_lock, irqflags); spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
} }
EXPORT_SYMBOL(drm_vblank_on); EXPORT_SYMBOL(drm_vblank_on);
...@@ -1369,7 +1371,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_on); ...@@ -1369,7 +1371,7 @@ EXPORT_SYMBOL(drm_crtc_vblank_on);
/** /**
* drm_vblank_pre_modeset - account for vblanks across mode sets * drm_vblank_pre_modeset - account for vblanks across mode sets
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @pipe: CRTC index
* *
* Account for vblank events across mode setting events, which will likely * Account for vblank events across mode setting events, which will likely
* reset the hardware frame counter. * reset the hardware frame counter.
...@@ -1389,15 +1391,15 @@ EXPORT_SYMBOL(drm_crtc_vblank_on); ...@@ -1389,15 +1391,15 @@ EXPORT_SYMBOL(drm_crtc_vblank_on);
* Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc * Drivers must call drm_vblank_post_modeset() when re-enabling the same crtc
* again. * again.
*/ */
void drm_vblank_pre_modeset(struct drm_device *dev, int crtc) void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
/* vblank is not initialized (IRQ not installed ?), or has been freed */ /* vblank is not initialized (IRQ not installed ?), or has been freed */
if (!dev->num_crtcs) if (!dev->num_crtcs)
return; return;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return; return;
/* /*
...@@ -1409,7 +1411,7 @@ void drm_vblank_pre_modeset(struct drm_device *dev, int crtc) ...@@ -1409,7 +1411,7 @@ void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)
*/ */
if (!vblank->inmodeset) { if (!vblank->inmodeset) {
vblank->inmodeset = 0x1; vblank->inmodeset = 0x1;
if (drm_vblank_get(dev, crtc) == 0) if (drm_vblank_get(dev, pipe) == 0)
vblank->inmodeset |= 0x2; vblank->inmodeset |= 0x2;
} }
} }
...@@ -1418,21 +1420,21 @@ EXPORT_SYMBOL(drm_vblank_pre_modeset); ...@@ -1418,21 +1420,21 @@ EXPORT_SYMBOL(drm_vblank_pre_modeset);
/** /**
* drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes * drm_vblank_post_modeset - undo drm_vblank_pre_modeset changes
* @dev: DRM device * @dev: DRM device
* @crtc: CRTC in question * @pipe: CRTC index
* *
* This function again drops the temporary vblank reference acquired in * This function again drops the temporary vblank reference acquired in
* drm_vblank_pre_modeset. * drm_vblank_pre_modeset.
*/ */
void drm_vblank_post_modeset(struct drm_device *dev, int crtc) void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
unsigned long irqflags; unsigned long irqflags;
/* vblank is not initialized (IRQ not installed ?), or has been freed */ /* vblank is not initialized (IRQ not installed ?), or has been freed */
if (!dev->num_crtcs) if (!dev->num_crtcs)
return; return;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return; return;
if (vblank->inmodeset) { if (vblank->inmodeset) {
...@@ -1441,7 +1443,7 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc) ...@@ -1441,7 +1443,7 @@ void drm_vblank_post_modeset(struct drm_device *dev, int crtc)
spin_unlock_irqrestore(&dev->vbl_lock, irqflags); spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
if (vblank->inmodeset & 0x2) if (vblank->inmodeset & 0x2)
drm_vblank_put(dev, crtc); drm_vblank_put(dev, pipe);
vblank->inmodeset = 0; vblank->inmodeset = 0;
} }
...@@ -1463,7 +1465,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, ...@@ -1463,7 +1465,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_modeset_ctl *modeset = data; struct drm_modeset_ctl *modeset = data;
unsigned int crtc; unsigned int pipe;
/* If drm_vblank_init() hasn't been called yet, just no-op */ /* If drm_vblank_init() hasn't been called yet, just no-op */
if (!dev->num_crtcs) if (!dev->num_crtcs)
...@@ -1473,16 +1475,16 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, ...@@ -1473,16 +1475,16 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
if (drm_core_check_feature(dev, DRIVER_MODESET)) if (drm_core_check_feature(dev, DRIVER_MODESET))
return 0; return 0;
crtc = modeset->crtc; pipe = modeset->crtc;
if (crtc >= dev->num_crtcs) if (pipe >= dev->num_crtcs)
return -EINVAL; return -EINVAL;
switch (modeset->cmd) { switch (modeset->cmd) {
case _DRM_PRE_MODESET: case _DRM_PRE_MODESET:
drm_vblank_pre_modeset(dev, crtc); drm_vblank_pre_modeset(dev, pipe);
break; break;
case _DRM_POST_MODESET: case _DRM_POST_MODESET:
drm_vblank_post_modeset(dev, crtc); drm_vblank_post_modeset(dev, pipe);
break; break;
default: default:
return -EINVAL; return -EINVAL;
...@@ -1491,7 +1493,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, ...@@ -1491,7 +1493,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
return 0; return 0;
} }
static int drm_queue_vblank_event(struct drm_device *dev, int pipe, static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
union drm_wait_vblank *vblwait, union drm_wait_vblank *vblwait,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
...@@ -1545,7 +1547,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe, ...@@ -1545,7 +1547,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
vblwait->reply.sequence = vblwait->request.sequence; vblwait->reply.sequence = vblwait->request.sequence;
} }
DRM_DEBUG("event on vblank count %d, current %d, crtc %d\n", DRM_DEBUG("event on vblank count %d, current %d, crtc %u\n",
vblwait->request.sequence, seq, pipe); vblwait->request.sequence, seq, pipe);
trace_drm_vblank_event_queued(current->pid, pipe, trace_drm_vblank_event_queued(current->pid, pipe,
...@@ -1594,7 +1596,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ...@@ -1594,7 +1596,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
struct drm_vblank_crtc *vblank; struct drm_vblank_crtc *vblank;
union drm_wait_vblank *vblwait = data; union drm_wait_vblank *vblwait = data;
int ret; int ret;
unsigned int flags, seq, crtc, high_crtc; unsigned int flags, seq, pipe, high_pipe;
if (!dev->irq_enabled) if (!dev->irq_enabled)
return -EINVAL; return -EINVAL;
...@@ -1613,22 +1615,22 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ...@@ -1613,22 +1615,22 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
} }
flags = vblwait->request.type & _DRM_VBLANK_FLAGS_MASK; flags = vblwait->request.type & _DRM_VBLANK_FLAGS_MASK;
high_crtc = (vblwait->request.type & _DRM_VBLANK_HIGH_CRTC_MASK); high_pipe = (vblwait->request.type & _DRM_VBLANK_HIGH_CRTC_MASK);
if (high_crtc) if (high_pipe)
crtc = high_crtc >> _DRM_VBLANK_HIGH_CRTC_SHIFT; pipe = high_pipe >> _DRM_VBLANK_HIGH_CRTC_SHIFT;
else else
crtc = flags & _DRM_VBLANK_SECONDARY ? 1 : 0; pipe = flags & _DRM_VBLANK_SECONDARY ? 1 : 0;
if (crtc >= dev->num_crtcs) if (pipe >= dev->num_crtcs)
return -EINVAL; return -EINVAL;
vblank = &dev->vblank[crtc]; vblank = &dev->vblank[pipe];
ret = drm_vblank_get(dev, crtc); ret = drm_vblank_get(dev, pipe);
if (ret) { if (ret) {
DRM_DEBUG("failed to acquire vblank counter, %d\n", ret); DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);
return ret; return ret;
} }
seq = drm_vblank_count(dev, crtc); seq = drm_vblank_count(dev, pipe);
switch (vblwait->request.type & _DRM_VBLANK_TYPES_MASK) { switch (vblwait->request.type & _DRM_VBLANK_TYPES_MASK) {
case _DRM_VBLANK_RELATIVE: case _DRM_VBLANK_RELATIVE:
...@@ -1645,7 +1647,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ...@@ -1645,7 +1647,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
/* must hold on to the vblank ref until the event fires /* must hold on to the vblank ref until the event fires
* drm_vblank_put will be called asynchronously * drm_vblank_put will be called asynchronously
*/ */
return drm_queue_vblank_event(dev, crtc, vblwait, file_priv); return drm_queue_vblank_event(dev, pipe, vblwait, file_priv);
} }
if ((flags & _DRM_VBLANK_NEXTONMISS) && if ((flags & _DRM_VBLANK_NEXTONMISS) &&
...@@ -1653,11 +1655,11 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ...@@ -1653,11 +1655,11 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
vblwait->request.sequence = seq + 1; vblwait->request.sequence = seq + 1;
} }
DRM_DEBUG("waiting on vblank count %d, crtc %d\n", DRM_DEBUG("waiting on vblank count %d, crtc %u\n",
vblwait->request.sequence, crtc); vblwait->request.sequence, pipe);
vblank->last_wait = vblwait->request.sequence; vblank->last_wait = vblwait->request.sequence;
DRM_WAIT_ON(ret, vblank->queue, 3 * HZ, DRM_WAIT_ON(ret, vblank->queue, 3 * HZ,
(((drm_vblank_count(dev, crtc) - (((drm_vblank_count(dev, pipe) -
vblwait->request.sequence) <= (1 << 23)) || vblwait->request.sequence) <= (1 << 23)) ||
!vblank->enabled || !vblank->enabled ||
!dev->irq_enabled)); !dev->irq_enabled));
...@@ -1665,7 +1667,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ...@@ -1665,7 +1667,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
if (ret != -EINTR) { if (ret != -EINTR) {
struct timeval now; struct timeval now;
vblwait->reply.sequence = drm_vblank_count_and_time(dev, crtc, &now); vblwait->reply.sequence = drm_vblank_count_and_time(dev, pipe, &now);
vblwait->reply.tval_sec = now.tv_sec; vblwait->reply.tval_sec = now.tv_sec;
vblwait->reply.tval_usec = now.tv_usec; vblwait->reply.tval_usec = now.tv_usec;
...@@ -1676,11 +1678,11 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ...@@ -1676,11 +1678,11 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
} }
done: done:
drm_vblank_put(dev, crtc); drm_vblank_put(dev, pipe);
return ret; return ret;
} }
static void drm_handle_vblank_events(struct drm_device *dev, int crtc) static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_pending_vblank_event *e, *t; struct drm_pending_vblank_event *e, *t;
struct timeval now; struct timeval now;
...@@ -1688,10 +1690,10 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc) ...@@ -1688,10 +1690,10 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc)
assert_spin_locked(&dev->event_lock); assert_spin_locked(&dev->event_lock);
seq = drm_vblank_count_and_time(dev, crtc, &now); seq = drm_vblank_count_and_time(dev, pipe, &now);
list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) { list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
if (e->pipe != crtc) if (e->pipe != pipe)
continue; continue;
if ((seq - e->event.sequence) > (1<<23)) if ((seq - e->event.sequence) > (1<<23))
continue; continue;
...@@ -1700,26 +1702,26 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc) ...@@ -1700,26 +1702,26 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc)
e->event.sequence, seq); e->event.sequence, seq);
list_del(&e->base.link); list_del(&e->base.link);
drm_vblank_put(dev, e->pipe); drm_vblank_put(dev, pipe);
send_vblank_event(dev, e, seq, &now); send_vblank_event(dev, e, seq, &now);
} }
trace_drm_vblank_event(crtc, seq); trace_drm_vblank_event(pipe, seq);
} }
/** /**
* drm_handle_vblank - handle a vblank event * drm_handle_vblank - handle a vblank event
* @dev: DRM device * @dev: DRM device
* @crtc: where this event occurred * @pipe: index of CRTC where this event occurred
* *
* Drivers should call this routine in their vblank interrupt handlers to * Drivers should call this routine in their vblank interrupt handlers to
* update the vblank counter and send any signals that may be pending. * update the vblank counter and send any signals that may be pending.
* *
* This is the legacy version of drm_crtc_handle_vblank(). * This is the legacy version of drm_crtc_handle_vblank().
*/ */
bool drm_handle_vblank(struct drm_device *dev, int crtc) bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u32 vblcount; u32 vblcount;
s64 diff_ns; s64 diff_ns;
struct timeval tvblank; struct timeval tvblank;
...@@ -1728,7 +1730,7 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc) ...@@ -1728,7 +1730,7 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
if (WARN_ON_ONCE(!dev->num_crtcs)) if (WARN_ON_ONCE(!dev->num_crtcs))
return false; return false;
if (WARN_ON(crtc >= dev->num_crtcs)) if (WARN_ON(pipe >= dev->num_crtcs))
return false; return false;
spin_lock_irqsave(&dev->event_lock, irqflags); spin_lock_irqsave(&dev->event_lock, irqflags);
...@@ -1752,11 +1754,11 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc) ...@@ -1752,11 +1754,11 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
/* Get current timestamp and count. */ /* Get current timestamp and count. */
vblcount = vblank->count; vblcount = vblank->count;
drm_get_last_vbltimestamp(dev, crtc, &tvblank, DRM_CALLED_FROM_VBLIRQ); drm_get_last_vbltimestamp(dev, pipe, &tvblank, DRM_CALLED_FROM_VBLIRQ);
/* Compute time difference to timestamp of last vblank */ /* Compute time difference to timestamp of last vblank */
diff_ns = timeval_to_ns(&tvblank) - diff_ns = timeval_to_ns(&tvblank) -
timeval_to_ns(&vblanktimestamp(dev, crtc, vblcount)); timeval_to_ns(&vblanktimestamp(dev, pipe, vblcount));
/* Update vblank timestamp and count if at least /* Update vblank timestamp and count if at least
* DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds * DRM_REDUNDANT_VBLIRQ_THRESH_NS nanoseconds
...@@ -1768,15 +1770,15 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc) ...@@ -1768,15 +1770,15 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
* ignore those for accounting. * ignore those for accounting.
*/ */
if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS) if (abs64(diff_ns) > DRM_REDUNDANT_VBLIRQ_THRESH_NS)
store_vblank(dev, crtc, 1, &tvblank); store_vblank(dev, pipe, 1, &tvblank);
else else
DRM_DEBUG("crtc %d: Redundant vblirq ignored. diff_ns = %d\n", DRM_DEBUG("crtc %u: Redundant vblirq ignored. diff_ns = %d\n",
crtc, (int) diff_ns); pipe, (int) diff_ns);
spin_unlock(&dev->vblank_time_lock); spin_unlock(&dev->vblank_time_lock);
wake_up(&vblank->queue); wake_up(&vblank->queue);
drm_handle_vblank_events(dev, crtc); drm_handle_vblank_events(dev, pipe);
spin_unlock_irqrestore(&dev->event_lock, irqflags); spin_unlock_irqrestore(&dev->event_lock, irqflags);
......
include/drm/drmP.h
View file @ cc1ef118
...@@ -681,7 +681,7 @@ struct drm_minor { ...@@ -681,7 +681,7 @@ struct drm_minor {
struct drm_pending_vblank_event { struct drm_pending_vblank_event {
struct drm_pending_event base; struct drm_pending_event base;
int pipe; unsigned int pipe;
struct drm_event_vblank event; struct drm_event_vblank event;
}; };
...@@ -700,7 +700,7 @@ struct drm_vblank_crtc { ...@@ -700,7 +700,7 @@ struct drm_vblank_crtc {
/* for wraparound handling */ /* for wraparound handling */
u32 last_wait; /* Last vblank seqno waited per CRTC */ u32 last_wait; /* Last vblank seqno waited per CRTC */
unsigned int inmodeset; /* Display driver is setting mode */ unsigned int inmodeset; /* Display driver is setting mode */
int crtc; /* crtc index */ unsigned int pipe; /* crtc index */
bool enabled; /* so we don't call enable more than bool enabled; /* so we don't call enable more than
once per disable */ once per disable */
}; };
...@@ -920,34 +920,34 @@ void drm_clflush_virt_range(void *addr, unsigned long length); ...@@ -920,34 +920,34 @@ void drm_clflush_virt_range(void *addr, unsigned long length);
extern int drm_irq_install(struct drm_device *dev, int irq); extern int drm_irq_install(struct drm_device *dev, int irq);
extern int drm_irq_uninstall(struct drm_device *dev); extern int drm_irq_uninstall(struct drm_device *dev);
extern int drm_vblank_init(struct drm_device *dev, int num_crtcs); extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs);
extern int drm_wait_vblank(struct drm_device *dev, void *data, extern int drm_wait_vblank(struct drm_device *dev, void *data,
struct drm_file *filp); struct drm_file *filp);
extern u32 drm_vblank_count(struct drm_device *dev, int crtc); extern u32 drm_vblank_count(struct drm_device *dev, int pipe);
extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc); extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
extern u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc, extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
struct timeval *vblanktime); struct timeval *vblanktime);
extern void drm_send_vblank_event(struct drm_device *dev, int crtc, extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe,
struct drm_pending_vblank_event *e); struct drm_pending_vblank_event *e);
extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc, extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
struct drm_pending_vblank_event *e); struct drm_pending_vblank_event *e);
extern bool drm_handle_vblank(struct drm_device *dev, int crtc); extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);
extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc); extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc);
extern int drm_vblank_get(struct drm_device *dev, int crtc); extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe);
extern void drm_vblank_put(struct drm_device *dev, int crtc); extern void drm_vblank_put(struct drm_device *dev, unsigned int pipe);
extern int drm_crtc_vblank_get(struct drm_crtc *crtc); extern int drm_crtc_vblank_get(struct drm_crtc *crtc);
extern void drm_crtc_vblank_put(struct drm_crtc *crtc); extern void drm_crtc_vblank_put(struct drm_crtc *crtc);
extern void drm_wait_one_vblank(struct drm_device *dev, int crtc); extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe);
extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc); extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc);
extern void drm_vblank_off(struct drm_device *dev, int crtc); extern void drm_vblank_off(struct drm_device *dev, unsigned int pipe);
extern void drm_vblank_on(struct drm_device *dev, int crtc); extern void drm_vblank_on(struct drm_device *dev, unsigned int pipe);
extern void drm_crtc_vblank_off(struct drm_crtc *crtc); extern void drm_crtc_vblank_off(struct drm_crtc *crtc);
extern void drm_crtc_vblank_reset(struct drm_crtc *crtc); extern void drm_crtc_vblank_reset(struct drm_crtc *crtc);
extern void drm_crtc_vblank_on(struct drm_crtc *crtc); extern void drm_crtc_vblank_on(struct drm_crtc *crtc);
extern void drm_vblank_cleanup(struct drm_device *dev); extern void drm_vblank_cleanup(struct drm_device *dev);
extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
int crtc, int *max_error, unsigned int pipe, int *max_error,
struct timeval *vblank_time, struct timeval *vblank_time,
unsigned flags, unsigned flags,
const struct drm_crtc *refcrtc, const struct drm_crtc *refcrtc,
...@@ -968,8 +968,8 @@ static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc ...@@ -968,8 +968,8 @@ static inline wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc
} }
/* Modesetting support */ /* Modesetting support */
extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); extern void drm_vblank_pre_modeset(struct drm_device *dev, unsigned int pipe);
extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc); extern void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe);
/* Stub support (drm_stub.h) */ /* Stub support (drm_stub.h) */
extern struct drm_master *drm_master_get(struct drm_master *master); extern struct drm_master *drm_master_get(struct drm_master *master);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7