drm: remove legacy drm_arm_vblank_event() (93507d13) · Commits · 戴 / test

drivers/gpu/drm/drm_irq.c

+8 −31

Original line number	Diff line number	Diff line
		@@ -1001,10 +1001,9 @@ static void send_vblank_event(struct drm_device *dev,
		}

		/**
		* drm_arm_vblank_event - arm vblank event after pageflip
		* @dev: DRM device
		* @pipe: CRTC index
		* @e: the event to prepare to send
		* drm_crtc_arm_vblank_event - arm vblank event after pageflip
		* @crtc: the source CRTC of the vblank event
		* @e: the event to send
		*
		* A lot of drivers need to generate vblank events for the very next vblank
		* interrupt. For example when the page flip interrupt happens when the page
		@@ -1014,41 +1013,19 @@ static void send_vblank_event(struct drm_device *dev,
		*
		* Caller must hold event lock. Caller must also hold a vblank reference for
		* the event @e, which will be dropped when the next vblank arrives.
		*
		* This is the legacy version of drm_crtc_arm_vblank_event().
		*/
		void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe,
		void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
		struct drm_pending_vblank_event *e)
		{
		struct drm_device *dev = crtc->dev;
		unsigned int pipe = drm_crtc_index(crtc);

		assert_spin_locked(&dev->event_lock);

		e->pipe = pipe;
		e->event.sequence = drm_vblank_count(dev, pipe);
		list_add_tail(&e->base.link, &dev->vblank_event_list);
		}
		EXPORT_SYMBOL(drm_arm_vblank_event);

		/**
		* drm_crtc_arm_vblank_event - arm vblank event after pageflip
		* @crtc: the source CRTC of the vblank event
		* @e: the event to send
		*
		* A lot of drivers need to generate vblank events for the very next vblank
		* interrupt. For example when the page flip interrupt happens when the page
		* flip gets armed, but not when it actually executes within the next vblank
		* period. This helper function implements exactly the required vblank arming
		* behaviour.
		*
		* Caller must hold event lock. Caller must also hold a vblank reference for
		* the event @e, which will be dropped when the next vblank arrives.
		*
		* This is the native KMS version of drm_arm_vblank_event().
		*/
		void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
		struct drm_pending_vblank_event *e)
		{
		drm_arm_vblank_event(crtc->dev, drm_crtc_index(crtc), e);
		}
		EXPORT_SYMBOL(drm_crtc_arm_vblank_event);

		/**

include/drm/drmP.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -971,8 +971,6 @@ extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
		struct timeval *vblanktime);
		extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
		struct drm_pending_vblank_event *e);
		extern void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe,
		struct drm_pending_vblank_event *e);
		extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
		struct drm_pending_vblank_event *e);
		extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe);

Admin message