|
@@ -730,6 +730,8 @@ EXPORT_SYMBOL(drm_get_last_vbltimestamp);
|
|
*/
|
|
*/
|
|
u32 drm_vblank_count(struct drm_device *dev, int crtc)
|
|
u32 drm_vblank_count(struct drm_device *dev, int crtc)
|
|
{
|
|
{
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ return 0;
|
|
return atomic_read(&dev->vblank[crtc].count);
|
|
return atomic_read(&dev->vblank[crtc].count);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(drm_vblank_count);
|
|
EXPORT_SYMBOL(drm_vblank_count);
|
|
@@ -752,6 +754,9 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, int crtc,
|
|
{
|
|
{
|
|
u32 cur_vblank;
|
|
u32 cur_vblank;
|
|
|
|
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
/* Read timestamp from slot of _vblank_time ringbuffer
|
|
/* Read timestamp from slot of _vblank_time ringbuffer
|
|
* that corresponds to current vblank count. Retry if
|
|
* that corresponds to current vblank count. Retry if
|
|
* count has incremented during readout. This works like
|
|
* count has incremented during readout. This works like
|
|
@@ -927,6 +932,9 @@ int drm_vblank_get(struct drm_device *dev, int crtc)
|
|
unsigned long irqflags;
|
|
unsigned long irqflags;
|
|
int ret = 0;
|
|
int ret = 0;
|
|
|
|
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ 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, &dev->vblank[crtc].refcount) == 1) {
|
|
if (atomic_add_return(1, &dev->vblank[crtc].refcount) == 1) {
|
|
@@ -975,6 +983,9 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
|
|
{
|
|
{
|
|
BUG_ON(atomic_read(&dev->vblank[crtc].refcount) == 0);
|
|
BUG_ON(atomic_read(&dev->vblank[crtc].refcount) == 0);
|
|
|
|
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ return;
|
|
|
|
+
|
|
/* Last user schedules interrupt disable */
|
|
/* Last user schedules interrupt disable */
|
|
if (atomic_dec_and_test(&dev->vblank[crtc].refcount) &&
|
|
if (atomic_dec_and_test(&dev->vblank[crtc].refcount) &&
|
|
(drm_vblank_offdelay > 0))
|
|
(drm_vblank_offdelay > 0))
|
|
@@ -1019,6 +1030,9 @@ void drm_vblank_off(struct drm_device *dev, int crtc)
|
|
unsigned long irqflags;
|
|
unsigned long irqflags;
|
|
unsigned int seq;
|
|
unsigned int seq;
|
|
|
|
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ return;
|
|
|
|
+
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
vblank_disable_and_save(dev, crtc);
|
|
vblank_disable_and_save(dev, crtc);
|
|
wake_up(&dev->vblank[crtc].queue);
|
|
wake_up(&dev->vblank[crtc].queue);
|
|
@@ -1078,6 +1092,9 @@ void drm_vblank_on(struct drm_device *dev, int crtc)
|
|
{
|
|
{
|
|
unsigned long irqflags;
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ return;
|
|
|
|
+
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
/* re-enable interrupts if there's are users left */
|
|
/* re-enable interrupts if there's are users left */
|
|
if (atomic_read(&dev->vblank[crtc].refcount) != 0)
|
|
if (atomic_read(&dev->vblank[crtc].refcount) != 0)
|
|
@@ -1131,6 +1148,10 @@ void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)
|
|
/* 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))
|
|
|
|
+ return;
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* To avoid all the problems that might happen if interrupts
|
|
* To avoid all the problems that might happen if interrupts
|
|
* were enabled/disabled around or between these calls, we just
|
|
* were enabled/disabled around or between these calls, we just
|
|
@@ -1439,6 +1460,9 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
|
|
if (!dev->num_crtcs)
|
|
if (!dev->num_crtcs)
|
|
return false;
|
|
return false;
|
|
|
|
|
|
|
|
+ if (WARN_ON(crtc >= dev->num_crtcs))
|
|
|
|
+ return false;
|
|
|
|
+
|
|
/* Need timestamp lock to prevent concurrent execution with
|
|
/* Need timestamp lock to prevent concurrent execution with
|
|
* vblank enable/disable, as this would cause inconsistent
|
|
* vblank enable/disable, as this would cause inconsistent
|
|
* or corrupted timestamps and vblank counts.
|
|
* or corrupted timestamps and vblank counts.
|