[PATCH resend for CI 1/2] drm/i915: Remove unused variable in i915_gem_request_add_to_client

[PATCH resend for CI 1/2] drm/i915: Remove unused variable in i915_gem_request_add_to_client

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 31652c1da761..9c4d9c186d91 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1370,7 +1370,6 @@ out:
 int 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);
@@ -1381,7 +1380,6 @@ int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
 	if (req->file_priv)
 		return -EINVAL;
 
-	dev_private = req->engine->dev->dev_private;
 	file_priv = file->driver_priv;
 
 	spin_lock(&file_priv->mm.lock);
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH resend for CI 2/2] drm/i915: Use shorter route to dev_private where possible

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Where we have a request we can use req->i915 directly instead
of going through the engine and device. Coccinelle script:

@@
function f;
identifier r;
@@
f(..., struct drm_i915_gem_request *r, ...)
{
...
- engine->dev->dev_private
+ r->i915
...
}
@@
struct drm_i915_gem_request *req;
@@
(
  req->
- engine->dev->dev_private
+ i915
)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem.c         | 2 +-
 drivers/gpu/drm/i915/i915_gem_context.c | 4 ++--
 drivers/gpu/drm/i915/i915_gem_gtt.c     | 2 +-
 drivers/gpu/drm/i915/intel_lrc.c        | 2 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9c4d9c186d91..042cb412e652 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2550,7 +2550,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,
 		return;
 
 	engine = request->engine;
-	dev_priv = engine->dev->dev_private;
+	dev_priv = request->i915;
 	ringbuf = request->ringbuf;
 
 	/*
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 1993449ab7c5..6a3b4553119e 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -656,7 +656,7 @@ static int do_switch(struct drm_i915_gem_request *req)
 {
 	struct intel_context *to = req->ctx;
 	struct intel_engine_cs *engine = req->engine;
-	struct drm_i915_private *dev_priv = engine->dev->dev_private;
+	struct drm_i915_private *dev_priv = req->i915;
 	struct intel_context *from = engine->last_context;
 	u32 hw_flags = 0;
 	bool uninitialized = false;
@@ -829,7 +829,7 @@ unpin_out:
 int i915_switch_context(struct drm_i915_gem_request *req)
 {
 	struct intel_engine_cs *engine = req->engine;
-	struct drm_i915_private *dev_priv = engine->dev->dev_private;
+	struct drm_i915_private *dev_priv = req->i915;
 
 	WARN_ON(i915.enable_execlists);
 	WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9c752fe0f730..fb0f9637d46f 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2192,7 +2192,7 @@ int i915_ppgtt_init_hw(struct drm_device *dev)
 
 int i915_ppgtt_init_ring(struct drm_i915_gem_request *req)
 {
-	struct drm_i915_private *dev_priv = req->engine->dev->dev_private;
+	struct drm_i915_private *dev_priv = req->i915;
 	struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
 
 	if (i915.enable_execlists)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index f72782200226..7c636b3db156 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -897,7 +897,7 @@ int intel_logical_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
 	int ret;
 
 	WARN_ON(req == NULL);
-	dev_priv = req->engine->dev->dev_private;
+	dev_priv = req->i915;
 
 	ret = i915_gem_check_wedge(&dev_priv->gpu_error,
 				   dev_priv->mm.interruptible);
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 015dc7db32b7..b7c8fc1a73a3 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2499,7 +2499,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req,
 
 	WARN_ON(req == NULL);
 	engine = req->engine;
-	dev_priv = engine->dev->dev_private;
+	dev_priv = req->i915;
 
 	ret = i915_gem_check_wedge(&dev_priv->gpu_error,
 				   dev_priv->mm.interruptible);
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH resend for CI 2/2] drm/i915: Use shorter route to dev_private where possible

[Chris Wilson]

On Thu, Mar 17, 2016 at 01:04:10PM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Where we have a request we can use req->i915 directly instead
> of going through the engine and device. Coccinelle script:
> 
> @@
> function f;
> identifier r;
> @@
> f(..., struct drm_i915_gem_request *r, ...)
> {
> ...
> - engine->dev->dev_private
> + r->i915
> ...
> }
> @@
> struct drm_i915_gem_request *req;
> @@
> (
>   req->
> - engine->dev->dev_private
> + i915
> )

struct intel_engine_cs *e;
- e->dev->dev_private
+ e->i915

Pretty please?

INTEL_INFO(engine->dev) (IS_GEN, HAS_ etc)
if r: INTEL_INFO(r->i915)
if e: INTEL_INFO(e->i915)
?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH resend for CI 2/2] drm/i915: Use shorter route to dev_private where possible

[Tvrtko Ursulin]

On 17/03/16 13:17, Chris Wilson wrote:
> On Thu, Mar 17, 2016 at 01:04:10PM +0000, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> Where we have a request we can use req->i915 directly instead
>> of going through the engine and device. Coccinelle script:
>>
>> @@
>> function f;
>> identifier r;
>> @@
>> f(..., struct drm_i915_gem_request *r, ...)
>> {
>> ...
>> - engine->dev->dev_private
>> + r->i915
>> ...
>> }
>> @@
>> struct drm_i915_gem_request *req;
>> @@
>> (
>>    req->
>> - engine->dev->dev_private
>> + i915
>> )
>
> struct intel_engine_cs *e;
> - e->dev->dev_private
> + e->i915
>
> Pretty please?

There is no e->i915 yet as far as I can see.

> INTEL_INFO(engine->dev) (IS_GEN, HAS_ etc)
> if r: INTEL_INFO(r->i915)
> if e: INTEL_INFO(e->i915)
> ?

I have a patch to do:

- dev->dev_private
+ to_i915(dev)

But that is huge and to little gain.

Maybe we should have:

to_i915(req)
to_i915(engine)
to_i915(dev)

And a smart macro which does the right thing at compile time?

That way churn would be one time only and the magic happens in the macro 
definition, as shortcuts are added or (re)moved.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH resend for CI 2/2] drm/i915: Use shorter route to dev_private where possible

[Chris Wilson]

On Thu, Mar 17, 2016 at 01:47:31PM +0000, Tvrtko Ursulin wrote:
> 
> On 17/03/16 13:17, Chris Wilson wrote:
> >On Thu, Mar 17, 2016 at 01:04:10PM +0000, Tvrtko Ursulin wrote:
> >>From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >>
> >>Where we have a request we can use req->i915 directly instead
> >>of going through the engine and device. Coccinelle script:
> >>
> >>@@
> >>function f;
> >>identifier r;
> >>@@
> >>f(..., struct drm_i915_gem_request *r, ...)
> >>{
> >>...
> >>- engine->dev->dev_private
> >>+ r->i915
> >>...
> >>}
> >>@@
> >>struct drm_i915_gem_request *req;
> >>@@
> >>(
> >>   req->
> >>- engine->dev->dev_private
> >>+ i915
> >>)
> >
> >struct intel_engine_cs *e;
> >- e->dev->dev_private
> >+ e->i915
> >
> >Pretty please?
> 
> There is no e->i915 yet as far as I can see.

Oh, you have seen it. It might be over there instead :|

> >INTEL_INFO(engine->dev) (IS_GEN, HAS_ etc)
> >if r: INTEL_INFO(r->i915)
> >if e: INTEL_INFO(e->i915)
> >?
> 
> I have a patch to do:
> 
> - dev->dev_private
> + to_i915(dev)
> 
> But that is huge and to little gain.
> 
> Maybe we should have:
> 
> to_i915(req)
> to_i915(engine)
> to_i915(dev)
> 
> And a smart macro which does the right thing at compile time?

Tempting. Should look nice and consistent and such magic would improve
the look of many opening stanzas.

> That way churn would be one time only and the magic happens in the
> macro definition, as shortcuts are added or (re)moved.

Aye.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH resend for CI 2/2] drm/i915: Use shorter route to dev_private where possible

[Daniel Vetter]

On Thu, Mar 17, 2016 at 01:55:57PM +0000, Chris Wilson wrote:
> On Thu, Mar 17, 2016 at 01:47:31PM +0000, Tvrtko Ursulin wrote:
> > 
> > On 17/03/16 13:17, Chris Wilson wrote:
> > >On Thu, Mar 17, 2016 at 01:04:10PM +0000, Tvrtko Ursulin wrote:
> > >>From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > >>
> > >>Where we have a request we can use req->i915 directly instead
> > >>of going through the engine and device. Coccinelle script:
> > >>
> > >>@@
> > >>function f;
> > >>identifier r;
> > >>@@
> > >>f(..., struct drm_i915_gem_request *r, ...)
> > >>{
> > >>...
> > >>- engine->dev->dev_private
> > >>+ r->i915
> > >>...
> > >>}
> > >>@@
> > >>struct drm_i915_gem_request *req;
> > >>@@
> > >>(
> > >>   req->
> > >>- engine->dev->dev_private
> > >>+ i915
> > >>)
> > >
> > >struct intel_engine_cs *e;
> > >- e->dev->dev_private
> > >+ e->i915
> > >
> > >Pretty please?
> > 
> > There is no e->i915 yet as far as I can see.
> 
> Oh, you have seen it. It might be over there instead :|
> 
> > >INTEL_INFO(engine->dev) (IS_GEN, HAS_ etc)
> > >if r: INTEL_INFO(r->i915)
> > >if e: INTEL_INFO(e->i915)
> > >?
> > 
> > I have a patch to do:
> > 
> > - dev->dev_private
> > + to_i915(dev)
> > 
> > But that is huge and to little gain.
> > 
> > Maybe we should have:
> > 
> > to_i915(req)
> > to_i915(engine)
> > to_i915(dev)
> > 
> > And a smart macro which does the right thing at compile time?
> 
> Tempting. Should look nice and consistent and such magic would improve
> the look of many opening stanzas.

This is imo a bit too much magic ... reg_to_i915, engine_to_i915 and
to_i915 all sound like good ideas (we have lots of examples where we avoid
the superclass, e.g. to_hdmi or similar).
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for series starting with [resend,for,CI,1/2] drm/i915: Remove unused variable in i915_gem_request_add_to_client

[Patchwork]

== Series Details ==

Series: series starting with [resend,for,CI,1/2] drm/i915: Remove unused variable in i915_gem_request_add_to_client
URL   : https://patchwork.freedesktop.org/series/4572/
State : failure

== Summary ==

Series 4572v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/4572/revisions/1/mbox/

Test gem_ringfill:
        Subgroup basic-default-s3:
                dmesg-warn -> PASS       (skl-nuci5)
Test gem_storedw_loop:
        Subgroup basic-default:
                dmesg-warn -> PASS       (skl-nuci5)
Test gem_sync:
        Subgroup basic-all:
                pass       -> DMESG-WARN (skl-nuci5)
        Subgroup basic-vebox:
                dmesg-warn -> PASS       (skl-nuci5)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (hsw-brixbox)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                dmesg-warn -> PASS       (hsw-gt2)
Test kms_pipe_crc_basic:
        Subgroup read-crc-pipe-a-frame-sequence:
                dmesg-warn -> PASS       (hsw-gt2)
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (bsw-nuc-2)

bdw-ultra        total:194  pass:172  dwarn:1   dfail:0   fail:0   skip:21 
bsw-nuc-2        total:194  pass:156  dwarn:1   dfail:0   fail:0   skip:37 
hsw-brixbox      total:194  pass:170  dwarn:1   dfail:0   fail:1   skip:22 
hsw-gt2          total:194  pass:176  dwarn:1   dfail:0   fail:0   skip:17 
ivb-t430s        total:194  pass:168  dwarn:1   dfail:0   fail:0   skip:25 
skl-i5k-2        total:194  pass:170  dwarn:1   dfail:0   fail:0   skip:23 
skl-i7k-2        total:194  pass:170  dwarn:1   dfail:0   fail:0   skip:23 
skl-nuci5        total:194  pass:181  dwarn:2   dfail:0   fail:0   skip:11 
snb-dellxps      total:14   pass:7    dwarn:0   dfail:0   fail:0   skip:6  

Results at /archive/results/CI_IGT_test/Patchwork_1633/

10e913a48ca36790da9b58bed8729598ea79ebdb drm-intel-nightly: 2016y-03m-17d-13h-22m-41s UTC integration manifest
edf23f502a4661ae2f9a42622452bd032d9c4172 drm/i915: Use shorter route to dev_private where possible
7f2bb0d40a9bb0f20eb0ef15abafc3c9c33d820f drm/i915: Remove unused variable in i915_gem_request_add_to_client

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.BAT: failure for series starting with [resend,for,CI,1/2] drm/i915: Remove unused variable in i915_gem_request_add_to_client

[Tvrtko Ursulin]

On 18/03/16 07:03, Patchwork wrote:
> == Series Details ==
>
> Series: series starting with [resend,for,CI,1/2] drm/i915: Remove unused variable in i915_gem_request_add_to_client
> URL   : https://patchwork.freedesktop.org/series/4572/
> State : failure
>
> == Summary ==
>
> Series 4572v1 Series without cover letter
> http://patchwork.freedesktop.org/api/1.0/series/4572/revisions/1/mbox/
>
> Test gem_ringfill:
>          Subgroup basic-default-s3:
>                  dmesg-warn -> PASS       (skl-nuci5)
> Test gem_storedw_loop:
>          Subgroup basic-default:
>                  dmesg-warn -> PASS       (skl-nuci5)
> Test gem_sync:
>          Subgroup basic-all:
>                  pass       -> DMESG-WARN (skl-nuci5)

Still some HDA issues:

WARNING: CPU: 1 PID: 40 at sound/hda/hdac_i915.c:91 
snd_hdac_display_power+0xf1/0x110 [snd_hda_core]()

>          Subgroup basic-vebox:
>                  dmesg-warn -> PASS       (skl-nuci5)
> Test kms_flip:
>          Subgroup basic-flip-vs-wf_vblank:
>                  pass       -> FAIL       (hsw-brixbox)

Long standing unrelated: https://bugs.freedesktop.org/show_bug.cgi?id=94294

> Test kms_frontbuffer_tracking:
>          Subgroup basic:
>                  dmesg-warn -> PASS       (hsw-gt2)
> Test kms_pipe_crc_basic:
>          Subgroup read-crc-pipe-a-frame-sequence:
>                  dmesg-warn -> PASS       (hsw-gt2)
>          Subgroup suspend-read-crc-pipe-c:
>                  dmesg-warn -> PASS       (bsw-nuc-2)
>
> bdw-ultra        total:194  pass:172  dwarn:1   dfail:0   fail:0   skip:21
> bsw-nuc-2        total:194  pass:156  dwarn:1   dfail:0   fail:0   skip:37
> hsw-brixbox      total:194  pass:170  dwarn:1   dfail:0   fail:1   skip:22
> hsw-gt2          total:194  pass:176  dwarn:1   dfail:0   fail:0   skip:17
> ivb-t430s        total:194  pass:168  dwarn:1   dfail:0   fail:0   skip:25
> skl-i5k-2        total:194  pass:170  dwarn:1   dfail:0   fail:0   skip:23
> skl-i7k-2        total:194  pass:170  dwarn:1   dfail:0   fail:0   skip:23
> skl-nuci5        total:194  pass:181  dwarn:2   dfail:0   fail:0   skip:11
> snb-dellxps      total:14   pass:7    dwarn:0   dfail:0   fail:0   skip:6
>
> Results at /archive/results/CI_IGT_test/Patchwork_1633/
>
> 10e913a48ca36790da9b58bed8729598ea79ebdb drm-intel-nightly: 2016y-03m-17d-13h-22m-41s UTC integration manifest
> edf23f502a4661ae2f9a42622452bd032d9c4172 drm/i915: Use shorter route to dev_private where possible
> 7f2bb0d40a9bb0f20eb0ef15abafc3c9c33d820f drm/i915: Remove unused variable in i915_gem_request_add_to_client

Merged the two. Thanks for the review.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx