Commit b44f8408 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Stop using drm_vblank_count() as the hw frame counter 



drm_vblank_count() returns the software counter. We should not pretend
it's the hw counter since we use the hw counter to figuere out what the
software counter value should be. So instead provide a new function
drm_vblank_no_hw_counter() for drivers that don't have a real hw
counter. The new function simply returns 0, which is about the only
thing it can do.

Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVincent Abriou <vincent.abriou@st.com>
[danvet: s/int pipe/unsigned int pipe/ to follow Thierry's interface
change.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 88e72717

drivers/gpu/drm/armada/armada_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static struct drm_driver armada_drm_driver = { 
	.lastclose		= armada_drm_lastclose,

	.unload			= armada_drm_unload,

	.set_busid		= drm_platform_set_busid,

	.get_vblank_counter	= drm_vblank_count,

	.get_vblank_counter	= drm_vblank_no_hw_counter,

	.enable_vblank		= armada_drm_enable_vblank,

	.disable_vblank		= armada_drm_disable_vblank,

#ifdef CONFIG_DEBUG_FS

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static struct drm_driver atmel_hlcdc_dc_driver = { 
	.irq_preinstall = atmel_hlcdc_dc_irq_uninstall,

	.irq_postinstall = atmel_hlcdc_dc_irq_postinstall,

	.irq_uninstall = atmel_hlcdc_dc_irq_uninstall,

	.get_vblank_counter = drm_vblank_count,

	.get_vblank_counter = drm_vblank_no_hw_counter,

	.enable_vblank = atmel_hlcdc_dc_enable_vblank,

	.disable_vblank = atmel_hlcdc_dc_disable_vblank,

	.gem_free_object = drm_gem_cma_free_object,

drivers/gpu/drm/drm_irq.c

+17 −0
Original line number Diff line number Diff line
@@ -1798,3 +1798,20 @@ bool drm_crtc_handle_vblank(struct drm_crtc *crtc) 
	return drm_handle_vblank(crtc->dev, drm_crtc_index(crtc));

}

EXPORT_SYMBOL(drm_crtc_handle_vblank);



/**

 * drm_vblank_no_hw_counter - "No hw counter" implementation of .get_vblank_counter()

 * @dev: DRM device

 * @pipe: CRTC for which to read the counter

 *

 * Drivers can plug this into the .get_vblank_counter() function if

 * there is no useable hardware frame counter available.

 *

 * Returns:

 * 0

 */

u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe)

{

	return 0;

}

EXPORT_SYMBOL(drm_vblank_no_hw_counter);

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static struct drm_driver exynos_drm_driver = { 
	.lastclose		= exynos_drm_lastclose,

	.postclose		= exynos_drm_postclose,

	.set_busid		= drm_platform_set_busid,

	.get_vblank_counter	= drm_vblank_count,

	.get_vblank_counter	= drm_vblank_no_hw_counter,

	.enable_vblank		= exynos_drm_crtc_enable_vblank,

	.disable_vblank		= exynos_drm_crtc_disable_vblank,

	.gem_free_object	= exynos_drm_gem_free_object,

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static struct drm_driver fsl_dcu_drm_driver = { 
	.unload			= fsl_dcu_unload,

	.preclose		= fsl_dcu_drm_preclose,

	.irq_handler		= fsl_dcu_drm_irq,

	.get_vblank_counter	= drm_vblank_count,

	.get_vblank_counter	= drm_vblank_no_hw_counter,

	.enable_vblank		= fsl_dcu_drm_enable_vblank,

	.disable_vblank		= fsl_dcu_drm_disable_vblank,

	.gem_free_object	= drm_gem_cma_free_object,

CRA Git | Maintained and supported by SUSTech CRA and CCSE