Skip to contentSkip to conversation

drm/i915: Cleanup i915_gem_request_add_to_client

PATCH In review Tvrtko Ursulin 3 participants 4 messages Sep 27, 2016 – Sep 28, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Cleanup i915_gem_request_add_to_client

From: Tvrtko Ursulin <[email protected]>

Several things we can clean up in this function:

* Request and file passed in cannot be NULL. There is a single caller which makes it impossible so change that condition to a GEM_BUG_ON instead of a WARN with a return code.

* Same is true for req->file_priv which is always zeroed before this function is called.

* With the above we can remove the error return
from the function making it void.

* dev_private local variable was unused.

* Call site in i915_gem_do_execbuffer can be simplified since there is no error handling any longer.

---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |  7 ++-----
 drivers/gpu/drm/i915/i915_gem_request.c    | 16 +++-------------
 drivers/gpu/drm/i915/i915_gem_request.h    |  4 ++--
 3 files changed, 7 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -5
index 33c85227643d..67f9fbeb29d0 100644
@@ -1824,9 +1824,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 	 */
 	params->request->batch = params->batch;
 
-	ret = i915_gem_request_add_to_client(params->request, file);
-	if (ret)
-		goto err_request;
+	i915_gem_request_add_to_client(params->request, file);
 
 	/*
 	 * Save assorted stuff away to pass through to *_submission().
@@ -1841,8 +1839,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 	params->ctx                     = ctx;
 
 	ret = execbuf_submit(params, args, &eb->vmas);
-err_request:
-	__i915_add_request(params->request, ret == 0);
+	__i915_add_request(params->request, true);
 
 err_batch_unpin:
 	/*
drivers/gpu/drm/i915/i915_gem_request.c +3 -13
index 40978bc12ceb..b03f09567da2 100644
@@ -115,29 +115,19 @@ const struct fence_ops i915_fence_ops = {
 	.timeline_value_str = i915_fence_timeline_value_str,
 };
 
-int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
-				   struct drm_file *file)
+void i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
+				    struct drm_file *file)
 {
-	struct drm_i915_private *dev_private;
 	struct drm_i915_file_private *file_priv;
 
-	WARN_ON(!req || !file || req->file_priv);
+	GEM_BUG_ON(!req || !file || req->file_priv);
 
-	if (!req || !file)
-		return -EINVAL;
-
-	if (req->file_priv)
-		return -EINVAL;
-
-	dev_private = req->i915;
 	file_priv = file->driver_priv;
 
 	spin_lock(&file_priv->mm.lock);
 	req->file_priv = file_priv;
 	list_add_tail(&req->client_list, &file_priv->mm.request_list);
 	spin_unlock(&file_priv->mm.lock);
-
-	return 0;
 }
 
 static inline void
drivers/gpu/drm/i915/i915_gem_request.h +2 -2
index 974bd7bcc801..7fa20f342acf 100644
@@ -155,8 +155,8 @@ static inline bool fence_is_i915(struct fence *fence)
 struct drm_i915_gem_request * __must_check
 i915_gem_request_alloc(struct intel_engine_cs *engine,
 		       struct i915_gem_context *ctx);
-int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
-				   struct drm_file *file);
+void i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
+				    struct drm_file *file);
 void i915_gem_request_retire_upto(struct drm_i915_gem_request *req);
 
 static inline u32
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: warning for drm/i915: Cleanup i915_gem_request_add_to_client (rev2)

== Series Details ==

== Series Details ==

Series: drm/i915: Cleanup i915_gem_request_add_to_client (rev2)
URL : https://patchwork.freedesktop.org/series/12959/
State : warning

== Summary ==

Series 12959v2 drm/i915: Cleanup i915_gem_request_add_to_client
https://patchwork.freedesktop.org/api/1.0/series/12959/revisions/2/mbox/

Test gem_exec_gttfill:

        Subgroup basic:
                skip       -> PASS       (fi-snb-2600)
Test kms_busy:
        Subgroup basic-flip-default-a:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-default-b:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-default-c:
                pass       -> SKIP       (fi-skl-6770hq)
Test kms_cursor_legacy:
        Subgroup basic-flip-after-cursor-legacy:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-after-cursor-varying-size:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-before-cursor-legacy:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-before-cursor-varying-size:
                pass       -> SKIP       (fi-skl-6770hq)
Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-vs-modeset:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-plain-flip:
                pass       -> SKIP       (fi-skl-6770hq)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                fail       -> SKIP       (fi-skl-6770hq)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup hang-read-crc-pipe-b:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup hang-read-crc-pipe-c:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup nonblocking-crc-pipe-a:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup nonblocking-crc-pipe-a-frame-sequence:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup nonblocking-crc-pipe-b:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup nonblocking-crc-pipe-b-frame-sequence:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup nonblocking-crc-pipe-c:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup nonblocking-crc-pipe-c-frame-sequence:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup read-crc-pipe-a:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup read-crc-pipe-a-frame-sequence:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup read-crc-pipe-b:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup read-crc-pipe-b-frame-sequence:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup read-crc-pipe-c:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup read-crc-pipe-c-frame-sequence:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup suspend-read-crc-pipe-a:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup suspend-read-crc-pipe-b:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup suspend-read-crc-pipe-c:
                pass       -> SKIP       (fi-skl-6770hq)
Test kms_psr_sink_crc:
        Subgroup psr_basic:
                dmesg-warn -> PASS       (fi-skl-6700hq)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> SKIP       (fi-skl-6770hq)
        Subgroup basic-rte:
                pass       -> SKIP       (fi-skl-6770hq)
Test prime_vgem:
        Subgroup basic-fence-flip:
                pass       -> SKIP       (fi-skl-6770hq)
fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:202  dwarn:0   dfail:0   fail:0   skip:42 
fi-byt-j1900     total:244  pass:210  dwarn:2   dfail:0   fail:1   skip:31 
fi-byt-n2820     total:244  pass:208  dwarn:0   dfail:0   fail:1   skip:35 
fi-hsw-4770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ilk-650       total:244  pass:182  dwarn:0   dfail:0   fail:2   skip:60 
fi-ivb-3520m     total:244  pass:219  dwarn:0   dfail:0   fail:0   skip:25 
fi-ivb-3770      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6700k     total:244  pass:219  dwarn:1   dfail:0   fail:0   skip:24 
fi-skl-6770hq    total:244  pass:196  dwarn:1   dfail:0   fail:0   skip:47 
fi-snb-2520m     total:244  pass:208  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_2584/

15462029fe48ae56e7fb17d1fe4c8b70c1d3762f drm-intel-nightly: 2016y-09m-27d-16h-32m-56s UTC integration manifest da7e559 drm/i915: Cleanup i915_gem_request_add_to_client

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Cleanup i915_gem_request_add_to_client (rev2)

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Cleanup i915_gem_request_add_to_client (rev2)
URL : https://patchwork.freedesktop.org/series/12959/
State : failure

== Summary ==

Series 12959v2 drm/i915: Cleanup i915_gem_request_add_to_client
https://patchwork.freedesktop.org/api/1.0/series/12959/revisions/2/mbox/

Test gem_busy:

        Subgroup basic-hang-default:
                pass       -> FAIL       (fi-hsw-4770r)
Test gem_exec_gttfill:
        Subgroup basic:
                skip       -> PASS       (fi-snb-2600)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                fail       -> PASS       (fi-bxt-t5700)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-a:
                pass       -> DMESG-WARN (fi-ilk-650)
fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:202  dwarn:0   dfail:0   fail:0   skip:42 
fi-bxt-t5700     total:244  pass:214  dwarn:0   dfail:0   fail:0   skip:30 
fi-byt-j1900     total:244  pass:210  dwarn:2   dfail:0   fail:1   skip:31 
fi-byt-n2820     total:244  pass:208  dwarn:0   dfail:0   fail:1   skip:35 
fi-hsw-4770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:244  pass:221  dwarn:0   dfail:0   fail:1   skip:22 
fi-ilk-650       total:244  pass:181  dwarn:1   dfail:0   fail:2   skip:60 
fi-ivb-3520m     total:244  pass:219  dwarn:0   dfail:0   fail:0   skip:25 
fi-ivb-3770      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:221  dwarn:1   dfail:0   fail:0   skip:22 
fi-skl-6700k     total:244  pass:219  dwarn:1   dfail:0   fail:0   skip:24 
fi-skl-6770hq    total:244  pass:228  dwarn:1   dfail:0   fail:1   skip:14 
fi-snb-2520m     total:244  pass:208  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:244  pass:207  dwarn:0   dfail:0   fail:0   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_2584/

15462029fe48ae56e7fb17d1fe4c8b70c1d3762f drm-intel-nightly: 2016y-09m-27d-16h-32m-56s UTC integration manifest da7e559 drm/i915: Cleanup i915_gem_request_add_to_client

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Tvrtko Ursulin

drivers/gpu/drm/i915/i915_gem_request.c const struct fence_ops i915_fence_ops = { · line 123

Quoted 11 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/i915_gem_request.c +2 -2
-int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
-				   struct drm_file *file)
+void i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
+				    struct drm_file *file)

 {

drivers/gpu/drm/i915/i915_gem_request.c +0 -1
-	struct drm_i915_private *dev_private;

  struct drm_i915_file_private *file_priv;

drivers/gpu/drm/i915/i915_gem_request.c +1 -1
-	WARN_ON(!req || !file || req->file_priv);
+	GEM_BUG_ON(!req || !file || req->file_priv);

I might be inclined to drop this completely, we're going to OOPS anwyway if one of those is null.

Anyway;

Regards, Joonas

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx