[PATCH] drm/i915: Set ctx->ppgtt to aliasing PPGTT if full PPGTT mode isn't enabled

[PATCH] drm/i915: Set ctx->ppgtt to aliasing PPGTT if full PPGTT mode isn't enabled

[Zhi Wang]

In populate_lr_context(), if the ctx->ppgtt == NULL, then it will populate
the PDPs with aliasing PPGTT. This patch will directly set the ctx->ppgtt
to aliasing PPGTT if full PPGTT mode isn't enabled when creating a context.

Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_context.c | 3 ++-
 drivers/gpu/drm/i915/intel_lrc.c        | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index fe580cb..4012540 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -306,7 +306,8 @@ i915_gem_create_context(struct drm_device *dev,
 		}
 
 		ctx->ppgtt = ppgtt;
-	}
+	} else
+		ctx->ppgtt = to_i915(dev)->mm.aliasing_ppgtt;
 
 	trace_i915_context_create(ctx);
 
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 5d4ca3b..5765ebd 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -2363,15 +2363,11 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o
 		    struct intel_ringbuffer *ringbuf)
 {
 	struct drm_device *dev = engine->dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
 	struct page *page;
 	uint32_t *reg_state;
 	int ret;
 
-	if (!ppgtt)
-		ppgtt = dev_priv->mm.aliasing_ppgtt;
-
 	ret = i915_gem_object_set_to_cpu_domain(ctx_obj, true);
 	if (ret) {
 		DRM_DEBUG_DRIVER("Could not set to CPU domain\n");
-- 
1.9.1

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

✗ Fi.CI.BAT: failure for drm/i915: Set ctx->ppgtt to aliasing PPGTT if full PPGTT mode isn't enabled

[Patchwork]

== Series Details ==

Series: drm/i915: Set ctx->ppgtt to aliasing PPGTT if full PPGTT mode isn't enabled
URL   : https://patchwork.freedesktop.org/series/5261/
State : failure

== Summary ==

Series 5261v1 drm/i915: Set ctx->ppgtt to aliasing PPGTT if full PPGTT mode isn't enabled
http://patchwork.freedesktop.org/api/1.0/series/5261/revisions/1/mbox/

Test drv_hangman:
        Subgroup error-state-basic:
                fail       -> PASS       (ilk-hp8440p)
Test gem_exec_basic:
        Subgroup basic-bsd2:
                skip       -> INCOMPLETE (byt-nuc)
        Subgroup readonly-bsd1:
                skip       -> INCOMPLETE (ivb-t430s)
Test gem_mmap:
        Subgroup basic:
                pass       -> INCOMPLETE (snb-x220t)
Test gem_sync:
        Subgroup basic-each:
                pass       -> INCOMPLETE (hsw-brixbox)
Test kms_addfb_basic:
        Subgroup bad-pitch-128:
                pass       -> INCOMPLETE (hsw-gt2)
        Subgroup bo-too-small:
                pass       -> INCOMPLETE (snb-dellxps)
Test kms_flip:
        Subgroup basic-flip-vs-modeset:
                dmesg-warn -> PASS       (ilk-hp8440p) UNSTABLE
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> DMESG-WARN (bsw-nuc-2)

bdw-nuci7        total:196  pass:184  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:196  pass:175  dwarn:0   dfail:0   fail:0   skip:21 
bsw-nuc-2        total:196  pass:158  dwarn:1   dfail:0   fail:0   skip:37 
byt-nuc          total:1    pass:0    dwarn:0   dfail:0   fail:0   skip:0  
hsw-brixbox      total:1    pass:0    dwarn:0   dfail:0   fail:0   skip:0  
hsw-gt2          total:1    pass:0    dwarn:0   dfail:0   fail:0   skip:0  
ilk-hp8440p      total:196  pass:132  dwarn:0   dfail:0   fail:0   skip:64 
ivb-t430s        total:1    pass:0    dwarn:0   dfail:0   fail:0   skip:0  
skl-i7k-2        total:196  pass:173  dwarn:0   dfail:0   fail:0   skip:23 
snb-dellxps      total:1    pass:0    dwarn:0   dfail:0   fail:0   skip:0  
snb-x220t        total:1    pass:0    dwarn:0   dfail:0   fail:0   skip:0  

Results at /archive/results/CI_IGT_test/Patchwork_1785/

5633965ef152b136c22fe9858723be52116f8686 drm-intel-nightly: 2016y-04m-03d-14h-10m-49s UTC integration manifest
2e60aa1fd9012571003803bdb70f5864a589ca8a drm/i915: Set ctx->ppgtt to aliasing PPGTT if full PPGTT mode isn't enabled

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