* [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
@ 2017-09-14 17:24 Zhi Wang
2017-09-14 17:24 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Zhi Wang @ 2017-09-14 17:24 UTC (permalink / raw)
To: intel-gfx, intel-gvt-dev; +Cc: Rodrigo Vivi, Ben Widawsky
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 729ebaf..37cd086 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2965,7 +2965,7 @@ static unsigned int bdw_private_pat_match(u8 src, u8 dst)
};
/* Cache attribute has to be matched. */
- if (GEN8_PPAT_GET_CA(src) == GEN8_PPAT_GET_CA(dst))
+ if (GEN8_PPAT_GET_CA(src) != GEN8_PPAT_GET_CA(dst))
return 0;
score |= CA_MATCH;
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put}
2017-09-14 17:24 [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Zhi Wang
@ 2017-09-14 17:24 ` Zhi Wang
2017-09-14 18:39 ` Chris Wilson
2017-09-14 17:36 ` [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Rodrigo Vivi
` (2 subsequent siblings)
3 siblings, 1 reply; 15+ messages in thread
From: Zhi Wang @ 2017-09-14 17:24 UTC (permalink / raw)
To: intel-gfx, intel-gvt-dev; +Cc: Rodrigo Vivi, Ben Widawsky
struct_mutext needs to be held before call these two APIs.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 37cd086..b43d3c9 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2869,6 +2869,7 @@ intel_ppat_get(struct drm_i915_private *i915, u8 value)
unsigned int scanned, best_score;
int i;
+ lockdep_assert_held(&i915->drm.struct_mutex);
GEM_BUG_ON(!ppat->max_entries);
scanned = best_score = 0;
@@ -2924,6 +2925,7 @@ void intel_ppat_put(const struct intel_ppat_entry *entry)
struct intel_ppat *ppat = entry->ppat;
unsigned int index = entry - ppat->entries;
+ lockdep_assert_held(&ppat->i915->drm.struct_mutex);
GEM_BUG_ON(!ppat->max_entries);
kref_put(&ppat->entries[index].ref, release_ppat);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put}
2017-09-14 17:24 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
@ 2017-09-14 18:39 ` Chris Wilson
2017-09-15 6:09 ` Joonas Lahtinen
0 siblings, 1 reply; 15+ messages in thread
From: Chris Wilson @ 2017-09-14 18:39 UTC (permalink / raw)
To: Zhi Wang, intel-gfx, intel-gvt-dev; +Cc: Rodrigo Vivi, Ben Widawsky
Quoting Zhi Wang (2017-09-14 18:24:10)
> struct_mutext needs to be held before call these two APIs.
True for the moment. But raises a question of whether introducing a
ppat->mutex would be beneficial? All depends on whether the caller is
already forced to use struct_mutex and is likely to continue to need it
next year...
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put}
2017-09-14 18:39 ` Chris Wilson
@ 2017-09-15 6:09 ` Joonas Lahtinen
0 siblings, 0 replies; 15+ messages in thread
From: Joonas Lahtinen @ 2017-09-15 6:09 UTC (permalink / raw)
To: Chris Wilson, Zhi Wang, intel-gfx, intel-gvt-dev
Cc: Rodrigo Vivi, Ben Widawsky
On Thu, 2017-09-14 at 19:39 +0100, Chris Wilson wrote:
> Quoting Zhi Wang (2017-09-14 18:24:10)
> > struct_mutext needs to be held before call these two APIs.
>
> True for the moment. But raises a question of whether introducing a
> ppat->mutex would be beneficial? All depends on whether the caller is
> already forced to use struct_mutex and is likely to continue to need it
> next year...
I doubt this will be performance critical, so introducing separate
locking should not hurt.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 17:24 [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Zhi Wang
2017-09-14 17:24 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
@ 2017-09-14 17:36 ` Rodrigo Vivi
2017-09-14 17:51 ` Wang, Zhi A
2017-09-14 18:41 ` Chris Wilson
2017-09-14 17:42 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2017-09-14 23:51 ` ✗ Fi.CI.IGT: warning " Patchwork
3 siblings, 2 replies; 15+ messages in thread
From: Rodrigo Vivi @ 2017-09-14 17:36 UTC (permalink / raw)
To: Zhi Wang; +Cc: intel-gfx, Ben Widawsky, intel-gvt-dev
well, I wouldn't call this as a typo.
This is a logic fix and deserves a better subject a proper
commit message an also fixes tag:
Fixes: 4395890a4855 ("drm/i915: Introduce private PAT management")
On Thu, Sep 14, 2017 at 05:24:09PM +0000, Zhi Wang wrote:
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ben Widawsky <benjamin.widawsky@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 729ebaf..37cd086 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2965,7 +2965,7 @@ static unsigned int bdw_private_pat_match(u8 src, u8 dst)
> };
>
> /* Cache attribute has to be matched. */
> - if (GEN8_PPAT_GET_CA(src) == GEN8_PPAT_GET_CA(dst))
> + if (GEN8_PPAT_GET_CA(src) != GEN8_PPAT_GET_CA(dst))
> return 0;
>
> score |= CA_MATCH;
> --
> 2.7.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 17:36 ` [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Rodrigo Vivi
@ 2017-09-14 17:51 ` Wang, Zhi A
2017-09-18 13:08 ` Joonas Lahtinen
2017-09-14 18:41 ` Chris Wilson
1 sibling, 1 reply; 15+ messages in thread
From: Wang, Zhi A @ 2017-09-14 17:51 UTC (permalink / raw)
To: Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org, Widawsky, Benjamin,
intel-gvt-dev@lists.freedesktop.org
Thanks for the comments. V2 has been sent.
-----Original Message-----
From: Vivi, Rodrigo
Sent: Thursday, September 14, 2017 8:37 PM
To: Wang, Zhi A <zhi.a.wang@intel.com>
Cc: intel-gfx@lists.freedesktop.org; intel-gvt-dev@lists.freedesktop.org; joonas.lahtinen@linux.intel.com; chris@chris-wilson.co.uk; zhenyuw@linux.intel.com; Widawsky, Benjamin <benjamin.widawsky@intel.com>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
well, I wouldn't call this as a typo.
This is a logic fix and deserves a better subject a proper commit message an also fixes tag:
Fixes: 4395890a4855 ("drm/i915: Introduce private PAT management")
On Thu, Sep 14, 2017 at 05:24:09PM +0000, Zhi Wang wrote:
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ben Widawsky <benjamin.widawsky@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
> b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 729ebaf..37cd086 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2965,7 +2965,7 @@ static unsigned int bdw_private_pat_match(u8 src, u8 dst)
> };
>
> /* Cache attribute has to be matched. */
> - if (GEN8_PPAT_GET_CA(src) == GEN8_PPAT_GET_CA(dst))
> + if (GEN8_PPAT_GET_CA(src) != GEN8_PPAT_GET_CA(dst))
> return 0;
>
> score |= CA_MATCH;
> --
> 2.7.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 17:51 ` Wang, Zhi A
@ 2017-09-18 13:08 ` Joonas Lahtinen
2017-09-18 13:14 ` Wang, Zhi A
0 siblings, 1 reply; 15+ messages in thread
From: Joonas Lahtinen @ 2017-09-18 13:08 UTC (permalink / raw)
To: Wang, Zhi A, Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org, Widawsky, Benjamin,
intel-gvt-dev@lists.freedesktop.org
On Thu, 2017-09-14 at 17:51 +0000, Wang, Zhi A wrote:
> Thanks for the comments. V2 has been sent.
At least I never received V2, so the fix has still not been merged.
Please (re-)send it ASAP.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-18 13:08 ` Joonas Lahtinen
@ 2017-09-18 13:14 ` Wang, Zhi A
0 siblings, 0 replies; 15+ messages in thread
From: Wang, Zhi A @ 2017-09-18 13:14 UTC (permalink / raw)
To: Joonas Lahtinen, Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org, Widawsky, Benjamin,
intel-gvt-dev@lists.freedesktop.org
Sorry I changed the tittle of the patch with a fixes line. You have already given an r-b. :)
-----Original Message-----
From: Joonas Lahtinen [mailto:joonas.lahtinen@linux.intel.com]
Sent: Monday, September 18, 2017 4:08 PM
To: Wang, Zhi A <zhi.a.wang@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org; intel-gvt-dev@lists.freedesktop.org; chris@chris-wilson.co.uk; zhenyuw@linux.intel.com; Widawsky, Benjamin <benjamin.widawsky@intel.com>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
On Thu, 2017-09-14 at 17:51 +0000, Wang, Zhi A wrote:
> Thanks for the comments. V2 has been sent.
At least I never received V2, so the fix has still not been merged.
Please (re-)send it ASAP.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 17:36 ` [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Rodrigo Vivi
2017-09-14 17:51 ` Wang, Zhi A
@ 2017-09-14 18:41 ` Chris Wilson
2017-09-15 3:03 ` Wang, Zhi A
1 sibling, 1 reply; 15+ messages in thread
From: Chris Wilson @ 2017-09-14 18:41 UTC (permalink / raw)
To: Rodrigo Vivi, Zhi Wang; +Cc: intel-gfx, intel-gvt-dev, Ben Widawsky
Quoting Rodrigo Vivi (2017-09-14 18:36:49)
>
> well, I wouldn't call this as a typo.
> This is a logic fix and deserves a better subject a proper
> commit message an also fixes tag:
It should work either way, just the bug doesn't allow reuse.
The question to ask is why didn't the selftest pick this up? It passes
on bdw...
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 18:41 ` Chris Wilson
@ 2017-09-15 3:03 ` Wang, Zhi A
2017-09-15 5:01 ` Widawsky, Benjamin
0 siblings, 1 reply; 15+ messages in thread
From: Wang, Zhi A @ 2017-09-15 3:03 UTC (permalink / raw)
To: Chris Wilson, Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org, Widawsky, Benjamin
Sorry for the trouble. It's because we have 4 different entries with different attributes and every time we match an entry by cache attribute, we got a perfect match...
-----Original Message-----
From: Chris Wilson [mailto:chris@chris-wilson.co.uk]
Sent: Thursday, September 14, 2017 9:41 PM
To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Wang, Zhi A <zhi.a.wang@intel.com>
Cc: intel-gfx@lists.freedesktop.org; intel-gvt-dev@lists.freedesktop.org; joonas.lahtinen@linux.intel.com; zhenyuw@linux.intel.com; Widawsky, Benjamin <benjamin.widawsky@intel.com>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
Quoting Rodrigo Vivi (2017-09-14 18:36:49)
>
> well, I wouldn't call this as a typo.
> This is a logic fix and deserves a better subject a proper commit
> message an also fixes tag:
It should work either way, just the bug doesn't allow reuse.
The question to ask is why didn't the selftest pick this up? It passes on bdw...
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-15 3:03 ` Wang, Zhi A
@ 2017-09-15 5:01 ` Widawsky, Benjamin
2017-09-15 5:08 ` Wang, Zhi A
0 siblings, 1 reply; 15+ messages in thread
From: Widawsky, Benjamin @ 2017-09-15 5:01 UTC (permalink / raw)
To: Wang, Zhi A, Chris Wilson, Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org
[-- Attachment #1.1: Type: text/plain, Size: 1445 bytes --]
Juvenile no 00
-------- Original message --------
From: "Wang, Zhi A" <zhi.a.wang@intel.com>
Date: 9/14/17 8:03 PM (GMT-08:00)
To: Chris Wilson <chris@chris-wilson.co.uk>, "Vivi, Rodrigo" <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, joonas.lahtinen@linux.intel.com, zhenyuw@linux.intel.com, "Widawsky, Benjamin" <benjamin.widawsky@intel.com>
Subject: RE: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
Sorry for the trouble. It's because we have 4 different entries with different attributes and every time we match an entry by cache attribute, we got a perfect match...
-----Original Message-----
From: Chris Wilson [mailto:chris@chris-wilson.co.uk]
Sent: Thursday, September 14, 2017 9:41 PM
To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Wang, Zhi A <zhi.a.wang@intel.com>
Cc: intel-gfx@lists.freedesktop.org; intel-gvt-dev@lists.freedesktop.org; joonas.lahtinen@linux.intel.com; zhenyuw@linux.intel.com; Widawsky, Benjamin <benjamin.widawsky@intel.com>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
Quoting Rodrigo Vivi (2017-09-14 18:36:49)
>
> well, I wouldn't call this as a typo.
> This is a logic fix and deserves a better subject a proper commit
> message an also fixes tag:
It should work either way, just the bug doesn't allow reuse.
The question to ask is why didn't the selftest pick this up? It passes on bdw...
-Chris
[-- Attachment #1.2: Type: text/html, Size: 2208 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-15 5:01 ` Widawsky, Benjamin
@ 2017-09-15 5:08 ` Wang, Zhi A
0 siblings, 0 replies; 15+ messages in thread
From: Wang, Zhi A @ 2017-09-15 5:08 UTC (permalink / raw)
To: Widawsky, Benjamin, Chris Wilson, Vivi, Rodrigo
Cc: intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org
[-- Attachment #1.1: Type: text/plain, Size: 2483 bytes --]
Oops. So it's like we have to create some entries with same cache attributes before perfect match test case.
From: Widawsky, Benjamin
Sent: Friday, September 15, 2017 8:02 AM
To: Wang, Zhi A <zhi.a.wang@intel.com>; Chris Wilson <chris@chris-wilson.co.uk>; Vivi, Rodrigo <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org; intel-gvt-dev@lists.freedesktop.org; joonas.lahtinen@linux.intel.com; zhenyuw@linux.intel.com
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
Juvenile no 00
-------- Original message --------
From: "Wang, Zhi A" <zhi.a.wang@intel.com<mailto:zhi.a.wang@intel.com>>
Date: 9/14/17 8:03 PM (GMT-08:00)
To: Chris Wilson <chris@chris-wilson.co.uk<mailto:chris@chris-wilson.co.uk>>, "Vivi, Rodrigo" <rodrigo.vivi@intel.com<mailto:rodrigo.vivi@intel.com>>
Cc: intel-gfx@lists.freedesktop.org<mailto:intel-gfx@lists.freedesktop.org>, intel-gvt-dev@lists.freedesktop.org<mailto:intel-gvt-dev@lists.freedesktop.org>, joonas.lahtinen@linux.intel.com<mailto:joonas.lahtinen@linux.intel.com>, zhenyuw@linux.intel.com<mailto:zhenyuw@linux.intel.com>, "Widawsky, Benjamin" <benjamin.widawsky@intel.com<mailto:benjamin.widawsky@intel.com>>
Subject: RE: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
Sorry for the trouble. It's because we have 4 different entries with different attributes and every time we match an entry by cache attribute, we got a perfect match...
-----Original Message-----
From: Chris Wilson [mailto:chris@chris-wilson.co.uk]
Sent: Thursday, September 14, 2017 9:41 PM
To: Vivi, Rodrigo <rodrigo.vivi@intel.com<mailto:rodrigo.vivi@intel.com>>; Wang, Zhi A <zhi.a.wang@intel.com<mailto:zhi.a.wang@intel.com>>
Cc: intel-gfx@lists.freedesktop.org<mailto:intel-gfx@lists.freedesktop.org>; intel-gvt-dev@lists.freedesktop.org<mailto:intel-gvt-dev@lists.freedesktop.org>; joonas.lahtinen@linux.intel.com<mailto:joonas.lahtinen@linux.intel.com>; zhenyuw@linux.intel.com<mailto:zhenyuw@linux.intel.com>; Widawsky, Benjamin <benjamin.widawsky@intel.com<mailto:benjamin.widawsky@intel.com>>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
Quoting Rodrigo Vivi (2017-09-14 18:36:49)
>
> well, I wouldn't call this as a typo.
> This is a logic fix and deserves a better subject a proper commit
> message an also fixes tag:
It should work either way, just the bug doesn't allow reuse.
The question to ask is why didn't the selftest pick this up? It passes on bdw...
-Chris
[-- Attachment #1.2: Type: text/html, Size: 6229 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 17:24 [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Zhi Wang
2017-09-14 17:24 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
2017-09-14 17:36 ` [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Rodrigo Vivi
@ 2017-09-14 17:42 ` Patchwork
2017-09-14 23:51 ` ✗ Fi.CI.IGT: warning " Patchwork
3 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-09-14 17:42 UTC (permalink / raw)
To: Zhi Wang; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()
URL : https://patchwork.freedesktop.org/series/30374/
State : success
== Summary ==
Series 30374v1 series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()
https://patchwork.freedesktop.org/api/1.0/series/30374/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
pass -> FAIL (fi-snb-2600) fdo#100215 +1
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
skip -> PASS (fi-skl-x1585l)
Test pm_rpm:
Subgroup basic-rte:
pass -> DMESG-WARN (fi-cfl-s) fdo#102294
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:447s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:454s
fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:379s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:523s
fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:268s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:503s
fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:499s
fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:498s
fi-cfl-s total:289 pass:222 dwarn:35 dfail:0 fail:0 skip:32 time:546s
fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:450s
fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:595s
fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:429s
fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:405s
fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:432s
fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:480s
fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:461s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:487s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:579s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:587s
fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:556s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:458s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:517s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:505s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:456s
fi-skl-x1585l total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:479s
fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:577s
fi-snb-2600 total:289 pass:248 dwarn:0 dfail:0 fail:2 skip:39 time:421s
46e05d756fe32271bca4ac3ef1b3f1f6006fcc0c drm-tip: 2017y-09m-14d-14h-46m-01s UTC integration manifest
bf523c78eb52 drm/i915: add lockdep_assert_held in i915_ppat_{get, put}
c6c64997aec5 drm/i915: Fix a typo in i915_ppat_get()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5706/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread* ✗ Fi.CI.IGT: warning for series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()
2017-09-14 17:24 [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Zhi Wang
` (2 preceding siblings ...)
2017-09-14 17:42 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
@ 2017-09-14 23:51 ` Patchwork
3 siblings, 0 replies; 15+ messages in thread
From: Patchwork @ 2017-09-14 23:51 UTC (permalink / raw)
To: Wang, Zhi A; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()
URL : https://patchwork.freedesktop.org/series/30374/
State : warning
== Summary ==
Test gem_eio:
Subgroup in-flight:
pass -> FAIL (shard-hsw) fdo#102616
Test gem_flink_race:
Subgroup flink_close:
pass -> FAIL (shard-hsw) fdo#102655
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-C-planes:
skip -> PASS (shard-hsw)
Test kms_rmfb:
Subgroup close-fd:
skip -> PASS (shard-hsw)
Test kms_universal_plane:
Subgroup universal-plane-pipe-B-functional:
skip -> PASS (shard-hsw)
Test kms_cursor_crc:
Subgroup cursor-256x256-dpms:
skip -> PASS (shard-hsw)
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-spr-indfb-draw-pwrite:
pass -> DMESG-WARN (shard-hsw)
fdo#102616 https://bugs.freedesktop.org/show_bug.cgi?id=102616
fdo#102655 https://bugs.freedesktop.org/show_bug.cgi?id=102655
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2313 pass:1242 dwarn:1 dfail:0 fail:15 skip:1055 time:9429s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5706/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()
@ 2017-09-14 17:21 Zhi Wang
2017-09-14 17:21 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
0 siblings, 1 reply; 15+ messages in thread
From: Zhi Wang @ 2017-09-14 17:21 UTC (permalink / raw)
To: intel-gfx, intel-gvt-dev; +Cc: Rodrigo Vivi, Ben Widawsky
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 729ebaf..37cd086 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2965,7 +2965,7 @@ static unsigned int bdw_private_pat_match(u8 src, u8 dst)
};
/* Cache attribute has to be matched. */
- if (GEN8_PPAT_GET_CA(src) == GEN8_PPAT_GET_CA(dst))
+ if (GEN8_PPAT_GET_CA(src) != GEN8_PPAT_GET_CA(dst))
return 0;
score |= CA_MATCH;
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put}
2017-09-14 17:21 [PATCH 1/2] " Zhi Wang
@ 2017-09-14 17:21 ` Zhi Wang
0 siblings, 0 replies; 15+ messages in thread
From: Zhi Wang @ 2017-09-14 17:21 UTC (permalink / raw)
To: intel-gfx, intel-gvt-dev; +Cc: Rodrigo Vivi, Ben Widawsky
struct_mutext needs to be held before call these two APIs.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 37cd086..b43d3c9 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2869,6 +2869,7 @@ intel_ppat_get(struct drm_i915_private *i915, u8 value)
unsigned int scanned, best_score;
int i;
+ lockdep_assert_held(&i915->drm.struct_mutex);
GEM_BUG_ON(!ppat->max_entries);
scanned = best_score = 0;
@@ -2924,6 +2925,7 @@ void intel_ppat_put(const struct intel_ppat_entry *entry)
struct intel_ppat *ppat = entry->ppat;
unsigned int index = entry - ppat->entries;
+ lockdep_assert_held(&ppat->i915->drm.struct_mutex);
GEM_BUG_ON(!ppat->max_entries);
kref_put(&ppat->entries[index].ref, release_ppat);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-09-18 13:14 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-14 17:24 [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Zhi Wang
2017-09-14 17:24 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
2017-09-14 18:39 ` Chris Wilson
2017-09-15 6:09 ` Joonas Lahtinen
2017-09-14 17:36 ` [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get() Rodrigo Vivi
2017-09-14 17:51 ` Wang, Zhi A
2017-09-18 13:08 ` Joonas Lahtinen
2017-09-18 13:14 ` Wang, Zhi A
2017-09-14 18:41 ` Chris Wilson
2017-09-15 3:03 ` Wang, Zhi A
2017-09-15 5:01 ` Widawsky, Benjamin
2017-09-15 5:08 ` Wang, Zhi A
2017-09-14 17:42 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2017-09-14 23:51 ` ✗ Fi.CI.IGT: warning " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2017-09-14 17:21 [PATCH 1/2] " Zhi Wang
2017-09-14 17:21 ` [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put} Zhi Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox