* [PATCH] drm/i915: Use drm official vblnk_no_hw_counter callback.
@ 2016-08-03 17:00 Rodrigo Vivi
2016-08-03 18:32 ` Ville Syrjälä
2016-08-04 5:19 ` ✗ Ro.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2016-08-03 17:00 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
No functional change. Instead of defining a new empty function
let's use what is available on drm.
It gets cleaner, and easy to read, and understand.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f5bf4f9..6030797 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -656,12 +656,6 @@ static void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
* of horizontal active on the first line of vertical active
*/
-static u32 i8xx_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
-{
- /* Gen2 doesn't have a hardware frame counter */
- return 0;
-}
-
/* Called from drm generic code, passed a 'crtc', which
* we use as a pipe index
*/
@@ -4545,8 +4539,9 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
i915_hangcheck_elapsed);
if (IS_GEN2(dev_priv)) {
+ /* Gen2 doesn't have a hardware frame counter */
dev->max_vblank_count = 0;
- dev->driver->get_vblank_counter = i8xx_get_vblank_counter;
+ dev->driver->get_vblank_counter = drm_vblank_no_hw_counter;
} else if (IS_G4X(dev_priv) || INTEL_INFO(dev_priv)->gen >= 5) {
dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */
dev->driver->get_vblank_counter = g4x_get_vblank_counter;
--
2.5.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: Use drm official vblnk_no_hw_counter callback.
2016-08-03 17:00 [PATCH] drm/i915: Use drm official vblnk_no_hw_counter callback Rodrigo Vivi
@ 2016-08-03 18:32 ` Ville Syrjälä
2016-08-04 5:19 ` ✗ Ro.CI.BAT: failure for " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Ville Syrjälä @ 2016-08-03 18:32 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Wed, Aug 03, 2016 at 10:00:56AM -0700, Rodrigo Vivi wrote:
> No functional change. Instead of defining a new empty function
> let's use what is available on drm.
>
> It gets cleaner, and easy to read, and understand.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index f5bf4f9..6030797 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -656,12 +656,6 @@ static void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
> * of horizontal active on the first line of vertical active
> */
>
> -static u32 i8xx_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
> -{
> - /* Gen2 doesn't have a hardware frame counter */
> - return 0;
> -}
> -
> /* Called from drm generic code, passed a 'crtc', which
> * we use as a pipe index
> */
> @@ -4545,8 +4539,9 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
> i915_hangcheck_elapsed);
>
> if (IS_GEN2(dev_priv)) {
> + /* Gen2 doesn't have a hardware frame counter */
> dev->max_vblank_count = 0;
> - dev->driver->get_vblank_counter = i8xx_get_vblank_counter;
> + dev->driver->get_vblank_counter = drm_vblank_no_hw_counter;
> } else if (IS_G4X(dev_priv) || INTEL_INFO(dev_priv)->gen >= 5) {
> dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */
> dev->driver->get_vblank_counter = g4x_get_vblank_counter;
> --
> 2.5.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread* ✗ Ro.CI.BAT: failure for drm/i915: Use drm official vblnk_no_hw_counter callback.
2016-08-03 17:00 [PATCH] drm/i915: Use drm official vblnk_no_hw_counter callback Rodrigo Vivi
2016-08-03 18:32 ` Ville Syrjälä
@ 2016-08-04 5:19 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2016-08-04 5:19 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use drm official vblnk_no_hw_counter callback.
URL : https://patchwork.freedesktop.org/series/10615/
State : failure
== Summary ==
Series 10615v1 drm/i915: Use drm official vblnk_no_hw_counter callback.
http://patchwork.freedesktop.org/api/1.0/series/10615/revisions/1/mbox
Test gem_exec_gttfill:
Subgroup basic:
skip -> PASS (fi-snb-i7-2600)
Test kms_cursor_legacy:
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (ro-byt-n2820)
pass -> FAIL (ro-bdw-i5-5250u)
fail -> PASS (ro-bdw-i7-5600u)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (ro-skl3-i5-6260u)
pass -> FAIL (fi-skl-i7-6700k)
fi-hsw-i7-4770k total:240 pass:218 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-qkkr total:240 pass:181 dwarn:29 dfail:0 fail:3 skip:27
fi-skl-i5-6260u total:240 pass:224 dwarn:0 dfail:0 fail:2 skip:14
fi-skl-i7-6700k total:240 pass:208 dwarn:0 dfail:0 fail:4 skip:28
fi-snb-i7-2600 total:240 pass:198 dwarn:0 dfail:0 fail:0 skip:42
ro-bdw-i5-5250u total:240 pass:219 dwarn:4 dfail:0 fail:1 skip:16
ro-bdw-i7-5557U total:240 pass:224 dwarn:0 dfail:0 fail:0 skip:16
ro-bdw-i7-5600u total:240 pass:207 dwarn:0 dfail:0 fail:1 skip:32
ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42
ro-byt-n2820 total:240 pass:198 dwarn:0 dfail:0 fail:2 skip:40
ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26
ro-ilk-i7-620lm total:240 pass:173 dwarn:1 dfail:0 fail:1 skip:65
ro-ilk1-i5-650 total:235 pass:173 dwarn:0 dfail:0 fail:2 skip:60
ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35
ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31
ro-skl3-i5-6260u total:240 pass:223 dwarn:0 dfail:0 fail:3 skip:14
ro-snb-i7-2620M total:240 pass:198 dwarn:0 dfail:0 fail:1 skip:41
ro-hsw-i7-4770r failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1688/
4d6f224 drm-intel-nightly: 2016y-08m-03d-15h-38m-31s UTC integration manifest
aee613c drm/i915: Use drm official vblnk_no_hw_counter callback.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-04 5:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-03 17:00 [PATCH] drm/i915: Use drm official vblnk_no_hw_counter callback Rodrigo Vivi
2016-08-03 18:32 ` Ville Syrjälä
2016-08-04 5:19 ` ✗ Ro.CI.BAT: failure for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox