drm/i915: don't assume struct page in i915_sg_trim
Subsystems (2)
PATCH 1/2 drm/i915: don't assume struct page in i915_sg_trim
Which means we can now also put it to work in fake_get_huge_pages.
--- drivers/gpu/drm/i915/i915_gem.c | 4 +++- drivers/gpu/drm/i915/selftests/huge_pages.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem.c +3 -1
@@ -2506,7 +2506,9 @@ static bool i915_sg_trim(struct sg_table *orig_st) new_sg = new_st.sgl;for_each_sg (orig_st->sgl, sg, orig_st->nents, i) {sg_set_page (new_sg,sg_page (sg), sg->length,0 ); -/* called before being DMA mapped, no need to copy sg->dma_* */ +sg_dma_address (new_sg) =sg_dma_address (sg); +sg_dma_len (new_sg) =sg_dma_len (sg); + new_sg =sg_next (new_sg); }GEM_BUG_ON (new_sg);/* Should walk exactly nents and hit the end */
drivers/gpu/drm/i915/selftests/huge_pages.c +2 -0
@@ -235,6 +235,8 @@ static int fake_get_huge_pages(struct drm_i915_gem_object *obj) sg =sg_next (sg); }while (1 ); +i915_sg_trim (st); + obj->mm.madv =I915_MADV_DONTNEED ;__i915_gem_object_set_pages (obj, st, sg_page_sizes);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: pass dev_priv to i915_gem_cleanup_stolen
It really wants dev_priv anyway, also now matches i915_gem_init_stolen.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -3340,7 +3340,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,void i915_gem_stolen_remove_node (struct drm_i915_private *dev_priv,struct drm_mm_node *node);int i915_gem_init_stolen (struct drm_i915_private *dev_priv); -void i915_gem_cleanup_stolen (struct drm_device *dev); +void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv);struct drm_i915_gem_object *i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,resource_size_t size);
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -3005,7 +3005,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)arch_phys_wc_del (ggtt->mtrr);io_mapping_fini (&ggtt->iomap); -i915_gem_cleanup_stolen (&dev_priv->drm); +i915_gem_cleanup_stolen (dev_priv); }static unsigned int gen6_get_total_gtt_size (u16 snb_gmch_ctl)
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -3
@@ -167,10 +167,8 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv,return 0 ; } -void i915_gem_cleanup_stolen (struct drm_device *dev) +void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev); -if (!drm_mm_initialized (&dev_priv->mm.stolen))return ;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Matthew Auld (2018-09-20 15:27:06)
Quoted 4 lines
Which means we can now also put it to work in
fake_get_huge_pages.Signed-off-by Matthew Auld <[email protected]>Cc Tvrtko Ursulin <[email protected]>
Can we take this into account for selftests/scatterlist.c?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen
In reply to Matthew AuldQuoting Matthew Auld (2018-09-20 15:27:07)
Quoted 6 lines
It really wants
dev_privanyway, also now matchesi915_gem_init_stolen.Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Reviewed-by Tvrtko Ursulin <[email protected]>
As a bonus, start feeding in s/dev_priv/i915/?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 1 line · Matthew Auld
Which means we can now also put it to work in
fake_get_huge_pages.
Just another reminder to write self-contained commit msgs. Reading this wihtout copy pasting the subject line in makes one wonder what the "which" is here.
Quoted 43 lines
Signed-off-by Matthew Auld <[email protected]>Cc Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 4 +++- drivers/gpu/drm/i915/selftests/huge_pages.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gem.c +3
-1@@ -2506,7 +2506,9 @@ static bool i915_sg_trim(struct sg_table *orig_st) new_sg = new_st.sgl;for_each_sg (orig_st->sgl, sg, orig_st->nents, i) {sg_set_page (new_sg,sg_page (sg), sg->length,0 ); -/* called before being DMA mapped, no need to copy sg->dma_* */ +sg_dma_address (new_sg) =sg_dma_address (sg); +sg_dma_len (new_sg) =sg_dma_len (sg); + new_sg =sg_next (new_sg); }GEM_BUG_ON (new_sg);/* Should walk exactly nents and hit the end */ drivers/gpu/drm/i915/selftests/huge_pages.c +2
-0@@ -235,6 +235,8 @@ static int fake_get_huge_pages(struct drm_i915_gem_object *obj) sg =sg_next (sg); }while (1 ); +i915_sg_trim (st); + obj->mm.madv =I915_MADV_DONTNEED ;__i915_gem_object_set_pages (obj, st, sg_page_sizes);Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 30 lines · Matthew Auld
Which means we can now also put it to work in
fake_get_huge_pages.Signed-off-by Matthew Auld <[email protected]>Cc Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 4 +++- drivers/gpu/drm/i915/selftests/huge_pages.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gem.c +3
-1@@ -2506,7 +2506,9 @@ static bool i915_sg_trim(struct sg_table *orig_st) new_sg = new_st.sgl;for_each_sg (orig_st->sgl, sg, orig_st->nents, i) {sg_set_page (new_sg,sg_page (sg), sg->length,0 ); -/* called before being DMA mapped, no need to copy sg->dma_* */ +sg_dma_address (new_sg) =sg_dma_address (sg); +sg_dma_len (new_sg) =sg_dma_len (sg); + new_sg =sg_next (new_sg); }GEM_BUG_ON (new_sg);/* Should walk exactly nents and hit the end */ drivers/gpu/drm/i915/selftests/huge_pages.c +0
-0
drivers/gpu/drm/i915/selftests/huge_pages.c static int fake_get_huge_pages(struct drm_i915_gem_object *obj) · line 242
Quoted 8 lines
drivers/gpu/drm/i915/selftests/huge_pages.c +2
-0@@ -235,6 +235,8 @@ static int fake_get_huge_pages(struct drm_i915_gem_object *obj) sg =sg_next (sg); }while (1 ); +i915_sg_trim (st); + obj->mm.madv =I915_MADV_DONTNEED ;__i915_gem_object_set_pages (obj, st, sg_page_sizes);
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: don't assume struct page in i915_sg_trim
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: don't assume struct page in i915_sg_trim
URL : https://patchwork.freedesktop.org/series/49969/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4851 -> Patchwork_10238 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/49969/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10238 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@gem_exec_suspend@basic-s3:
fi-bdw-samus: PASS -> INCOMPLETE (fdo#107773)
igt@kms_flip@basic-flip-vs-modeset:
fi-skl-6700hq: PASS -> DMESG-WARN (fdo#105998)
igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
fi-byt-clapper: PASS -> FAIL (fdo#107362)
igt@kms_psr@primary_page_flip:
fi-kbl-r: PASS -> FAIL (fdo#107336)
==== Possible fixes ====
igt@drv_module_reload@basic-reload:
fi-blb-e6850: INCOMPLETE (fdo#107718) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#107336 https://bugs.freedesktop.org/show_bug.cgi?id=107336
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
== Participating hosts (51 -> 45) ==
Additional (1): fi-hsw-4770r
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-ctg-p8600 fi-skl-caroline
== Build changes ==
* Linux: CI_DRM_4851 -> Patchwork_10238
CI_DRM_4851: f9b15cfe6b2059cec1465980d556d30be0fb7f75 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4647: ae8187922d8de2bc739519da3bd40cf5f03f5e4f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10238: 556a1f7ee1386c9144842f97d16b85035566c7b1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
556a1f7ee138 drm/i915: pass dev_priv to i915_gem_cleanup_stolen 5bf0202718f6 drm/i915: don't assume struct page in i915_sg_trim
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10238/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Ville Syrjälä (2018-09-20 15:38:28)
Quoted 6 lines · Matthew Auld
Quoted 1 line
Which means we can now also put it to work in
fake_get_huge_pages.Just another reminder to write self-contained commit msgs. Reading this wihtout copy pasting the subject line in makes one wonder what the "which" is here.
Tweaked the commitmsg so that it is self explanatory, will push shortly. Thanks for the patches,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx