[PATCH] drm/i915: Determine uses-full-ppgtt from context for execbuf

[PATCH] drm/i915: Determine uses-full-ppgtt from context for execbuf

[Chris Wilson]

Rather than inspect the global module parameter for whether full-ppgtt
maybe enabled, we can inspect the context directly as to whether it has
its own vm.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Bob Paauwe <bob.j.paauwe@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index a926d7d47183..020a2394fc85 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -735,7 +735,12 @@ static int eb_select_context(struct i915_execbuffer *eb)
 		return -ENOENT;
 
 	eb->ctx = ctx;
-	eb->vm = ctx->ppgtt ? &ctx->ppgtt->vm : &eb->i915->ggtt.vm;
+	if (ctx->ppgtt) {
+		eb->vm = &ctx->ppgtt->vm;
+		eb->invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
+	} else {
+		eb->vm = &eb->i915->ggtt.vm;
+	}
 
 	eb->context_flags = 0;
 	if (ctx->flags & CONTEXT_NO_ZEROMAP)
@@ -2201,8 +2206,6 @@ i915_gem_do_execbuffer(struct drm_device *dev,
 	eb.flags = (unsigned int *)(eb.vma + args->buffer_count + 1);
 
 	eb.invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
-	if (USES_FULL_PPGTT(eb.i915))
-		eb.invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
 	reloc_cache_init(&eb.reloc_cache, eb.i915);
 
 	eb.buffer_count = args->buffer_count;
-- 
2.19.0.rc1

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

✓ Fi.CI.BAT: success for drm/i915: Determine uses-full-ppgtt from context for execbuf

[Patchwork]

== Series Details ==

Series: drm/i915: Determine uses-full-ppgtt from context for execbuf
URL   : https://patchwork.freedesktop.org/series/49041/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4751 -> Patchwork_10064 =

== Summary - SUCCESS ==

  No regressions found.

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

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_pipe_crc_basic@hang-read-crc-pipe-b:
      fi-skl-guc:         PASS -> FAIL (fdo#103191)

    
    ==== Possible fixes ====

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-peppy:       DMESG-WARN (fdo#102614) -> PASS

    igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
      {fi-byt-clapper}:   FAIL (fdo#107362, fdo#103191) -> PASS +1

    igt@prime_vgem@basic-fence-flip:
      fi-skl-6770hq:      FAIL (fdo#104008) -> PASS

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

  fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
  fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362


== Participating hosts (50 -> 45) ==

  Missing    (5): fi-hsw-4770r fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u 


== Build changes ==

    * Linux: CI_DRM_4751 -> Patchwork_10064

  CI_DRM_4751: 2679376a6fe30a27b8734442d9b1af6a411f7bc7 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4618: 9d83154c898b5acc8b462d17104df50cfd71e9a0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10064: 72395506ca9327327d40d4cf6ad5b5f18d6c8f74 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

72395506ca93 drm/i915: Determine uses-full-ppgtt from context for execbuf

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10064/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for drm/i915: Determine uses-full-ppgtt from context for execbuf

[Patchwork]

== Series Details ==

Series: drm/i915: Determine uses-full-ppgtt from context for execbuf
URL   : https://patchwork.freedesktop.org/series/49041/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4751_full -> Patchwork_10064_full =

== Summary - SUCCESS ==

  No regressions found.

  

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_suspend@shrink:
      shard-glk:          PASS -> FAIL (fdo#106886)

    
    ==== Possible fixes ====

    igt@gem_exec_await@wide-contexts:
      shard-kbl:          FAIL (fdo#105900) -> PASS

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS

    
  fdo#105900 https://bugs.freedesktop.org/show_bug.cgi?id=105900
  fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912


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

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4751 -> Patchwork_10064

  CI_DRM_4751: 2679376a6fe30a27b8734442d9b1af6a411f7bc7 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4618: 9d83154c898b5acc8b462d17104df50cfd71e9a0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10064: 72395506ca9327327d40d4cf6ad5b5f18d6c8f74 @ 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_10064/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Determine uses-full-ppgtt from context for execbuf

[Rodrigo Vivi]

On Sat, Sep 01, 2018 at 10:24:51AM +0100, Chris Wilson wrote:
> Rather than inspect the global module parameter for whether full-ppgtt
> maybe enabled, we can inspect the context directly as to whether it has
> its own vm.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Bob Paauwe <bob.j.paauwe@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>

it is good that we don't need to depend on parameter for this.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index a926d7d47183..020a2394fc85 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -735,7 +735,12 @@ static int eb_select_context(struct i915_execbuffer *eb)
>  		return -ENOENT;
>  
>  	eb->ctx = ctx;
> -	eb->vm = ctx->ppgtt ? &ctx->ppgtt->vm : &eb->i915->ggtt.vm;
> +	if (ctx->ppgtt) {
> +		eb->vm = &ctx->ppgtt->vm;
> +		eb->invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
> +	} else {
> +		eb->vm = &eb->i915->ggtt.vm;
> +	}
>  
>  	eb->context_flags = 0;
>  	if (ctx->flags & CONTEXT_NO_ZEROMAP)
> @@ -2201,8 +2206,6 @@ i915_gem_do_execbuffer(struct drm_device *dev,
>  	eb.flags = (unsigned int *)(eb.vma + args->buffer_count + 1);
>  
>  	eb.invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
> -	if (USES_FULL_PPGTT(eb.i915))
> -		eb.invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
>  	reloc_cache_init(&eb.reloc_cache, eb.i915);
>  
>  	eb.buffer_count = args->buffer_count;
> -- 
> 2.19.0.rc1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Determine uses-full-ppgtt from context for execbuf

[Chris Wilson]

Quoting Rodrigo Vivi (2018-09-03 06:20:22)
> On Sat, Sep 01, 2018 at 10:24:51AM +0100, Chris Wilson wrote:
> > Rather than inspect the global module parameter for whether full-ppgtt
> > maybe enabled, we can inspect the context directly as to whether it has
> > its own vm.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Bob Paauwe <bob.j.paauwe@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> it is good that we don't need to depend on parameter for this.
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Ta, pushed. Along the create path it's a little trickier, but we would
rather push the decision down as to what type of ppgtt to create (if
any) to the responsible subsystem. There ought to be a simple way!
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx