Commit dcae3626 authored by Roel Kluin's avatar Roel Kluin Committed by Dave Airlie
Browse files

drm: fix LOCK_TEST_WITH_RETURN macro 



When this macro isn't called with 'file_priv' this will result in a build
failure.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 03d60699

include/drm/drmP.h

+8 −8
Original line number Diff line number Diff line
@@ -237,13 +237,13 @@ struct drm_device; 
 * \param dev DRM device.

 * \param filp file pointer of the caller.

 */

#define LOCK_TEST_WITH_RETURN( dev, file_priv )				\

#define LOCK_TEST_WITH_RETURN( dev, _file_priv )				\

do {										\

	if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) ||		\

	    file_priv->master->lock.file_priv != file_priv)	{			\

	if (!_DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock) ||	\

	    _file_priv->master->lock.file_priv != _file_priv)	{		\

		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\

			   __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\

			   file_priv->master->lock.file_priv, file_priv);		\

			   __func__, _DRM_LOCK_IS_HELD(_file_priv->master->lock.hw_lock->lock),\

			   _file_priv->master->lock.file_priv, _file_priv);	\

		return -EINVAL;							\

	}									\

} while (0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE