intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()"
@ 2016-03-29 11:12 Daniel Vetter
  2016-03-29 11:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
  2016-03-29 14:22 ` [PATCH] " Imre Deak
  0 siblings, 2 replies; 4+ messages in thread
From: Daniel Vetter @ 2016-03-29 11:12 UTC (permalink / raw)
  To: DRI Development
  Cc: Daniel Vetter, Intel Graphics Development, Michel Dänzer,
	Daniel Vetter, Dave Airlie, Thomas Gleixner

This reverts commit e91abf80a0998f326107874c88d549f94839f13c.

Since

commit 24e4a8c3e8868874835b0f1ad6dd417341e99822
Author: John Stultz <john.stultz@linaro.org>
Date:   Wed Jul 16 21:03:53 2014 +0000

    ktime: Kill non-scalar ktime_t implementation for 2038

there is no longer a 32bit version that's unsigned, and we don't have
to jump through ridiculous hoops to make the calculations correct.

I didn't look whether there's more of this pattern in the kernel.

Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Michel Dänzer <michel.daenzer@amd.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_irq.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index f77653562fac..4d06cf41df96 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -863,10 +863,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
 	/* Subtract time delta from raw timestamp to get final
 	 * vblank_time timestamp for end of vblank.
 	 */
-	if (delta_ns < 0)
-		etime = ktime_add_ns(etime, -delta_ns);
-	else
-		etime = ktime_sub_ns(etime, delta_ns);
+	etime = ktime_sub_ns(etime, delta_ns);
 	*vblank_time = ktime_to_timeval(etime);
 
 	DRM_DEBUG_VBL("crtc %u : v 0x%x p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n",
-- 
2.8.0.rc3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* ✗ Fi.CI.BAT: failure for Revert "drm: Don't pass negative delta to ktime_sub_ns()"
  2016-03-29 11:12 [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()" Daniel Vetter
@ 2016-03-29 11:39 ` Patchwork
  2016-03-29 14:22 ` [PATCH] " Imre Deak
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-03-29 11:39 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: intel-gfx

== Series Details ==

Series: Revert "drm: Don't pass negative delta to ktime_sub_ns()"
URL   : https://patchwork.freedesktop.org/series/4984/
State : failure

== Summary ==

Series 4984v1 Revert "drm: Don't pass negative delta to ktime_sub_ns()"
http://patchwork.freedesktop.org/api/1.0/series/4984/revisions/1/mbox/

Test drv_module_reload_basic:
                dmesg-warn -> TIMEOUT    (snb-dellxps)
Test gem_cs_tlb:
        Subgroup basic-default:
                pass       -> DMESG-WARN (ilk-hp8440p)
Test gem_exec_nop:
        Subgroup basic:
                pass       -> FAIL       (snb-dellxps)
Test gem_exec_suspend:
        Subgroup basic-s3:
                fail       -> DMESG-FAIL (bsw-nuc-2)
Test gem_exec_whisper:
        Subgroup basic:
                fail       -> PASS       (ivb-t430s)
Test gem_sync:
        Subgroup basic-render:
                pass       -> FAIL       (snb-dellxps)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                fail       -> PASS       (ilk-hp8440p) UNSTABLE
        Subgroup basic-plain-flip:
                pass       -> FAIL       (snb-dellxps)
Test kms_pipe_crc_basic:
        Subgroup bad-source:
                pass       -> INCOMPLETE (snb-dellxps)
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (ilk-hp8440p)
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (bsw-nuc-2)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                dmesg-warn -> PASS       (bsw-nuc-2)

bdw-nuci7        total:194  pass:180  dwarn:1   dfail:0   fail:1   skip:12 
bdw-ultra        total:194  pass:161  dwarn:1   dfail:0   fail:12  skip:20 
bsw-nuc-2        total:194  pass:155  dwarn:1   dfail:1   fail:0   skip:37 
byt-nuc          total:194  pass:157  dwarn:1   dfail:0   fail:1   skip:35 
hsw-brixbox      total:194  pass:170  dwarn:1   dfail:0   fail:1   skip:22 
hsw-gt2          total:194  pass:175  dwarn:1   dfail:0   fail:1   skip:17 
ilk-hp8440p      total:194  pass:127  dwarn:2   dfail:0   fail:1   skip:64 
ivb-t430s        total:194  pass:167  dwarn:1   dfail:0   fail:1   skip:25 
skl-i7k-2        total:194  pass:169  dwarn:1   dfail:0   fail:1   skip:23 
skl-nuci5        total:194  pass:181  dwarn:1   dfail:0   fail:1   skip:11 
snb-dellxps      total:41   pass:26   dwarn:0   dfail:0   fail:3   skip:10 
snb-x220t        total:194  pass:158  dwarn:1   dfail:0   fail:2   skip:33 

Results at /archive/results/CI_IGT_test/Patchwork_1728/

a78a2b7f8cd433f9606602504e35033557bc983c drm-intel-nightly: 2016y-03m-29d-09h-14m-28s UTC integration manifest
54208629066874574e4d7823cb72ac9f36cba431 Revert "drm: Don't pass negative delta to ktime_sub_ns()"

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()"
  2016-03-29 11:12 [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()" Daniel Vetter
  2016-03-29 11:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2016-03-29 14:22 ` Imre Deak
  2016-03-30  6:30   ` Daniel Vetter
  1 sibling, 1 reply; 4+ messages in thread
From: Imre Deak @ 2016-03-29 14:22 UTC (permalink / raw)
  To: Daniel Vetter, DRI Development
  Cc: Intel Graphics Development, Michel Dänzer, John Stultz,
	Dave Airlie, Daniel Vetter, Thomas Gleixner

On Tue, 2016-03-29 at 13:12 +0200, Daniel Vetter wrote:
> This reverts commit e91abf80a0998f326107874c88d549f94839f13c.
> 
> Since
> 
> commit 24e4a8c3e8868874835b0f1ad6dd417341e99822
> Author: John Stultz <john.stultz@linaro.org>
> Date:   Wed Jul 16 21:03:53 2014 +0000
> 
>     ktime: Kill non-scalar ktime_t implementation for 2038
> 
> there is no longer a 32bit version that's unsigned, and we don't have
> to jump through ridiculous hoops to make the calculations correct.
> 
> I didn't look whether there's more of this pattern in the kernel.
> 
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Michel Dänzer <michel.daenzer@amd.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Dave Airlie <airlied@redhat.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/drm_irq.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index f77653562fac..4d06cf41df96 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -863,10 +863,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct
> drm_device *dev,
>  	/* Subtract time delta from raw timestamp to get final
>  	 * vblank_time timestamp for end of vblank.
>  	 */
> -	if (delta_ns < 0)
> -		etime = ktime_add_ns(etime, -delta_ns);
> -	else
> -		etime = ktime_sub_ns(etime, delta_ns);
> +	etime = ktime_sub_ns(etime, delta_ns);
>  	*vblank_time = ktime_to_timeval(etime);
>  
>  	DRM_DEBUG_VBL("crtc %u : v 0x%x p(%d,%d)@ %ld.%ld -> %ld.%ld
> [e %d us, %d rep]\n",b
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()"
  2016-03-29 14:22 ` [PATCH] " Imre Deak
@ 2016-03-30  6:30   ` Daniel Vetter
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2016-03-30  6:30 UTC (permalink / raw)
  To: Imre Deak
  Cc: Daniel Vetter, Intel Graphics Development, Michel Dänzer,
	DRI Development, John Stultz, Daniel Vetter, Dave Airlie,
	Thomas Gleixner

On Tue, Mar 29, 2016 at 05:22:02PM +0300, Imre Deak wrote:
> On Tue, 2016-03-29 at 13:12 +0200, Daniel Vetter wrote:
> > This reverts commit e91abf80a0998f326107874c88d549f94839f13c.
> > 
> > Since
> > 
> > commit 24e4a8c3e8868874835b0f1ad6dd417341e99822
> > Author: John Stultz <john.stultz@linaro.org>
> > Date:   Wed Jul 16 21:03:53 2014 +0000
> > 
> >     ktime: Kill non-scalar ktime_t implementation for 2038
> > 
> > there is no longer a 32bit version that's unsigned, and we don't have
> > to jump through ridiculous hoops to make the calculations correct.
> > 
> > I didn't look whether there's more of this pattern in the kernel.
> > 
> > Cc: John Stultz <john.stultz@linaro.org>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Michel Dänzer <michel.daenzer@amd.com>
> > Cc: Imre Deak <imre.deak@intel.com>
> > Cc: Dave Airlie <airlied@redhat.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 
> Reviewed-by: Imre Deak <imre.deak@intel.com>

Applied to drm-misc, thanks for the review.
-Daniel

> 
> > ---
> >  drivers/gpu/drm/drm_irq.c | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > index f77653562fac..4d06cf41df96 100644
> > --- a/drivers/gpu/drm/drm_irq.c
> > +++ b/drivers/gpu/drm/drm_irq.c
> > @@ -863,10 +863,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct
> > drm_device *dev,
> >  	/* Subtract time delta from raw timestamp to get final
> >  	 * vblank_time timestamp for end of vblank.
> >  	 */
> > -	if (delta_ns < 0)
> > -		etime = ktime_add_ns(etime, -delta_ns);
> > -	else
> > -		etime = ktime_sub_ns(etime, delta_ns);
> > +	etime = ktime_sub_ns(etime, delta_ns);
> >  	*vblank_time = ktime_to_timeval(etime);
> >  
> >  	DRM_DEBUG_VBL("crtc %u : v 0x%x p(%d,%d)@ %ld.%ld -> %ld.%ld
> > [e %d us, %d rep]\n",b

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-30  6:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29 11:12 [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()" Daniel Vetter
2016-03-29 11:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-03-29 14:22 ` [PATCH] " Imre Deak
2016-03-30  6:30   ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).