summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-03-14 23:25:07 -0700
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:29:06 +0800
commit404fa0fd03131aac828e8d701740b01168dfbfe6 (patch)
tree10c4295f2f1109f15b02f86d612d8ef74fad1402 /drivers/staging
parente62c1af79de4c97a1e0053d25809b56e93ad3fbc (diff)
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> (cherry picked from commit 418da17214aca5ef5f0b6f7588905ee7df92f98f)
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/vboxvideo/vbox_mode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index 6f08dc966719..b265fe924556 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -377,7 +377,7 @@ static struct drm_encoder *vbox_best_single_encoder(struct drm_connector
/* pick the encoder ids */
if (enc_id)
- return drm_encoder_find(connector->dev, enc_id);
+ return drm_encoder_find(connector->dev, NULL, enc_id);
return NULL;
}