Re: [PATCH 16/24] drm/vblank: pass vblank to drm_vblank_enable()

[Thomas Zimmermann <tzimmermann@suse.de>]

Am 10.11.25 um 17:17 schrieb Jani Nikula:
> Use the vblank pointer instead of a dev, pipe pair to simplify code.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/drm_vblank.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
> index 86919b1c0c2c..0ff69b06b2bd 100644
> --- a/drivers/gpu/drm/drm_vblank.c
> +++ b/drivers/gpu/drm/drm_vblank.c
> @@ -1163,9 +1163,10 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe)
>   	return -EINVAL;
>   }
>   
> -static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
> +static int drm_vblank_enable(struct drm_vblank_crtc *vblank)
>   {
> -	struct drm_vblank_crtc *vblank = drm_vblank_crtc(dev, pipe);
> +	struct drm_device *dev = vblank->dev;
> +	unsigned int pipe = vblank->pipe;
>   	int ret = 0;
>   
>   	assert_spin_locked(&dev->vbl_lock);
> @@ -1204,7 +1205,6 @@ static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
>   int drm_vblank_get(struct drm_vblank_crtc *vblank)
>   {
>   	struct drm_device *dev = vblank->dev;
> -	int pipe = vblank->pipe;
>   	unsigned long irqflags;
>   	int ret = 0;
>   
> @@ -1214,7 +1214,7 @@ int drm_vblank_get(struct drm_vblank_crtc *vblank)
>   	spin_lock_irqsave(&dev->vbl_lock, irqflags);
>   	/* Going from 0->1 means we have to enable interrupts again */
>   	if (atomic_add_return(1, &vblank->refcount) == 1) {
> -		ret = drm_vblank_enable(dev, pipe);
> +		ret = drm_vblank_enable(vblank);
>   	} else {
>   		if (!vblank->enabled) {
>   			atomic_dec(&vblank->refcount);
> @@ -1496,7 +1496,7 @@ void drm_crtc_vblank_on_config(struct drm_crtc *crtc,
>   	 * user wishes vblank interrupts to be enabled all the time.
>   	 */
>   	if (atomic_read(&vblank->refcount) != 0 || !vblank->config.offdelay_ms)
> -		drm_WARN_ON(dev, drm_vblank_enable(dev, pipe));
> +		drm_WARN_ON(dev, drm_vblank_enable(vblank));
>   	spin_unlock_irq(&dev->vbl_lock);
>   }
>   EXPORT_SYMBOL(drm_crtc_vblank_on_config);

-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)