Skip to contentSkip to conversation

drm/i915: Remove i915 ggtt WA since GT E

PATCH In review Dong Yang 4 participants 7 messages Aug 12, 2019 – Aug 14, 2019

Subsystems (2)
lore
Share & tools
lore

Dong Yang

author
#0 lore raw

PATCH 1/1 drm/i915: Remove i915 ggtt WA since GT E

From: "Yang, Dong" <[email protected]>

The APL already fixed this bug since GT E, bug exist from 0 to D, apply WA according GT stepping.

---
 drivers/gpu/drm/i915/i915_drv.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +3 -1
index 5f3e5c13fbaa..ee384c28174a 100644
@@ -2141,6 +2141,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define BXT_REVID_B0		0x3
 #define BXT_REVID_B_LAST	0x8
 #define BXT_REVID_C0		0x9
+#define BXT_REVID_D0		0xC
+#define BXT_REVID_E0		0xD
 
 #define IS_BXT_REVID(dev_priv, since, until) \
 	(IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))
@@ -2357,7 +2359,7 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
 static inline bool
 intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
 {
-	return IS_BROXTON(dev_priv) && intel_vtd_active();
+	return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
 }
 
 /* i915_drv.c */
Signature · 6 lines
2.22.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Remove i915 ggtt WA since GT E

== Series Details ==

== Series Details ==

Series: drm/i915: Remove i915 ggtt WA since GT E
URL : https://patchwork.freedesktop.org/series/65066/
State : failure

== Summary ==

CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool

  CHK     include/generated/compile.h
  CC      drivers/gpu/drm/i915/display/intel_gmbus.h.s
  CC      drivers/gpu/drm/i915/display/intel_display_types.h.s
In file included from ./drivers/gpu/drm/i915/display/intel_display_types.h:46:0,
                 from <command-line>:0:
./drivers/gpu/drm/i915/i915_drv.h: In function ‘intel_ggtt_update_needs_vtd_wa’:
./drivers/gpu/drm/i915/i915_drv.h:2259:9: error: expected expression before ‘return’
  return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
         ^~~~~~

scripts/Makefile.build:301: recipe for target 'drivers/gpu/drm/i915/display/intel_display_types.h.s' failed make[5]: *** [drivers/gpu/drm/i915/display/intel_display_types.h.s] Error 1 scripts/Makefile.build:490: recipe for target 'drivers/gpu/drm/i915/display' failed make[4]: *** [drivers/gpu/drm/i915/display] Error 2
scripts/Makefile.build:490: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:490: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:490: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1080: recipe for target 'drivers' failed
make: *** [drivers] Error 2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Dong Yang
Thank you for the patch! Yet something to improve:

Hi Dong,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm-intel/for-linux-next]
[cannot apply to v5.3-rc4 next-20190809]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Dong-Yang/drm-i915-Remove-i915-ggtt-WA-since-GT-E/20190812-111840
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-defconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-10) 7.4.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

If you fix the issue, kindly add following tag

All error/warnings (new ones prefixed by >>):

In file included from drivers/gpu/drm/i915/display/intel_display_types.h:46:0,

                    from drivers/gpu/drm/i915/i915_drv.c:54:
   drivers/gpu/drm/i915/i915_drv.h: In function 'intel_ggtt_update_needs_vtd_wa':
>> drivers/gpu/drm/i915/i915_drv.h:2259:9: error: expected expression before 'return'
     return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
            ^~~~~~
--
   In file included from drivers/gpu/drm/i915/i915_gem_gtt.c:41:0:
   drivers/gpu/drm/i915/i915_drv.h: In function 'intel_ggtt_update_needs_vtd_wa':
>> drivers/gpu/drm/i915/i915_drv.h:2259:9: error: expected expression before 'return'
     return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
            ^~~~~~
>> drivers/gpu/drm/i915/i915_drv.h:2260:1: warning: control reaches end of non-void function [-Wreturn-type]
    }
    ^

vim +/return +2259 drivers/gpu/drm/i915/i915_drv.h

2255
2256 static inline bool
2257 intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
2258 {

> 2259		return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
> 2260	}

2261

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Dong Yang
Thank you for the patch! Yet something to improve:

Hi Dong,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm-intel/for-linux-next]
[cannot apply to v5.3-rc4 next-20190809]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Dong-Yang/drm-i915-Remove-i915-ggtt-WA-since-GT-E/20190812-111840
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-e003-201932 (attached as .config)
compiler: gcc-7 (Debian 7.4.0-10) 7.4.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

In file included from drivers/gpu/drm/i915/selftests/i915_selftest.c:26:0:
drivers/gpu/drm/i915/selftests/../i915_drv.h: In function 'intel_ggtt_update_needs_vtd_wa':

>> drivers/gpu/drm/i915/selftests/../i915_drv.h:2259:9: error: expected expression before 'return'
     return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
            ^~~~~~

vim +/return +2259 drivers/gpu/drm/i915/selftests/../i915_drv.h

2255
2256 static inline bool
2257 intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
2258 {

> 2259		return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();

2260 }
2261

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#4 lore raw
In reply to Dong Yang

Quoting Dong Yang (2019-08-12 05:36:16)

Quoted 4 lines

From: "Yang, Dong" <[email protected]>

The APL already fixed this bug since GT E, bug exist from 0 to D, apply WA according GT stepping.

"Broxton steppings starting from E0 have fixed the bug."

Quoted 1 line

You probably want to use "" here too. Or just swap order.

drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 2144

Quoted 13 lines
---
 drivers/gpu/drm/i915/i915_drv.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 5f3e5c13fbaa..ee384c28174a 100644
@@ -2141,6 +2141,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define BXT_REVID_B0           0x3
 #define BXT_REVID_B_LAST       0x8
 #define BXT_REVID_C0           0x9
+#define BXT_REVID_D0           0xC

#define BXT_REVID_D_LAST 0xC

drivers/gpu/drm/i915/i915_drv.h static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) · line 2362

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +2 -1
+#define BXT_REVID_E0           0xD
 
 #define IS_BXT_REVID(dev_priv, since, until) \
        (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until))
@@ -2357,7 +2359,7 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
 static inline bool
 intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
 {
-       return IS_BROXTON(dev_priv) && intel_vtd_active();
+       return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && intel_vtd_active();
	return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D_LAST) &&
	       intel_vtd_active();

Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#5 lore raw

comments updated, please review again.

-----Original Message-----
From: Joonas Lahtinen [mailto:[email protected]]
Sent: Tuesday, August 13, 2019 8:47 PM
To: Yang, Dong <[email protected]>; [email protected]
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Remove i915 ggtt WA since GT E

Quoting Dong Yang (2019-08-12 05:36:16)

Quoted 4 lines

From: "Yang, Dong" <[email protected]>

The APL already fixed this bug since GT E, bug exist from 0 to D, apply WA according GT stepping.

"Broxton steppings starting from E0 have fixed the bug."

Quoted 1 line

You probably want to use "" here too. Or just swap order.

Quoted 10 lines
---
 drivers/gpu/drm/i915/i915_drv.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.h index 5f3e5c13fbaa..ee384c28174a 100644

drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 2144

Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2141,6 +2141,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define BXT_REVID_B0           0x3
 #define BXT_REVID_B_LAST       0x8
 #define BXT_REVID_C0           0x9
+#define BXT_REVID_D0           0xC

#define BXT_REVID_D_LAST 0xC

drivers/gpu/drm/i915/i915_drv.h

Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +1 -1
+#define BXT_REVID_E0           0xD
 
 #define IS_BXT_REVID(dev_priv, since, until) \
        (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until)) @@ 
-2357,7 +2359,7 @@ static inline bool 

intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) static inline bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv) {

drivers/gpu/drm/i915/i915_drv.h +2 -1
-       return IS_BROXTON(dev_priv) && intel_vtd_active();
+       return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && 
+ intel_vtd_active();
	return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D_LAST) &&
	       intel_vtd_active();

Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#6 lore raw

Quoting Yang, Dong (2019-08-14 03:43:44)

Quoted 1 line

comments updated, please review again.

You seem to have missed the comments to the code itself.

Regards, Joonas

Quoted 49 lines

-----Original Message-----
From: Joonas Lahtinen [mailto:[email protected]]
Sent: Tuesday, August 13, 2019 8:47 PM
To: Yang, Dong <[email protected]>; [email protected]
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Remove i915 ggtt WA since GT E

Quoting Dong Yang (2019-08-12 05:36:16)

Quoted 4 lines

From: "Yang, Dong" <[email protected]>

The APL already fixed this bug since GT E, bug exist from 0 to D, apply WA according GT stepping.

"Broxton steppings starting from E0 have fixed the bug."

Quoted 1 line

You probably want to use "" here too. Or just swap order.

Quoted 10 lines
---
 drivers/gpu/drm/i915/i915_drv.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_drv.h index 5f3e5c13fbaa..ee384c28174a 100644

drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 2144

Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2141,6 +2141,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define BXT_REVID_B0           0x3
 #define BXT_REVID_B_LAST       0x8
 #define BXT_REVID_C0           0x9
+#define BXT_REVID_D0           0xC

#define BXT_REVID_D_LAST 0xC

drivers/gpu/drm/i915/i915_drv.h

Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +1 -1
+#define BXT_REVID_E0           0xD
 
 #define IS_BXT_REVID(dev_priv, since, until) \
        (IS_BROXTON(dev_priv) && IS_REVID(dev_priv, since, until)) @@ 
-2357,7 +2359,7 @@ static inline bool 

intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) static inline bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv) {

drivers/gpu/drm/i915/i915_drv.h +2 -1
-       return IS_BROXTON(dev_priv) && intel_vtd_active();
+       return return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D0) && 
+ intel_vtd_active();
Quoted 4 lines
        return IS_BXT_REVID(dev_priv, 0, BXT_REVID_D_LAST) &&
               intel_vtd_active();

Regards, Joonas

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx