drm/irq: Unexport drm_vblank_count (d6b0f626) · Commits · 戴 / test

drivers/gpu/drm/drm_irq.c

+10 −27

Original line number	Original line	Diff line number	Diff line
	@@ -234,6 +234,16 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
	store_vblank(dev, pipe, diff, &t_vblank, cur_vblank);		store_vblank(dev, pipe, diff, &t_vblank, cur_vblank);
	}		}

			static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
			{
			struct drm_vblank_crtc *vblank = &dev->vblank[pipe];

			if (WARN_ON(pipe >= dev->num_crtcs))
			return 0;

			return vblank->count;
			}

	/**		/**
	* drm_accurate_vblank_count - retrieve the master vblank counter		* drm_accurate_vblank_count - retrieve the master vblank counter
	* @crtc: which counter to retrieve		* @crtc: which counter to retrieve
	@@ -887,31 +897,6 @@ drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
	return false;		return false;
	}		}

	/**
	* drm_vblank_count - retrieve "cooked" vblank counter value
	* @dev: DRM device
	* @pipe: index of CRTC for which to retrieve the counter
	*
	* Fetches the "cooked" vblank count value that represents the number of
	* vblank events since the system was booted, including lost events due to
	* modesetting activity.
	*
	* This is the legacy version of drm_crtc_vblank_count().
	*
	* Returns:
	* The software vblank counter.
	*/
	u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
	{
	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];

	if (WARN_ON(pipe >= dev->num_crtcs))
	return 0;

	return vblank->count;
	}
	EXPORT_SYMBOL(drm_vblank_count);

	/**		/**
	* drm_crtc_vblank_count - retrieve "cooked" vblank counter value		* drm_crtc_vblank_count - retrieve "cooked" vblank counter value
	* @crtc: which counter to retrieve		* @crtc: which counter to retrieve
	@@ -920,8 +905,6 @@ EXPORT_SYMBOL(drm_vblank_count);
	* vblank events since the system was booted, including lost events due to		* vblank events since the system was booted, including lost events due to
	* modesetting activity.		* modesetting activity.
	*		*
	* This is the native KMS version of drm_vblank_count().
	*
	* Returns:		* Returns:
	* The software vblank counter.		* The software vblank counter.
	*/		*/

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -256,7 +256,7 @@ static struct drm_driver mtk_drm_driver = {
	.driver_features = DRIVER_MODESET \| DRIVER_GEM \| DRIVER_PRIME \|		.driver_features = DRIVER_MODESET \| DRIVER_GEM \| DRIVER_PRIME \|
	DRIVER_ATOMIC,		DRIVER_ATOMIC,

	.get_vblank_counter = drm_vblank_count,		.get_vblank_counter = drm_vblank_no_hw_counter,
	.enable_vblank = mtk_drm_crtc_enable_vblank,		.enable_vblank = mtk_drm_crtc_enable_vblank,
	.disable_vblank = mtk_drm_crtc_disable_vblank,		.disable_vblank = mtk_drm_crtc_disable_vblank,

Admin message