Skip to contentSkip to conversation

small OCD cleanups

PATCH In review Rob Clark 2 participants 4 messages Nov 26, 2014

Subsystems (2)
DRM drivers DRM misc
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

cover small OCD cleanups

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(-)
Signature · 6 lines
1.9.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#1 lore raw

PATCH 1/2 drm: fix indentation

Signed-off-by Rob Clark <[email protected]>
---
 include/drm/drmP.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drmP.h +1 -1
index be776fb..8ba35c6 100644
@@ -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 */
 	/*@{ */
Signature · 6 lines
1.9.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#2 lore raw

PATCH 2/2 drm: use mode_object_find helpers

In reply to Rob Clark
Signed-off-by Rob Clark <[email protected]>
---
 drivers/gpu/drm/drm_crtc.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_crtc.c +4 -9
index 589a921..9972cc8 100644
@@ -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);
 	}
 
 	/*
Signature · 6 lines
1.9.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw
In reply to Rob Clark
Quoted 3 lines · Rob Clark

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

Quoted 12 lines

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(-)
Signature · 1 line
1.9.3
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel