[PATCH 26/27] drm/crtc-helper: disable_unused_functions really isn't for atomic

Laurent Pinchart laurent.pinchart at ideasonboard.com
Wed Jun 8 22:36:30 UTC 2016


Hi Daniel,

Thank you for the patch.

On Wednesday 08 Jun 2016 14:19:18 Daniel Vetter wrote:
> Rockchip just blew up here on testing, because I removed some "is this
> crtc already disabled/enabled" state tracking from callbacks (not needed
> with atomic). Turns out that was needed to work around rockchip still
> calling legacy helper code.
> 
> Since me explaining on irc/mailing-list plus kerneldoc isn't enough,
> be more verbose and add dmesg output. Not that anyone actually reads that,
> either.

How about also removing it from atomic drivers then ? At least omapdrm calls 
this function.

> Cc: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/drm_crtc_helper.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_crtc_helper.c
> b/drivers/gpu/drm/drm_crtc_helper.c index a6e42433ef0e..b47ec24939a0 100644
> --- a/drivers/gpu/drm/drm_crtc_helper.c
> +++ b/drivers/gpu/drm/drm_crtc_helper.c
> @@ -232,6 +232,9 @@ static void __drm_helper_disable_unused_functions(struct
> drm_device *dev) */
>  void drm_helper_disable_unused_functions(struct drm_device *dev)
>  {
> +	if (drm_core_check_feature(dev, DRIVER_ATOMIC))
> +		DRM_ERROR("Called for atomic driver, this is not what you want.\n");
> +
>  	drm_modeset_lock_all(dev);
>  	__drm_helper_disable_unused_functions(dev);
>  	drm_modeset_unlock_all(dev);

-- 
Regards,

Laurent Pinchart



More information about the dri-devel mailing list