[PATCH v2 5/6] stop using obsolete xf86BlockSIGIO() and xf86UnblockSIGIO()

[Ville Syrjälä]

On Wed, Feb 21, 2024 at 07:55:49PM +0100, Enrico Weigelt, metux IT consult wrote:
> These

Please spell out what "these" are.

> are just wrappers for calling input_lock()/input_unlock() and marked
> deprecated for quite a while now.
> 
> Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
> ---
>  src/sna/sna_display.c  | 5 +++--
>  src/uxa/intel_driver.c | 4 ++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
> index 3ff3d2fe..460fb1ca 100644
> --- a/src/sna/sna_display.c
> +++ b/src/sna/sna_display.c
> @@ -1156,11 +1156,12 @@ static inline void sigio_unblock(int was_blocked)
>  #include <xf86_OSproc.h>
>  static inline int sigio_block(void)
>  {
> -	return xf86BlockSIGIO();
> +	input_lock();
> +	return 0;
>  }
>  static inline void sigio_unblock(int was_blocked)
>  {
> -	xf86UnblockSIGIO(was_blocked);
> +	input_unlock();
>  }
>  #endif
> 
> diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
> index 9c3fe85f..79105b89 100644
> --- a/src/uxa/intel_driver.c
> +++ b/src/uxa/intel_driver.c
> @@ -641,10 +641,10 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
>          intel_flush(intel);
>  	if (!intel->has_prime_vmap_flush) {
>  		drm_intel_bo *bo = intel_uxa_get_pixmap_bo(PixmapDirtyPrimary(dirty));
> -		was_blocked = xf86BlockSIGIO();
> +		input_lock();
>  		drm_intel_bo_map(bo, FALSE);
>  		drm_intel_bo_unmap(bo);
> -		xf86UnblockSIGIO(was_blocked);
> +		input_unlock();
>  	}
> 
>  	DamageRegionProcessPending(&PixmapDirtyDst(dirty)->drawable);
> --
> 2.39.2

-- 
Ville Syrjälä
Intel