Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b29b7ca authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan Committed by Rodrigo Vivi
Browse files

drm/i915: Handle 64-bit return from drm_crtc_vblank_count() 



570e8696 ("drm: Widen vblank count to 64-bits [v3]") changed the
return type for drm_crtc_vblank_count() to u64, store all the bits
without truncating. There is no need to type cast this value down to
32-bits.

Cc: Keith Packard <keithp@keithp.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180203051302.9974-3-dhinakaran.pandiyan@intel.com
parent 734cbbf3

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,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 %u, now %llu\n",

		seq_printf(m, "FBC worker scheduled on vblank %llu, now %llu\n",

			   fbc->work.scheduled_vblank,

			   drm_crtc_vblank_count(&fbc->crtc->base));

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ struct intel_fbc { 


	struct intel_fbc_work {

		bool scheduled;

		u32 scheduled_vblank;

		u64 scheduled_vblank;

		struct work_struct work;

	} work;