diff options
author | Keith Packard <keithp@keithp.com> | 2017-03-15 02:25:07 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-10-11 20:03:04 -0400 |
commit | 418da17214aca5ef5f0b6f7588905ee7df92f98f (patch) | |
tree | 8deaeb99bc4f16428c31355fb2e723515925cdc5 /drivers/gpu/drm/amd/amdgpu/dce_virtual.c | |
parent | bb7a9c8d712f37385a706a594d6edf6e6d2669d0 (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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_virtual.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c index b9ee9073cb0d..a8829af120c1 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c | |||
@@ -288,7 +288,7 @@ dce_virtual_encoder(struct drm_connector *connector) | |||
288 | if (connector->encoder_ids[i] == 0) | 288 | if (connector->encoder_ids[i] == 0) |
289 | break; | 289 | break; |
290 | 290 | ||
291 | encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]); | 291 | encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]); |
292 | if (!encoder) | 292 | if (!encoder) |
293 | continue; | 293 | continue; |
294 | 294 | ||
@@ -298,7 +298,7 @@ dce_virtual_encoder(struct drm_connector *connector) | |||
298 | 298 | ||
299 | /* pick the first one */ | 299 | /* pick the first one */ |
300 | if (enc_id) | 300 | if (enc_id) |
301 | return drm_encoder_find(connector->dev, enc_id); | 301 | return drm_encoder_find(connector->dev, NULL, enc_id); |
302 | return NULL; | 302 | return NULL; |
303 | } | 303 | } |
304 | 304 | ||