All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim
@ 2018-09-20 14:27 Matthew Auld
  2018-09-20 14:27 ` [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen Matthew Auld
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Matthew Auld @ 2018-09-20 14:27 UTC (permalink / raw)
  To: intel-gfx

Which means we can now also put it to work in fake_get_huge_pages.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c             | 4 +++-
 drivers/gpu/drm/i915/selftests/huge_pages.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a94d5a308c4d..b79362bbd97b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -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 */
diff --git a/drivers/gpu/drm/i915/selftests/huge_pages.c b/drivers/gpu/drm/i915/selftests/huge_pages.c
index e272127783fe..8d03f64eabd7 100644
--- a/drivers/gpu/drm/i915/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/selftests/huge_pages.c
@@ -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);
-- 
2.17.1

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen
  2018-09-20 14:27 [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Matthew Auld
@ 2018-09-20 14:27 ` Matthew Auld
  2018-09-20 14:34   ` Chris Wilson
  2018-09-20 14:33 ` [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Chris Wilson
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 8+ messages in thread
From: Matthew Auld @ 2018-09-20 14:27 UTC (permalink / raw)
  To: intel-gfx

It really wants dev_priv anyway, also now matches i915_gem_init_stolen.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 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(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7d4daa7412f1..41f1082da122 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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);
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 4877d4d582c2..56c7f8637311 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -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)
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 53440bf87650..f29a7ff7c362 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -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;
 
-- 
2.17.1

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim
  2018-09-20 14:27 [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Matthew Auld
  2018-09-20 14:27 ` [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen Matthew Auld
@ 2018-09-20 14:33 ` Chris Wilson
  2018-09-20 14:38 ` Ville Syrjälä
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2018-09-20 14:33 UTC (permalink / raw)
  To: Matthew Auld, intel-gfx

Quoting Matthew Auld (2018-09-20 15:27:06)
> Which means we can now also put it to work in fake_get_huge_pages.
> 
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Can we take this into account for selftests/scatterlist.c?

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen
  2018-09-20 14:27 ` [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen Matthew Auld
@ 2018-09-20 14:34   ` Chris Wilson
  0 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2018-09-20 14:34 UTC (permalink / raw)
  To: Matthew Auld, intel-gfx

Quoting Matthew Auld (2018-09-20 15:27:07)
> It really wants dev_priv anyway, also now matches i915_gem_init_stolen.
> 
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

As a bonus, start feeding in s/dev_priv/i915/?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim
  2018-09-20 14:27 [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Matthew Auld
  2018-09-20 14:27 ` [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen Matthew Auld
  2018-09-20 14:33 ` [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Chris Wilson
@ 2018-09-20 14:38 ` Ville Syrjälä
  2018-09-20 15:42   ` Chris Wilson
  2018-09-20 14:49 ` Tvrtko Ursulin
  2018-09-20 14:57 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
  4 siblings, 1 reply; 8+ messages in thread
From: Ville Syrjälä @ 2018-09-20 14:38 UTC (permalink / raw)
  To: Matthew Auld; +Cc: intel-gfx

On Thu, Sep 20, 2018 at 03:27:06PM +0100, Matthew Auld wrote:
> 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.

> 
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem.c             | 4 +++-
>  drivers/gpu/drm/i915/selftests/huge_pages.c | 2 ++
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index a94d5a308c4d..b79362bbd97b 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -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 */
> diff --git a/drivers/gpu/drm/i915/selftests/huge_pages.c b/drivers/gpu/drm/i915/selftests/huge_pages.c
> index e272127783fe..8d03f64eabd7 100644
> --- a/drivers/gpu/drm/i915/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/selftests/huge_pages.c
> @@ -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);
> -- 
> 2.17.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim
  2018-09-20 14:27 [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Matthew Auld
                   ` (2 preceding siblings ...)
  2018-09-20 14:38 ` Ville Syrjälä
@ 2018-09-20 14:49 ` Tvrtko Ursulin
  2018-09-20 14:57 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
  4 siblings, 0 replies; 8+ messages in thread
From: Tvrtko Ursulin @ 2018-09-20 14:49 UTC (permalink / raw)
  To: Matthew Auld, intel-gfx


On 20/09/2018 15:27, Matthew Auld wrote:
> Which means we can now also put it to work in fake_get_huge_pages.
> 
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem.c             | 4 +++-
>   drivers/gpu/drm/i915/selftests/huge_pages.c | 2 ++
>   2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index a94d5a308c4d..b79362bbd97b 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -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 */
> diff --git a/drivers/gpu/drm/i915/selftests/huge_pages.c b/drivers/gpu/drm/i915/selftests/huge_pages.c
> index e272127783fe..8d03f64eabd7 100644
> --- a/drivers/gpu/drm/i915/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/selftests/huge_pages.c
> @@ -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);
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: don't assume struct page in i915_sg_trim
  2018-09-20 14:27 [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Matthew Auld
                   ` (3 preceding siblings ...)
  2018-09-20 14:49 ` Tvrtko Ursulin
@ 2018-09-20 14:57 ` Patchwork
  4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-09-20 14:57 UTC (permalink / raw)
  To: Matthew Auld; +Cc: intel-gfx

== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim
  2018-09-20 14:38 ` Ville Syrjälä
@ 2018-09-20 15:42   ` Chris Wilson
  0 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2018-09-20 15:42 UTC (permalink / raw)
  To: Matthew Auld, Ville Syrjälä; +Cc: intel-gfx

Quoting Ville Syrjälä (2018-09-20 15:38:28)
> On Thu, Sep 20, 2018 at 03:27:06PM +0100, Matthew Auld wrote:
> > 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-09-20 15:42 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-20 14:27 [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Matthew Auld
2018-09-20 14:27 ` [PATCH 2/2] drm/i915: pass dev_priv to i915_gem_cleanup_stolen Matthew Auld
2018-09-20 14:34   ` Chris Wilson
2018-09-20 14:33 ` [PATCH 1/2] drm/i915: don't assume struct page in i915_sg_trim Chris Wilson
2018-09-20 14:38 ` Ville Syrjälä
2018-09-20 15:42   ` Chris Wilson
2018-09-20 14:49 ` Tvrtko Ursulin
2018-09-20 14:57 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.