[PATCH 4/7] Revert "drm/atomic: Handle 64-bit return from drm_crtc_vblank_count()"
StanLis
stanislav.lisovskiy at intel.com
Mon Jun 11 14:11:25 UTC 2018
From: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
This reverts commit f4c0468e4bd64b7cd00e2db309925728fc72bf8b.
---
drivers/gpu/drm/drm_plane.c | 2 +-
include/drm/drm_atomic.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 6d2a6e428a3e..977a66dfc5f1 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -967,7 +967,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
if (r)
return r;
- current_vblank = (u32)drm_crtc_vblank_count(crtc);
+ current_vblank = drm_crtc_vblank_count(crtc);
switch (page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET) {
case DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE:
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index a57a8aa90ffb..3fe8dde320e5 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -154,7 +154,7 @@ struct __drm_crtcs_state {
struct drm_crtc *ptr;
struct drm_crtc_state *state, *old_state, *new_state;
s32 __user *out_fence_ptr;
- u64 last_vblank_count;
+ unsigned last_vblank_count;
};
struct __drm_connnectors_state {
--
2.17.0
More information about the Intel-gfx-trybot
mailing list