Skip to contentSkip to conversation

drm/i915: Fix a typo in i915_ppat_get()

PATCH In review Zhi Wang 6 participants 14 messages Sep 14, 2017 – Sep 18, 2017

Subsystems (2)
lore
Share & tools
lore

Zhi Wang

author
#0 lore raw

PATCH 1/2 drm/i915: Fix a typo in i915_ppat_get()

Cc Chris Wilson <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index 729ebaf..37cd086 100644
@@ -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;
Signature · 6 lines
2.7.4

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

PATCH 2/2 drm/i915: add lockdep_assert_held in i915_ppat_{get, put}

struct_mutext needs to be held before call these two APIs.

Cc Chris Wilson <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -0
index 37cd086..b43d3c9 100644
@@ -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);
Signature · 6 lines
2.7.4

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

Re: [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put}

Quoting Zhi Wang (2017-09-14 18:24:10)

Quoted 1 line

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#3 lore raw

Re: [PATCH 2/2] drm/i915: add lockdep_assert_held in i915_ppat_{get, put}

Quoted 7 lines · Chris Wilson

Quoting Zhi Wang (2017-09-14 18:24:10)

Quoted 1 line

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

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
maintainer
#4 lore raw
In reply to Zhi Wang

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")
Quoted 25 lines · Zhi Wang
Cc Chris Wilson <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index 729ebaf..37cd086 100644
@@ -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;
Signature · 1 line
2.7.4

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

#5 lore raw

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 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Widawsky, Benjamin <[email protected]>
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")
Quoted 24 lines · Zhi Wang
Cc Chris Wilson <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -2
index 729ebaf..37cd086 100644
@@ -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;
--
Quoted 2 lines

2.7.4

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

maintainer
#6 lore raw
Quoted 1 line · Zhi A

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

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
#7 lore raw

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:[email protected]]
Sent: Monday, September 18, 2017 4:08 PM
To: Wang, Zhi A <[email protected]>; Vivi, Rodrigo <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Widawsky, Benjamin <[email protected]>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()

Quoted 1 line · Zhi A

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

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
#8 lore raw
In reply to Rodrigo Vivi

Quoting Rodrigo Vivi (2017-09-14 18:36:49)

Quoted 4 lines

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

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:[email protected]]
Sent: Thursday, September 14, 2017 9:41 PM
To: Vivi, Rodrigo <[email protected]>; Wang, Zhi A <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Widawsky, Benjamin <[email protected]>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()

Quoting Rodrigo Vivi (2017-09-14 18:36:49)

Quoted 4 lines

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Juvenile no 00

-------- Original message --------
From: "Wang, Zhi A" <[email protected]>
Date: 9/14/17 8:03 PM (GMT-08:00)
To: Chris Wilson <[email protected]>, "Vivi, Rodrigo" <[email protected]>
Cc: [email protected], [email protected], [email protected], [email protected], "Widawsky, Benjamin" <[email protected]>
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:[email protected]]
Sent: Thursday, September 14, 2017 9:41 PM
To: Vivi, Rodrigo <[email protected]>; Wang, Zhi A <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Widawsky, Benjamin <[email protected]>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()

Quoting Rodrigo Vivi (2017-09-14 18:36:49)

Quoted 4 lines

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

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 <[email protected]>; Chris Wilson <[email protected]>; Vivi, Rodrigo <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()

Juvenile no 00

-------- Original message --------
From: "Wang, Zhi A" <[email protected]<mailto:[email protected]>>
Date: 9/14/17 8:03 PM (GMT-08:00)
To: Chris Wilson <[email protected]<mailto:[email protected]>>, "Vivi, Rodrigo" <[email protected]<mailto:[email protected]>>
Cc: [email protected]<mailto:[email protected]>, [email protected]<mailto:[email protected]>, [email protected]<mailto:[email protected]>, [email protected]<mailto:[email protected]>, "Widawsky, Benjamin" <[email protected]<mailto:[email protected]>>
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:[email protected]]
Sent: Thursday, September 14, 2017 9:41 PM
To: Vivi, Rodrigo <[email protected]<mailto:[email protected]>>; Wang, Zhi A <[email protected]<mailto:[email protected]>>
Cc: [email protected]<mailto:[email protected]>; [email protected]<mailto:[email protected]>; [email protected]<mailto:[email protected]>; [email protected]<mailto:[email protected]>; Widawsky, Benjamin <[email protected]<mailto:[email protected]>>
Subject: Re: [PATCH 1/2] drm/i915: Fix a typo in i915_ppat_get()

Quoting Rodrigo Vivi (2017-09-14 18:36:49)

Quoted 4 lines

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw

✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()

In reply to Zhi Wang
== Series Details ==

== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#13 lore raw

✗ Fi.CI.IGT: warning for series starting with [1/2] drm/i915: Fix a typo in i915_ppat_get()

In reply to Zhi Wang
== Series Details ==

== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx