diff mbox

[2/2] drm/i915/skl: Also detect eDRAM on SKL

Message ID 1422973515-8697-2-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Feb. 3, 2015, 2:25 p.m. UTC
Suggested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Shuang He Feb. 4, 2015, 12:33 p.m. UTC | #1
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5707
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV              +1                 282/283              283/283
ILK                 -3              316/319              313/319
SNB                                  322/346              322/346
IVB                 -2              382/384              380/384
BYT                                  296/296              296/296
HSW                                  425/428              425/428
BDW                                  318/333              318/333
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
 PNV  igt_gen3_render_linear_blits      CRASH(1, M23)PASS(1, M25)      PASS(1, M25)
 ILK  igt_drv_suspend_fence-restore-tiled2untiled      DMESG_WARN(1, M37)PASS(1, M26)      DMESG_WARN(1, M37)
 ILK  igt_drv_suspend_fence-restore-untiled      DMESG_WARN(1, M37)PASS(1, M26)      DMESG_WARN(1, M37)
*ILK  igt_kms_flip_vblank-vs-hang      PASS(2, M26M37)      TIMEOUT(1, M37)
 IVB  igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance      DMESG_WARN(1, M34)PASS(1, M21)      DMESG_WARN(1, M34)
*IVB  igt_gem_storedw_batches_loop_secure-dispatch      PASS(2, M21M34)      DMESG_WARN(1, M34)
Note: You need to pay more attention to line start with '*'
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 00c91be..d67346c 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -327,7 +327,8 @@  static void intel_uncore_ellc_detect(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) &&
+	if ((IS_HASWELL(dev) || IS_BROADWELL(dev) ||
+	     INTEL_INFO(dev)->gen >= 9) &&
 	    (__raw_i915_read32(dev_priv, HSW_EDRAM_PRESENT) & EDRAM_ENABLED)) {
 		/* The docs do not explain exactly how the calculation can be
 		 * made. It is somewhat guessable, but for now, it's always