Skip to contentSkip to conversation

drm/i915/gtt: remove px_page

PATCH In review Matthew Auld 4 participants 6 messages Jul 30, 2018

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Matthew Auld

author
#0 lore raw

PATCH 1/1 drm/i915/gtt: remove px_page

Entries will either be pointing to scratch or real PD, making the px_page(pd) check pointless. Also since there are no other users of px_page, just remove it.

Signed-off-by Matthew Auld <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Michel Thierry <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ---
 drivers/gpu/drm/i915/i915_gem_gtt.h | 1 -
 2 files changed, 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +0 -3
index 87219870d559..4137af4bd8f5 100644
@@ -1251,9 +1251,6 @@ static void gen8_free_page_tables(struct i915_address_space *vm,
 {
 	int i;
 
-	if (!px_page(pd))
-		return;
-
 	for (i = 0; i < I915_PDES; i++) {
 		if (pd->page_table[i] != vm->scratch_pt)
 			free_pt(vm, pd->page_table[i]);
drivers/gpu/drm/i915/i915_gem_gtt.h +0 -1
index ce945bf78a89..dd161c187a68 100644
@@ -229,7 +229,6 @@ struct i915_page_dma {
 };
 
 #define px_base(px) (&(px)->base)
-#define px_page(px) (px_base(px)->page)
 #define px_dma(px) (px_base(px)->daddr)
 
 struct i915_page_table {
Signature · 6 lines
2.17.1

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

Quoting Matthew Auld (2018-07-30 13:05:44)

Quoted 7 lines

Entries will either be pointing to scratch or real PD, making the px_page(pd) check pointless. Also since there are no other users of px_page, just remove it.

Signed-off-by Matthew Auld <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Michel Thierry <[email protected]>
Reviewed-by Chris Wilson <[email protected]>

QoD: how tough would it be to use the faultinjection to cause a setup failure?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Matthew Auld
Quoted 4 lines · Matthew Auld

Entries will either be pointing to scratch or real PD, making the px_page(pd) check pointless. Also since there are no other users of px_page, just remove it.

Yup. Callsites return enomem and free the struct so we should not leak any partially setup structs.

Reviewed-by Mika Kuoppala <[email protected]>
Quoted 41 lines
Signed-off-by Matthew Auld <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Michel Thierry <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ---
 drivers/gpu/drm/i915/i915_gem_gtt.h | 1 -
 2 files changed, 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +0 -3
index 87219870d559..4137af4bd8f5 100644
@@ -1251,9 +1251,6 @@ static void gen8_free_page_tables(struct i915_address_space *vm,
 {
 	int i;
 
-	if (!px_page(pd))
-		return;
-
 	for (i = 0; i < I915_PDES; i++) {
 		if (pd->page_table[i] != vm->scratch_pt)
 			free_pt(vm, pd->page_table[i]);
drivers/gpu/drm/i915/i915_gem_gtt.h +0 -1
index ce945bf78a89..dd161c187a68 100644
@@ -229,7 +229,6 @@ struct i915_page_dma {
 };
 
 #define px_base(px) (&(px)->base)
-#define px_page(px) (px_base(px)->page)
 #define px_dma(px) (px_base(px)->daddr)
 
 struct i915_page_table {
Signature · 6 lines
2.17.1

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

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

CI
#3 lore raw

✓ Fi.CI.BAT: success for drm/i915/gtt: remove px_page

In reply to Matthew Auld
== Series Details ==

== Series Details ==

Series: drm/i915/gtt: remove px_page
URL : https://patchwork.freedesktop.org/series/47421/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4594 -> Patchwork_9806 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/47421/revisions/1/mbox/

== Known issues ==

Here are the changes found in Patchwork_9806 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@debugfs_test@read_all_entries:
      {fi-icl-u}:         NOTRUN -> DMESG-WARN (fdo#107396)

    igt@drv_selftest@live_hangcheck:
      {fi-icl-u}:         NOTRUN -> INCOMPLETE (fdo#107399)

    igt@drv_selftest@live_objects:
      {fi-icl-u}:         NOTRUN -> DMESG-FAIL (fdo#107398)

    igt@drv_selftest@live_workarounds:
      {fi-cfl-8109u}:     PASS -> DMESG-FAIL (fdo#107292)
      fi-cnl-psr:         PASS -> DMESG-FAIL (fdo#107292)

    igt@gem_workarounds@basic-read:
      {fi-icl-u}:         NOTRUN -> FAIL (fdo#107338)

    igt@kms_chamelium@dp-edid-read:
      fi-kbl-7500u:       PASS -> FAIL (fdo#103841)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      {fi-icl-u}:         NOTRUN -> DMESG-WARN (fdo#107382) +4

    {igt@kms_psr@primary_page_flip}:
      {fi-icl-u}:         NOTRUN -> FAIL (fdo#107383) +3

    
    ==== Possible fixes ====

    igt@drv_selftest@live_coherency:
      fi-gdg-551:         DMESG-FAIL (fdo#107164) -> PASS

    igt@kms_chamelium@hdmi-edid-read:
      fi-kbl-7500u:       FAIL (fdo#103841) -> SKIP

    igt@kms_chamelium@hdmi-hpd-fast:
      fi-kbl-7500u:       FAIL (fdo#103841, fdo#102672) -> SKIP

    
    ==== Warnings ====

    {igt@kms_psr@primary_page_flip}:
      fi-cnl-psr:         DMESG-FAIL (fdo#107372) -> DMESG-WARN (fdo#107372)

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#107164 https://bugs.freedesktop.org/show_bug.cgi?id=107164
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107338 https://bugs.freedesktop.org/show_bug.cgi?id=107338
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
fdo#107382 https://bugs.freedesktop.org/show_bug.cgi?id=107382
fdo#107383 https://bugs.freedesktop.org/show_bug.cgi?id=107383
fdo#107396 https://bugs.freedesktop.org/show_bug.cgi?id=107396
fdo#107398 https://bugs.freedesktop.org/show_bug.cgi?id=107398
fdo#107399 https://bugs.freedesktop.org/show_bug.cgi?id=107399

== Participating hosts (51 -> 46) ==

Additional (1): fi-icl-u
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper

== Build changes ==

* Linux: CI_DRM_4594 -> Patchwork_9806

CI_DRM_4594: bebee8b5e1691b4b0a356a9b6443f9793e7f15d9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4581: f1c868dae24056ebc27e4f3c197724ce9b956a8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9806: 86dbe98df94dbc418691977a695654e8797c0310 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

86dbe98df94d drm/i915/gtt: remove px_page

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9806/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

CI
#4 lore raw

✓ Fi.CI.IGT: success for drm/i915/gtt: remove px_page

In reply to Matthew Auld
== Series Details ==

== Series Details ==

Series: drm/i915/gtt: remove px_page
URL : https://patchwork.freedesktop.org/series/47421/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4594_full -> Patchwork_9806_full =

== Summary - SUCCESS ==

No regressions found.

== Known issues ==

Here are the changes found in Patchwork_9806_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#105189)

    igt@kms_flip@flip-vs-expired-vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#105363, fdo#102887)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_hangcheck:
      shard-kbl:          DMESG-FAIL (fdo#106947, fdo#106560) -> PASS

    igt@gem_ppgtt@blt-vs-render-ctxn:
      shard-kbl:          INCOMPLETE (fdo#103665, fdo#106023) -> PASS

    igt@kms_flip@dpms-vs-vblank-race:
      shard-glk:          FAIL (fdo#103060) -> PASS

    igt@kms_universal_plane@cursor-fb-leak-pipe-b:
      shard-apl:          FAIL (fdo#107241) -> PASS

    igt@perf@blocking:
      shard-hsw:          FAIL (fdo#102252) -> PASS

fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#107241 https://bugs.freedesktop.org/show_bug.cgi?id=107241

== Participating hosts (5 -> 5) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_4594 -> Patchwork_9806

CI_DRM_4594: bebee8b5e1691b4b0a356a9b6443f9793e7f15d9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4581: f1c868dae24056ebc27e4f3c197724ce9b956a8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9806: 86dbe98df94dbc418691977a695654e8797c0310 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9806/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Re: ✓ Fi.CI.IGT: success for drm/i915/gtt: remove px_page

Quoting Patchwork (2018-07-30 15:19:10)

Quoted 6 lines

== Series Details ==

Series: drm/i915/gtt: remove px_page
URL : https://patchwork.freedesktop.org/series/47421/
State : success

Quoted 7 lines

== Summary ==

= CI Bug Log - changes from CI_DRM_4594_full -> Patchwork_9806_full =

== Summary - SUCCESS ==

No regressions found.

And pushed to keep CI fed. Thanks for the patch and review, -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx