igt: add basic Broxton support
cover igt: add basic Broxton support
Damien Lespiau (2):
lib/bxt: Add Broxton PCI ids
list-workarounds/bxt: Add Broxton to the list of valid platorms
Imre Deak (6):
tools/intel_bios_reader: fix SSC freq for VLV/CHV lib/intel_chipset: fix HAS_PCH_SPLIT on CHV lib/intel_chipset: fix HAS_PCH_SPLIT on GEN9 tools/intel_bios_read: fix SSC freq for BXT tools/intel_reg_dumper: fix DSPCNTR decode for BXT tools/intel_reg_dumper: fix PIPECONF decode
lib/intel_chipset.h | 16 +++++++-- scripts/list-workarounds | 2 +- tools/intel_bios_reader.c | 5 ++- tools/intel_reg_dumper.c | 84 ++++++++++++++++++++++++++++------------------- 4 files changed, 68 insertions(+), 39 deletions(-)
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/8 tools/intel_bios_reader: fix SSC freq for VLV/CHV
VLV/CHV has a fixed 100MHz SSC reference frequency.
--- tools/intel_bios_reader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/intel_bios_reader.c +3 -1
@@ -153,7 +153,9 @@ static void dump_general_features(const struct bdb_block *block)printf ("\tExternal VBT: %s\n" ,YESNO (features->download_ext_vbt));printf ("\tEnable SSC: %s\n" ,YESNO (features->enable_ssc));if (features->enable_ssc) { -if (HAS_PCH_SPLIT (devid)) +if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid)) +printf ("\tSSC frequency: 100 MHz\n" ); +else if (HAS_PCH_SPLIT (devid))printf ("\tSSC frequency: %s\n" , features->ssc_freq ?"100 MHz" :"120 MHz" );else
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 lib/intel_chipset: fix HAS_PCH_SPLIT on CHV
In reply to Imre DeakCherryView is GEN8 but doesn't have PCH so fix the macro accordingly.
--- lib/intel_chipset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/intel_chipset.h +1 -1
@@ -419,7 +419,7 @@ void intel_check_pch(void);#define HAS_PCH_SPLIT (devid) (IS_GEN5(devid) || \ IS_GEN6(devid) || \ IS_IVYBRIDGE(devid) || IS_HASWELL(devid) || \ - IS_GEN8(devid) || \ + IS_BROADWELL(devid) || \ IS_GEN9(devid))#define HAS_BLT_RING (devid) (IS_GEN6(devid) || \
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/8 lib/intel_chipset: fix HAS_PCH_SPLIT on GEN9
In reply to Imre DeakIn the next patch we'll add support for BXT which is GEN9, but doesn't have PCH, so fix the macro accordingly.
No functional change.
--- lib/intel_chipset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/intel_chipset.h +1 -1
@@ -420,7 +420,7 @@ void intel_check_pch(void); IS_GEN6(devid) || \ IS_IVYBRIDGE(devid) || IS_HASWELL(devid) || \ IS_BROADWELL(devid) || \ - IS_GEN9(devid)) + IS_SKYLAKE(devid))#define HAS_BLT_RING (devid) (IS_GEN6(devid) || \ IS_GEN7(devid) || \
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/8 lib/bxt: Add Broxton PCI ids
In reply to Imre DeakFrom: Damien Lespiau <[email protected]>
v2: Rebase on top of the SKL upstreaming
--- lib/intel_chipset.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
lib/intel_chipset.h +11 -1
@@ -206,6 +206,11 @@ void intel_check_pch(void);#define PCI_CHIP_SKYLAKE_SRV_GT1 0x190A#define PCI_CHIP_SKYLAKE_WKS_GT2 0x191D +#define PCI_CHIP_BROXTON_0 0x0A84 +#define PCI_CHIP_BROXTON_1 0x0A85 +#define PCI_CHIP_BROXTON_2 0x0A86 +#define PCI_CHIP_BROXTON_3 0x0A87 +#endif /* __GTK_DOC_IGNORE__ */ #define IS_MOBILE (devid) ((devid) == PCI_CHIP_I855_GM || \
@@ -390,7 +395,12 @@ void intel_check_pch(void); IS_SKL_GT2(devid) || \ IS_SKL_GT3(devid)) -#define IS_GEN9 (devid) IS_SKYLAKE(devid) +#define IS_BROXTON (devid) ((devid) == PCI_CHIP_BROXTON_0 || \ + (devid) == PCI_CHIP_BROXTON_1 || \ + (devid) == PCI_CHIP_BROXTON_2 || \ + (devid) == PCI_CHIP_BROXTON_3) + +#define IS_GEN9 (devid) (IS_SKYLAKE(devid) || IS_BROXTON(devid))#define IS_965 (devid) (IS_GEN4(devid) || \ IS_GEN5(devid) || \
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/8 list-workarounds/bxt: Add Broxton to the list of valid platorms
In reply to Imre DeakFrom: Damien Lespiau <[email protected]>
--- scripts/list-workarounds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/list-workarounds +1 -1
@@ -18,7 +18,7 @@ def find_nth(haystack, needle, n): return start valid_platforms = ('ctg', 'elk', 'ilk', 'snb', 'ivb', 'vlv', 'hsw', 'bdw', - 'chv', 'skl') + 'chv', 'skl', 'bxt') def parse_platforms(p): l = p.split(',') for p in l:
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/8 tools/intel_bios_read: fix SSC freq for BXT
In reply to Imre DeakOn BXT the SSC reference frequency is fixed 100MHz.
--- tools/intel_bios_reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/intel_bios_reader.c +2 -1
@@ -153,7 +153,8 @@ static void dump_general_features(const struct bdb_block *block)printf ("\tExternal VBT: %s\n" ,YESNO (features->download_ext_vbt));printf ("\tEnable SSC: %s\n" ,YESNO (features->enable_ssc));if (features->enable_ssc) { -if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid)) +if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid) || +IS_BROXTON (devid))printf ("\tSSC frequency: 100 MHz\n" );else if (HAS_PCH_SPLIT (devid)) printf("\tSSC frequency: %s\n", features->ssc_freq ?
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/8 tools/intel_reg_dumper: fix DSPCNTR decode for BXT
In reply to Imre Deak--- tools/intel_reg_dumper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/intel_reg_dumper.c +1 -1
@@ -138,7 +138,7 @@ DEBUGSTRING(i830_debug_dspcntr) {const char *enabled = val &DISPLAY_PLANE_ENABLE ?"enabled" :"disabled" ;char plane = val &DISPPLANE_SEL_PIPE_B ?'B' :'A' ; -if (HAS_PCH_SPLIT (devid)) +if (HAS_PCH_SPLIT (devid) ||IS_BROXTON (devid))snprintf (result, len,"%s" , enabled);else snprintf (result, len,"%s, pipe %c" , enabled, plane);
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/8 tools/intel_reg_dumper: fix PIPECONF decode
In reply to Imre DeakDecode the register for BXT too and don't decode rotation and bpc on platforms where these fields are not defined.
--- tools/intel_reg_dumper.c | 82 +++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 33 deletions(-)
tools/intel_reg_dumper.c +49 -33
@@ -155,10 +155,17 @@ DEBUGSTRING(i830_debug_pipeconf) bit30 = val &PIPEACONF_DOUBLE_WIDE ?"double-wide" :"single-wide" ; -if (HAS_PCH_SPLIT (devid)) { +if (HAS_PCH_SPLIT (devid) ||IS_BROXTON (devid)) {const char *bpc, *rotation; +int interlace_mode; -switch ((val >>21 ) &7 ) { +if ((IS_IVYBRIDGE (devid) ||IS_HASWELL (devid) || +IS_BROADWELL (devid) ||IS_GEN9 (devid))) + interlace_mode = (val >>21 ) &3 ; +else + interlace_mode = (val >>21 ) &7 ; + +switch (interlace_mode) {case 0 : interlace ="pf-pd" ;break ;
@@ -179,40 +186,49 @@ DEBUGSTRING(i830_debug_pipeconf)break ; } -switch ((val >>14 ) &3 ) { -case 0 : - rotation ="rotate 0" ; -break ; -case 1 : - rotation ="rotate 90" ; -break ; -case 2 : - rotation ="rotate 180" ; -break ; -case 3 : - rotation ="rotate 270" ; -break ; + rotation ="" ; +if (IS_HASWELL (devid) ||IS_IVYBRIDGE (devid) || +IS_GEN6 (devid) ||IS_GEN5 (devid)) { +switch ((val >>14 ) &3 ) { +case 0 : + rotation ="rotate 0" ; +break ; +case 1 : + rotation ="rotate 90" ; +break ; +case 2 : + rotation ="rotate 180" ; +break ; +case 3 : + rotation ="rotate 270" ; +break ; + } } -switch (val & (7 <<5 )) { -case PIPECONF_8BPP : - bpc ="8bpc" ; -break ; -case PIPECONF_10BPP : - bpc ="10bpc" ; -break ; -case PIPECONF_6BPP : - bpc ="6bpc" ; -break ; -case PIPECONF_12BPP : - bpc ="12bpc" ; -break ; -default : - bpc ="invalid bpc" ; -break ; + bpc ="" ; +if (IS_IVYBRIDGE (devid) ||IS_GEN6 (devid) ||IS_GEN5 (devid)) { +switch (val & (7 <<5 )) { +case PIPECONF_8BPP : + bpc ="8bpc" ; +break ; +case PIPECONF_10BPP : + bpc ="10bpc" ; +break ; +case PIPECONF_6BPP : + bpc ="6bpc" ; +break ; +case PIPECONF_12BPP : + bpc ="12bpc" ; +break ; +default : + bpc ="invalid bpc" ; +break ; + } } -snprintf (result, len,"%s, %s, %s, %s, %s" , enabled, bit30, - interlace, rotation, bpc); +snprintf (result, len,"%s, %s, %s, %s%s%s" , enabled, bit30, + interlace, + rotation, rotation[0 ] ?", " :"" , + bpc); }else if (IS_GEN4 (devid)) {switch ((val >>21 ) &7 ) {case 0 :
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx