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>
This commit is contained in:

committed by
Dave Airlie

parent
bb7a9c8d71
commit
418da17214
@@ -402,7 +402,7 @@ int drm_mode_getcrtc(struct drm_device *dev,
|
||||
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
||||
return -EINVAL;
|
||||
|
||||
crtc = drm_crtc_find(dev, crtc_resp->crtc_id);
|
||||
crtc = drm_crtc_find(dev, file_priv, crtc_resp->crtc_id);
|
||||
if (!crtc)
|
||||
return -ENOENT;
|
||||
|
||||
@@ -569,7 +569,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
|
||||
if (crtc_req->x & 0xffff0000 || crtc_req->y & 0xffff0000)
|
||||
return -ERANGE;
|
||||
|
||||
crtc = drm_crtc_find(dev, crtc_req->crtc_id);
|
||||
crtc = drm_crtc_find(dev, file_priv, crtc_req->crtc_id);
|
||||
if (!crtc) {
|
||||
DRM_DEBUG_KMS("Unknown CRTC ID %d\n", crtc_req->crtc_id);
|
||||
return -ENOENT;
|
||||
@@ -595,7 +595,7 @@ retry:
|
||||
/* Make refcounting symmetric with the lookup path. */
|
||||
drm_framebuffer_get(fb);
|
||||
} else {
|
||||
fb = drm_framebuffer_lookup(dev, crtc_req->fb_id);
|
||||
fb = drm_framebuffer_lookup(dev, file_priv, crtc_req->fb_id);
|
||||
if (!fb) {
|
||||
DRM_DEBUG_KMS("Unknown FB ID%d\n",
|
||||
crtc_req->fb_id);
|
||||
@@ -680,7 +680,7 @@ retry:
|
||||
goto out;
|
||||
}
|
||||
|
||||
connector = drm_connector_lookup(dev, out_id);
|
||||
connector = drm_connector_lookup(dev, file_priv, out_id);
|
||||
if (!connector) {
|
||||
DRM_DEBUG_KMS("Connector id %d unknown\n",
|
||||
out_id);
|
||||
|
Reference in New Issue
Block a user