[PATCH 5/7] Revert "drm/i915: Handle 64-bit return from drm_crtc_vblank_count()"

StanLis stanislav.lisovskiy at intel.com
Mon Jun 11 14:11:26 UTC 2018


From: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>

This reverts commit 1b29b7ca7d43be309d399c996910c04a8ba0c195.
---
 drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
 drivers/gpu/drm/i915/i915_drv.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 89f7ff2c652e..1443a3639eb1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1644,7 +1644,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
 		seq_printf(m, "FBC disabled: %s\n", fbc->no_fbc_reason);
 
 	if (fbc->work.scheduled)
-		seq_printf(m, "FBC worker scheduled on vblank %llu, now %llu\n",
+		seq_printf(m, "FBC worker scheduled on vblank %u, now %llu\n",
 			   fbc->work.scheduled_vblank,
 			   drm_crtc_vblank_count(&fbc->crtc->base));
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ce18b6cf6e68..69821535a1f5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -725,7 +725,7 @@ struct intel_fbc {
 
 	struct intel_fbc_work {
 		bool scheduled;
-		u64 scheduled_vblank;
+		u32 scheduled_vblank;
 		struct work_struct work;
 	} work;
 
-- 
2.17.0



More information about the Intel-gfx-trybot mailing list