summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_property.h
diff options
context:
space:
mode:
authorKeith Packard2017-03-15 07:25:07 +0100
committerDave Airlie2017-10-12 02:03:04 +0200
commit418da17214aca5ef5f0b6f7588905ee7df92f98f (patch)
tree8deaeb99bc4f16428c31355fb2e723515925cdc5 /include/drm/drm_property.h
parentMerge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux int... (diff)
downloadkernel-qcow2-linux-418da17214aca5ef5f0b6f7588905ee7df92f98f.tar.gz
kernel-qcow2-linux-418da17214aca5ef5f0b6f7588905ee7df92f98f.tar.xz
kernel-qcow2-linux-418da17214aca5ef5f0b6f7588905ee7df92f98f.zip
drm: Pass struct drm_file * to __drm_mode_object_find [v2]
This will allow __drm_mode_object_file to be extended to perform access control checks based on the file in use. v2: Also fix up vboxvideo driver in staging [airlied: merging early as this is an API change] Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drm_property.h')
-rw-r--r--include/drm/drm_property.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h
index 37355c623e6c..429d8218f740 100644
--- a/include/drm/drm_property.h
+++ b/include/drm/drm_property.h
@@ -312,10 +312,11 @@ drm_property_unreference_blob(struct drm_property_blob *blob)
* This function looks up the property object specified by id and returns it.
*/
static inline struct drm_property *drm_property_find(struct drm_device *dev,
+ struct drm_file *file_priv,
uint32_t id)
{
struct drm_mode_object *mo;
- mo = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_PROPERTY);
+ mo = drm_mode_object_find(dev, file_priv, id, DRM_MODE_OBJECT_PROPERTY);
return mo ? obj_to_property(mo) : NULL;
}