On Sat, May 24, 2014 at 02:30:19PM -0400, Rob Clark wrote:
> We do actually want to permit FB's in atomic case, since FB will be
> looked up like any other object property value in a few code paths
> (like property value validation).
>
> So split out into an internal function without the WARN_ON() which
> we can use in those special cases.
>
> Signed-off-by: Rob Clark <robdclark at gmail.com>
See my other mail, but Nack. Imo you want a drm_mode_object_exists
instead, which just returns a bool. Gives you want you want and is safe.
-Daniel
> ---
> drivers/gpu/drm/drm_crtc.c | 33 ++++++++++++++++++++++-----------
> include/drm/drm_crtc.h | 6 ------
> 2 files changed, 22 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 9b95601..48555724 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -443,6 +443,21 @@ void drm_mode_object_put(struct drm_device *dev,
> mutex_unlock(&dev->mode_config.idr_mutex);
> }
>
> +static struct drm_mode_object *_object_find(struct drm_device *dev,
> + uint32_t id, uint32_t type)
> +{
> + struct drm_mode_object *obj = NULL;
> +
> + mutex_lock(&dev->mode_config.idr_mutex);
> + obj = idr_find(&dev->mode_config.crtc_idr, id);
> + if (!obj || (type != DRM_MODE_OBJECT_ANY && obj->type != type) ||
> + (obj->id != id))
> + obj = NULL;
> + mutex_unlock(&dev->mode_config.idr_mutex);
> +
> + return obj;
> +}
> +
> /**
> * drm_mode_object_find - look up a drm object with static lifetime
> * @dev: drm device
> @@ -455,23 +470,19 @@ void drm_mode_object_put(struct drm_device *dev,
> struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
> uint32_t id, uint32_t type)
> {
> - struct drm_mode_object *obj = NULL;
> -
> /* Framebuffers are reference counted and need their own lookup
> * function.*/
> WARN_ON(type == DRM_MODE_OBJECT_FB);
> -
> - mutex_lock(&dev->mode_config.idr_mutex);
> - obj = idr_find(&dev->mode_config.crtc_idr, id);
> - if (!obj || (type != DRM_MODE_OBJECT_ANY && obj->type != type) ||
> - (obj->id != id))
> - obj = NULL;
> - mutex_unlock(&dev->mode_config.idr_mutex);
> -
> - return obj;
> + return _object_find(dev, id, type);
> }
> EXPORT_SYMBOL(drm_mode_object_find);
>
> +static struct drm_mode_object *
> +drm_property_get_obj(struct drm_property *property, uint64_t value)
> +{
> + return _object_find(property->dev, value, property->values[0]);
> +}
> +
> /**
> * drm_framebuffer_init - initialize a framebuffer
> * @dev: DRM device
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 31ed7c6..547b75a 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -1033,12 +1033,6 @@ extern int drm_mode_crtc_set_gamma_size(struct
> drm_crtc *crtc,
> extern struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
> uint32_t id, uint32_t type);
>
> -static inline struct drm_mode_object *
> -drm_property_get_obj(struct drm_property *property, uint64_t value)
> -{
> - return drm_mode_object_find(property->dev, value, property->values[0]);
> -}
> -
> /* IOCTLs */
> extern int drm_mode_getresources(struct drm_device *dev,
> void *data, struct drm_file *file_priv);
> --
> 1.9.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
