| Message ID | 20190206200813.d5w7gjpepoeeadiy@smtp.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vkms: WARN when hrtimer_forward_now fails | expand |
On 02/06, Shayenne Moura wrote: > Make the variable have the same type of function hrtimer_forward_now > return. Hi, First of all, thanks for your patch. Applied to the drm-misc-misc branch of drm-misc.git. P.s.: I made a tiny change in the commit message. Best Regards > Add a warn to verify the hrtimer_forward_now return. > > Signed-off-by: Shayenne Moura <shayenneluzmoura@gmail.com> > --- > drivers/gpu/drm/vkms/vkms_crtc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c > index 5a095610726b..734a3e197df8 100644 > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > @@ -16,7 +16,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) > vblank_hrtimer); > struct drm_crtc *crtc = &output->crtc; > struct vkms_crtc_state *state = to_vkms_crtc_state(crtc->state); > - int ret_overrun; > + u64 ret_overrun; > bool ret; > > spin_lock(&output->lock); > @@ -43,6 +43,8 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) > > ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer, > output->period_ns); > + WARN_ON(ret_overrun != 1); > + > spin_unlock(&output->lock); > > return HRTIMER_RESTART; > -- > 2.17.1 >
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 5a095610726b..734a3e197df8 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -16,7 +16,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) vblank_hrtimer); struct drm_crtc *crtc = &output->crtc; struct vkms_crtc_state *state = to_vkms_crtc_state(crtc->state); - int ret_overrun; + u64 ret_overrun; bool ret; spin_lock(&output->lock); @@ -43,6 +43,8 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer, output->period_ns); + WARN_ON(ret_overrun != 1); + spin_unlock(&output->lock); return HRTIMER_RESTART;
Make the variable have the same type of function hrtimer_forward_now return. Add a warn to verify the hrtimer_forward_now return. Signed-off-by: Shayenne Moura <shayenneluzmoura@gmail.com> --- drivers/gpu/drm/vkms/vkms_crtc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)