A couple small OCD cleanups I noticed, which my other work-in-progress propertification/atomic-ioctl patches are on top of. No dependency on any atomic stuff, so might as well hit 'send'.
Rob Clark (2): drm: fix indentation drm: use mode_object_find helpers
drivers/gpu/drm/drm_crtc.c | 13 ++++--------- include/drm/drmP.h | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-)
Signed-off-by: Rob Clark robdclark@gmail.com --- include/drm/drmP.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index be776fb..8ba35c6 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -809,7 +809,7 @@ struct drm_device { struct drm_local_map *agp_buffer_map; unsigned int agp_buffer_token;
- struct drm_mode_config mode_config; /**< Current mode config */ + struct drm_mode_config mode_config; /**< Current mode config */
/** \name GEM information */ /*@{ */
Signed-off-by: Rob Clark robdclark@gmail.com --- drivers/gpu/drm/drm_crtc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 589a921..9972cc8 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2392,7 +2392,6 @@ int drm_mode_setplane(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_mode_set_plane *plane_req = data; - struct drm_mode_object *obj; struct drm_plane *plane; struct drm_crtc *crtc = NULL; struct drm_framebuffer *fb = NULL; @@ -2415,14 +2414,12 @@ int drm_mode_setplane(struct drm_device *dev, void *data, * First, find the plane, crtc, and fb objects. If not available, * we don't bother to call the driver. */ - obj = drm_mode_object_find(dev, plane_req->plane_id, - DRM_MODE_OBJECT_PLANE); - if (!obj) { + plane = drm_plane_find(dev, plane_req->plane_id); + if (!plane) { DRM_DEBUG_KMS("Unknown plane ID %d\n", plane_req->plane_id); return -ENOENT; } - plane = obj_to_plane(obj);
if (plane_req->fb_id) { fb = drm_framebuffer_lookup(dev, plane_req->fb_id); @@ -2432,14 +2429,12 @@ int drm_mode_setplane(struct drm_device *dev, void *data, return -ENOENT; }
- obj = drm_mode_object_find(dev, plane_req->crtc_id, - DRM_MODE_OBJECT_CRTC); - if (!obj) { + crtc = drm_crtc_find(dev, plane_req->crtc_id); + if (!crtc) { DRM_DEBUG_KMS("Unknown crtc ID %d\n", plane_req->crtc_id); return -ENOENT; } - crtc = obj_to_crtc(obj); }
/*
On Tue, Nov 25, 2014 at 08:33:09PM -0500, Rob Clark wrote:
A couple small OCD cleanups I noticed, which my other work-in-progress propertification/atomic-ioctl patches are on top of. No dependency on any atomic stuff, so might as well hit 'send'.
Both merged into my fixup pile, thanks. -Daniel
Rob Clark (2): drm: fix indentation drm: use mode_object_find helpers
drivers/gpu/drm/drm_crtc.c | 13 ++++--------- include/drm/drmP.h | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-)
-- 1.9.3
dri-devel@lists.freedesktop.org
-
Daniel Vetter -
Rob Clark