evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm: use mode_object_find helpers

Browse source 
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Rob Clark 2014-11-25 20:33:11 -05:00 • committed by Daniel Vetter
parent 417009fb12
commit 933f622fc2
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/drm_crtc.c
View file

@ -2405,7 +2405,6 @@ int drm_mode_setplane(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
struct drm_mode_set_plane *plane_req = data; struct drm_mode_set_plane *plane_req = data;
struct drm_mode_object *obj;
struct drm_plane *plane; struct drm_plane *plane;
struct drm_crtc *crtc = NULL; struct drm_crtc *crtc = NULL;
struct drm_framebuffer *fb = NULL; struct drm_framebuffer *fb = NULL;
@ -2428,14 +2427,12 @@ int drm_mode_setplane(struct drm_device *dev, void *data,
* First, find the plane, crtc, and fb objects. If not available, * First, find the plane, crtc, and fb objects. If not available,
* we don't bother to call the driver. * we don't bother to call the driver.
*/ */
obj = drm_mode_object_find(dev, plane_req->plane_id, plane = drm_plane_find(dev, plane_req->plane_id);
DRM_MODE_OBJECT_PLANE); if (!plane) {
if (!obj) {
DRM_DEBUG_KMS("Unknown plane ID %d\n", DRM_DEBUG_KMS("Unknown plane ID %d\n",
plane_req->plane_id); plane_req->plane_id);
return -ENOENT; return -ENOENT;
} }
plane = obj_to_plane(obj);
if (plane_req->fb_id) { if (plane_req->fb_id) {
fb = drm_framebuffer_lookup(dev, plane_req->fb_id); fb = drm_framebuffer_lookup(dev, plane_req->fb_id);
@ -2445,14 +2442,12 @@ int drm_mode_setplane(struct drm_device *dev, void *data,
return -ENOENT; return -ENOENT;
} }
obj = drm_mode_object_find(dev, plane_req->crtc_id, crtc = drm_crtc_find(dev, plane_req->crtc_id);
DRM_MODE_OBJECT_CRTC); if (!crtc) {
if (!obj) {
DRM_DEBUG_KMS("Unknown crtc ID %d\n", DRM_DEBUG_KMS("Unknown crtc ID %d\n",
plane_req->crtc_id); plane_req->crtc_id);
return -ENOENT; return -ENOENT;
} }
crtc = obj_to_crtc(obj);
} }
/* /*