Skip to content

L
linux
Commit 5a4784f4 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files
Options

drm/vblank: use drm_WARN for all warnings 

Replace all the WARN_* variants with their drm_WARN counterparts.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200523071224.1716837-3-sam@ravnborg.org
parent 02149a76
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 33 deletions
drivers/gpu/drm/drm_vblank.c
View file @ 5a4784f4
...@@ -194,7 +194,7 @@ static u32 drm_max_vblank_count(struct drm_device *dev, unsigned int pipe) ...@@ -194,7 +194,7 @@ static u32 drm_max_vblank_count(struct drm_device *dev, unsigned int pipe)
*/ */
static u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe) static u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe)
{ {
WARN_ON_ONCE(drm_max_vblank_count(dev, pipe) != 0); drm_WARN_ON_ONCE(dev, drm_max_vblank_count(dev, pipe) != 0);
return 0; return 0;
} }
...@@ -203,7 +203,7 @@ static u32 __get_vblank_counter(struct drm_device *dev, unsigned int pipe) ...@@ -203,7 +203,7 @@ static u32 __get_vblank_counter(struct drm_device *dev, unsigned int pipe)
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe); struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
if (WARN_ON(!crtc)) if (drm_WARN_ON(dev, !crtc))
return 0; return 0;
if (crtc->funcs->get_vblank_counter) if (crtc->funcs->get_vblank_counter)
...@@ -347,7 +347,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe, ...@@ -347,7 +347,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
diff, cur_vblank, vblank->last); diff, cur_vblank, vblank->last);
if (diff == 0) { if (diff == 0) {
WARN_ON_ONCE(cur_vblank != vblank->last); drm_WARN_ON_ONCE(dev, cur_vblank != vblank->last);
return; return;
} }
...@@ -368,7 +368,7 @@ static u64 drm_vblank_count(struct drm_device *dev, unsigned int pipe) ...@@ -368,7 +368,7 @@ static u64 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u64 count; u64 count;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return 0; return 0;
count = atomic64_read(&vblank->count); count = atomic64_read(&vblank->count);
...@@ -403,9 +403,9 @@ u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) ...@@ -403,9 +403,9 @@ u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)
u64 vblank; u64 vblank;
unsigned long flags; unsigned long flags;
WARN_ONCE(drm_debug_enabled(DRM_UT_VBL) && drm_WARN_ONCE(dev, drm_debug_enabled(DRM_UT_VBL) &&
!crtc->funcs->get_vblank_timestamp, !crtc->funcs->get_vblank_timestamp,
"This function requires support for accurate vblank timestamps."); "This function requires support for accurate vblank timestamps.");
spin_lock_irqsave(&dev->vblank_time_lock, flags); spin_lock_irqsave(&dev->vblank_time_lock, flags);
...@@ -423,7 +423,7 @@ static void __disable_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -423,7 +423,7 @@ static void __disable_vblank(struct drm_device *dev, unsigned int pipe)
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe); struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
if (WARN_ON(!crtc)) if (drm_WARN_ON(dev, !crtc))
return; return;
if (crtc->funcs->disable_vblank) if (crtc->funcs->disable_vblank)
...@@ -497,8 +497,8 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr) ...@@ -497,8 +497,8 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr)
for (pipe = 0; pipe < dev->num_crtcs; pipe++) { for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
WARN_ON(READ_ONCE(vblank->enabled) && drm_WARN_ON(dev, READ_ONCE(vblank->enabled) &&
drm_core_check_feature(dev, DRIVER_MODESET)); drm_core_check_feature(dev, DRIVER_MODESET));
del_timer_sync(&vblank->disable_timer); del_timer_sync(&vblank->disable_timer);
} }
...@@ -608,7 +608,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc, ...@@ -608,7 +608,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
if (!drm_dev_has_vblank(dev)) if (!drm_dev_has_vblank(dev))
return; return;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
/* Valid dotclock? */ /* Valid dotclock? */
...@@ -716,7 +716,7 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal( ...@@ -716,7 +716,7 @@ drm_crtc_vblank_helper_get_vblank_timestamp_internal(
if (mode->crtc_clock == 0) { if (mode->crtc_clock == 0) {
drm_dbg_core(dev, "crtc %u: Noop due to uninitialized mode.\n", drm_dbg_core(dev, "crtc %u: Noop due to uninitialized mode.\n",
pipe); pipe);
WARN_ON_ONCE(drm_drv_uses_atomic_modeset(dev)); drm_WARN_ON_ONCE(dev, drm_drv_uses_atomic_modeset(dev));
return false; return false;
} }
...@@ -930,7 +930,7 @@ static u64 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe, ...@@ -930,7 +930,7 @@ static u64 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
u64 vblank_count; u64 vblank_count;
unsigned int seq; unsigned int seq;
if (WARN_ON(pipe >= dev->num_crtcs)) { if (drm_WARN_ON(dev, pipe >= dev->num_crtcs)) {
*vblanktime = 0; *vblanktime = 0;
return 0; return 0;
} }
...@@ -1088,7 +1088,7 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -1088,7 +1088,7 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe)
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe); struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
if (WARN_ON(!crtc)) if (drm_WARN_ON(dev, !crtc))
return 0; return 0;
if (crtc->funcs->enable_vblank) if (crtc->funcs->enable_vblank)
...@@ -1147,7 +1147,7 @@ static int drm_vblank_get(struct drm_device *dev, unsigned int pipe) ...@@ -1147,7 +1147,7 @@ static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
if (!drm_dev_has_vblank(dev)) if (!drm_dev_has_vblank(dev))
return -EINVAL; return -EINVAL;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&dev->vbl_lock, irqflags); spin_lock_irqsave(&dev->vbl_lock, irqflags);
...@@ -1185,10 +1185,10 @@ static void drm_vblank_put(struct drm_device *dev, unsigned int pipe) ...@@ -1185,10 +1185,10 @@ static void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
if (WARN_ON(atomic_read(&vblank->refcount) == 0)) if (drm_WARN_ON(dev, atomic_read(&vblank->refcount) == 0))
return; return;
/* Last user schedules interrupt disable */ /* Last user schedules interrupt disable */
...@@ -1233,11 +1233,12 @@ void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -1233,11 +1233,12 @@ void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
int ret; int ret;
u64 last; u64 last;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
ret = drm_vblank_get(dev, pipe); ret = drm_vblank_get(dev, pipe);
if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret)) if (drm_WARN(dev, ret, "vblank not available on crtc %i, ret=%i\n",
pipe, ret))
return; return;
last = drm_vblank_count(dev, pipe); last = drm_vblank_count(dev, pipe);
...@@ -1246,7 +1247,7 @@ void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -1246,7 +1247,7 @@ void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
last != drm_vblank_count(dev, pipe), 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", pipe); drm_WARN(dev, ret == 0, "vblank wait timed out on crtc %i\n", pipe);
drm_vblank_put(dev, pipe); drm_vblank_put(dev, pipe);
} }
...@@ -1288,7 +1289,7 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc) ...@@ -1288,7 +1289,7 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc)
unsigned long irqflags; unsigned long irqflags;
u64 seq; u64 seq;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
spin_lock_irqsave(&dev->event_lock, irqflags); spin_lock_irqsave(&dev->event_lock, irqflags);
...@@ -1365,7 +1366,7 @@ void drm_crtc_vblank_reset(struct drm_crtc *crtc) ...@@ -1365,7 +1366,7 @@ void drm_crtc_vblank_reset(struct drm_crtc *crtc)
} }
spin_unlock_irqrestore(&dev->vbl_lock, irqflags); spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
WARN_ON(!list_empty(&dev->vblank_event_list)); drm_WARN_ON(dev, !list_empty(&dev->vblank_event_list));
} }
EXPORT_SYMBOL(drm_crtc_vblank_reset); EXPORT_SYMBOL(drm_crtc_vblank_reset);
...@@ -1393,8 +1394,8 @@ void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc, ...@@ -1393,8 +1394,8 @@ void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc,
unsigned int pipe = drm_crtc_index(crtc); unsigned int pipe = drm_crtc_index(crtc);
struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
WARN_ON(dev->max_vblank_count); drm_WARN_ON(dev, dev->max_vblank_count);
WARN_ON(!READ_ONCE(vblank->inmodeset)); drm_WARN_ON(dev, !READ_ONCE(vblank->inmodeset));
vblank->max_vblank_count = max_vblank_count; vblank->max_vblank_count = max_vblank_count;
} }
...@@ -1417,7 +1418,7 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc) ...@@ -1417,7 +1418,7 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc)
struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
unsigned long irqflags; unsigned long irqflags;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
spin_lock_irqsave(&dev->vbl_lock, irqflags); spin_lock_irqsave(&dev->vbl_lock, irqflags);
...@@ -1437,7 +1438,7 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc) ...@@ -1437,7 +1438,7 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc)
* user wishes vblank interrupts to be enabled all the time. * user wishes vblank interrupts to be enabled all the time.
*/ */
if (atomic_read(&vblank->refcount) != 0 || drm_vblank_offdelay == 0) if (atomic_read(&vblank->refcount) != 0 || drm_vblank_offdelay == 0)
WARN_ON(drm_vblank_enable(dev, pipe)); drm_WARN_ON(dev, drm_vblank_enable(dev, pipe));
spin_unlock_irqrestore(&dev->vbl_lock, irqflags); spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
} }
EXPORT_SYMBOL(drm_crtc_vblank_on); EXPORT_SYMBOL(drm_crtc_vblank_on);
...@@ -1464,15 +1465,16 @@ void drm_vblank_restore(struct drm_device *dev, unsigned int pipe) ...@@ -1464,15 +1465,16 @@ void drm_vblank_restore(struct drm_device *dev, unsigned int pipe)
u32 cur_vblank, diff = 1; u32 cur_vblank, diff = 1;
int count = DRM_TIMESTAMP_MAXRETRIES; int count = DRM_TIMESTAMP_MAXRETRIES;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
assert_spin_locked(&dev->vbl_lock); assert_spin_locked(&dev->vbl_lock);
assert_spin_locked(&dev->vblank_time_lock); assert_spin_locked(&dev->vblank_time_lock);
vblank = &dev->vblank[pipe]; vblank = &dev->vblank[pipe];
WARN_ONCE(drm_debug_enabled(DRM_UT_VBL) && !vblank->framedur_ns, drm_WARN_ONCE(dev,
"Cannot compute missed vblanks without frame duration\n"); drm_debug_enabled(DRM_UT_VBL) && !vblank->framedur_ns,
"Cannot compute missed vblanks without frame duration\n");
framedur_ns = vblank->framedur_ns; framedur_ns = vblank->framedur_ns;
do { do {
...@@ -1517,7 +1519,7 @@ static void drm_legacy_vblank_pre_modeset(struct drm_device *dev, ...@@ -1517,7 +1519,7 @@ static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,
if (!drm_dev_has_vblank(dev)) if (!drm_dev_has_vblank(dev))
return; return;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
/* /*
...@@ -1544,7 +1546,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev, ...@@ -1544,7 +1546,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev,
if (!drm_dev_has_vblank(dev)) if (!drm_dev_has_vblank(dev))
return; return;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return; return;
if (vblank->inmodeset) { if (vblank->inmodeset) {
...@@ -1908,10 +1910,10 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -1908,10 +1910,10 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
unsigned long irqflags; unsigned long irqflags;
bool disable_irq; bool disable_irq;
if (WARN_ON_ONCE(!drm_dev_has_vblank(dev))) if (drm_WARN_ON_ONCE(dev, !drm_dev_has_vblank(dev)))
return false; return false;
if (WARN_ON(pipe >= dev->num_crtcs)) if (drm_WARN_ON(dev, pipe >= dev->num_crtcs))
return false; return false;
spin_lock_irqsave(&dev->event_lock, irqflags); spin_lock_irqsave(&dev->event_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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7