drm/vmwgfx: use helpers

robclark · airlied · commit a4cd5d68570c · 2014-07-18T14:24:53.000+10:00
Signed-off-by: Rob Clark &lt;robdclark@gmail.com&gt;
Signed-off-by: Dave Airlie &lt;airlied@redhat.com&gt;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1501,7 +1501,6 @@ int vmw_kms_cursor_bypass_ioctl(struct drm_device *dev, void *data,
 {
 	struct drm_vmw_cursor_bypass_arg *arg = data;
 	struct vmw_display_unit *du;
-	struct drm_mode_object *obj;
 	struct drm_crtc *crtc;
 	int ret = 0;
 
@@ -1519,13 +1518,12 @@ int vmw_kms_cursor_bypass_ioctl(struct drm_device *dev, void *data,
 		return 0;
 	}
 
-	obj = drm_mode_object_find(dev, arg->crtc_id, DRM_MODE_OBJECT_CRTC);
-	if (!obj) {
+	crtc = drm_crtc_find(dev, arg->crtc_id);
+	if (!crtc) {
 		ret = -ENOENT;
 		goto out;
 	}
 
-	crtc = obj_to_crtc(obj);
 	du = vmw_crtc_to_du(crtc);
 
 	du->hotspot_x = arg->xhot;

Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,6 @@ int vmw_kms_cursor_bypass_ioctl(struct drm_device dev, void data,`
`1501`	`1501`	`{`
`1502`	`1502`	`struct drm_vmw_cursor_bypass_arg *arg = data;`
`1503`	`1503`	`struct vmw_display_unit *du;`
`1504`		`- struct drm_mode_object *obj;`
`1505`	`1504`	`struct drm_crtc *crtc;`
`1506`	`1505`	`int ret = 0;`
`1507`	`1506`
`@@ -1519,13 +1518,12 @@ int vmw_kms_cursor_bypass_ioctl(struct drm_device dev, void data,`
`1519`	`1518`	`return 0;`
`1520`	`1519`	`}`
`1521`	`1520`
`1522`		`- obj = drm_mode_object_find(dev, arg->crtc_id, DRM_MODE_OBJECT_CRTC);`
`1523`		`- if (!obj) {`
	`1521`	`+ crtc = drm_crtc_find(dev, arg->crtc_id);`
	`1522`	`+ if (!crtc) {`
`1524`	`1523`	`ret = -ENOENT;`
`1525`	`1524`	`goto out;`
`1526`	`1525`	`}`
`1527`	`1526`
`1528`		`- crtc = obj_to_crtc(obj);`
`1529`	`1527`	`du = vmw_crtc_to_du(crtc);`
`1530`	`1528`
`1531`	`1529`	`du->hotspot_x = arg->xhot;`