Introduce Kabylake Support
Subsystems (2)
Rodrigo Vivi
maintainercover Introduce Kabylake Support
Kabylake is a Intel® Processor containing Intel® HD Graphics following Skylake.
It is Gen9p5, so it inherits everything from Skylake. So let's define Kabylake as Skylake and reuse the great job Damien and others did for Skylake.
The caveat is that Kabylake A0 was derivated from Skylake D0, so we needed some adjusts on revid handling in order to avoid old and not anymore needed workarounds.
Thanks,
Rodrigo.
Deepak S (1):
drm/i915/kbl: Add Kabylake PCI ID
Rodrigo Vivi (4):
drm/i915/kbl: Use propper ddi buffer translation table for Kabylake
ULT and ULX.
drm/i915/kbl: Kabylake A0 is based on Skylake H0. drm/i915/kbl: Fix DMC load on Kabylake.
drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake.
drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 21 ++++++++++++++++++--- drivers/gpu/drm/i915/intel_csr.c | 16 ++++++++++------ drivers/gpu/drm/i915/intel_ddi.c | 10 +++++----- include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 15 deletions(-)
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/5 drm/i915/kbl: Add Kabylake PCI ID
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Add is_kabylake to the KBL gt3 structuer (Damien)
Sort the platforms in older -> newer order (Damien)
--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +32 -1
@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; + +static const struct intel_device_info intel_kabylake_gt3_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem
@@ -434,7 +462,10 @@ static const struct intel_device_info intel_broxton_info = {INTEL_SKL_GT1_IDS (&intel_skylake_info), \INTEL_SKL_GT2_IDS (&intel_skylake_info), \INTEL_SKL_GT3_IDS (&intel_skylake_gt3_info), \ - INTEL_BXT_IDS(&intel_broxton_info) +INTEL_BXT_IDS (&intel_broxton_info), \ +INTEL_KBL_GT1_IDS (&intel_kabylake_info), \ +INTEL_KBL_GT2_IDS (&intel_kabylake_info), \ + INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info)static const struct pci_device_id pciidlist[] = {/* aka */ INTEL_PCI_IDS ,
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -765,6 +765,7 @@ struct intel_csr { func(is_valleyview) sep \ func(is_haswell) sep \ func(is_skylake) sep \ + func(is_kabylake) sep \ func(is_preliminary) sep \ func(has_fbc) sep \ func(has_pipe_cxsr) sep \
@@ -2464,6 +2465,7 @@ struct drm_i915_cmd_table {#define IS_BROADWELL (dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev))#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (!INTEL_INFO(dev)->is_skylake && IS_GEN9(dev)) +#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake)#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile)#define IS_HSW_EARLY_SDV (dev) (IS_HASWELL(dev) && \ (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)
include/drm/i915_pciids.h +29 -0
@@ -291,4 +291,33 @@INTEL_VGA_DEVICE (0x1A84 , info), \ INTEL_VGA_DEVICE(0x5A84, info) +#define INTEL_KBL_GT1_IDS (info) \ + INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ +INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ +INTEL_VGA_DEVICE (0x5902 , info),/* DT GT1 */ \ +INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ + INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ + +#define INTEL_KBL_GT2_IDS(info) \ +INTEL_VGA_DEVICE (0x5916 , info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \ +INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ +INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \ +INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ +INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ + +#define INTEL_KBL_GT3_IDS(info) \ +INTEL_VGA_DEVICE (0x5926 , info),/* ULT GT3 */ \ +INTEL_VGA_DEVICE (0x592B , info),/* Halo GT3 */ \ + INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ + +#define INTEL_KBL_IDS(info) \ +INTEL_KBL_GT1_IDS (info), \ +INTEL_KBL_GT2_IDS (info), \ +INTEL_KBL_GT3_IDS (info) + #endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 1/5] drm/i915/kbl: Add Kabylake PCI ID
Quoted 21 lines · Rodrigo Vivi
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Addis_kabylaketo the KBL gt3 structuer (Damien)Sort the platforms in older -> newer order (Damien)Reviewed-by Damien Lespiau <[email protected]>Signed-off-by Deepak S <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +0
-0
drivers/gpu/drm/i915/i915_drv.c static const struct intel_device_info intel_broxton_info = { · line 399
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 ,
Now's the time to call the shots, is this really a good idea or not? See VLV vs. CHV, we (okay, the royal we) still confuse ourselves with IS_VALLEYVIEW.
Granted, 74 call sites for IS_SKYLAKE(), all of those would need to be patched. We'd need something like "is skylake family" including SKL and KBL. Some of them might be changed to be more like feature flags, which is something we've decided we need to do more anyway.
BR,
Jani.
Quoted 105 lines
drivers/gpu/drm/i915/i915_drv.c +29
-1+ .is_kabylake = 1, + .gen = 9, .num_pipes = 3, + .need_gfx_hws = 1, .has_hotplug = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, + .has_llc = 1, + .has_ddi = 1, + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , + IVB_CURSOR_OFFSETS, +}; + +static const struct intel_device_info intel_kabylake_gt3_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem @@ -434,7 +462,10 @@ static const struct intel_device_info intel_broxton_info = {INTEL_SKL_GT1_IDS (&intel_skylake_info), \INTEL_SKL_GT2_IDS (&intel_skylake_info), \INTEL_SKL_GT3_IDS (&intel_skylake_gt3_info), \ - INTEL_BXT_IDS(&intel_broxton_info) +INTEL_BXT_IDS (&intel_broxton_info), \ +INTEL_KBL_GT1_IDS (&intel_kabylake_info), \ +INTEL_KBL_GT2_IDS (&intel_kabylake_info), \ + INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info)static const struct pci_device_id pciidlist[] = {/* aka */ INTEL_PCI_IDS ,drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -765,6 +765,7 @@ struct intel_csr { func(is_valleyview) sep \ func(is_haswell) sep \ func(is_skylake) sep \ + func(is_kabylake) sep \ func(is_preliminary) sep \ func(has_fbc) sep \ func(has_pipe_cxsr) sep \@@ -2464,6 +2465,7 @@ struct drm_i915_cmd_table {#define IS_BROADWELL (dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev))#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (!INTEL_INFO(dev)->is_skylake && IS_GEN9(dev)) +#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake)#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile)#define IS_HSW_EARLY_SDV (dev) (IS_HASWELL(dev) && \ (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)include/drm/i915_pciids.h +29
-0@@ -291,4 +291,33 @@INTEL_VGA_DEVICE (0x1A84 , info), \ INTEL_VGA_DEVICE(0x5A84, info) +#define INTEL_KBL_GT1_IDS (info) \ + INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ +INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ +INTEL_VGA_DEVICE (0x5902 , info),/* DT GT1 */ \ +INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ + INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ + +#define INTEL_KBL_GT2_IDS(info) \ +INTEL_VGA_DEVICE (0x5916 , info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \ +INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ +INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \ +INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ +INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ + +#define INTEL_KBL_GT3_IDS(info) \ +INTEL_VGA_DEVICE (0x5926 , info),/* ULT GT3 */ \ +INTEL_VGA_DEVICE (0x592B , info),/* Halo GT3 */ \ + INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ + +#define INTEL_KBL_IDS(info) \ +INTEL_KBL_GT1_IDS (info), \ +INTEL_KBL_GT2_IDS (info), \ +INTEL_KBL_GT3_IDS (info) + #endif /* _I915_PCIIDS_H */Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerRe: [PATCH 1/5] drm/i915/kbl: Add Kabylake PCI ID
Quoted 37 lines · Jani Nikula
Quoted 23 lines · Rodrigo Vivi
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Addis_kabylaketo the KBL gt3 structuer (Damien)Sort the platforms in older -> newer order (Damien)Reviewed-by Damien Lespiau <[email protected]>Signed-off-by Deepak S <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +0
-0drivers/gpu/drm/i915/i915_drv.c static const struct intel_device_info · line 400
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 ,Now's the time to call the shots, is this really a good idea or not? See
VLV vs. CHV, we (okay, the royal we) still confuse ourselves withIS_VALLEYVIEW.
Quoted 7 lines
Granted, 74 call sites for
IS_SKYLAKE(), all of those would need to be
patched. We'd need something like "is skylake family" including SKL and
KBL. Some of them might be changed to be more like feature flags, which
is something we've decided we need to do more anyway.
To be honest I also don't like this approach as I didn't like the chv is vlv one. I always get confused and I thought about changing everything many times during last week, but as you pointed out it would be a change in many entries and not sure what others opinion was since I never saw any complain about this patch before neither the vlv-chv ones...
But if you and Daniel prefer I can do a s/IS_SKYLAKE(dev)/IS_KABYLAKE(dev) || IS_SKYLAKE(dev) Just let me know...
The IS_SKYLAKE_FAMILY I don't like much because it will still confuse people because in ark they will probably be 2 different "families" if they continue with the current scheme they are using so far.
Quoted 116 lines
BR,
Jani.Quoted 111 lines
drivers/gpu/drm/i915/i915_drv.c +25
-0+ .is_kabylake = 1, + .gen = 9, .num_pipes = 3, + .need_gfx_hws = 1, .has_hotplug = 1, + .ring_mask =RENDER_RING |BSD_RING |BLT_RING | VEBOX_RING, + .has_llc = 1, + .has_ddi = 1, + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , + IVB_CURSOR_OFFSETS, +}; + +static const struct intel_device_info intel_kabylake_gt3_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; +/*
* Make sure any device matches here are from most specific to
most
* general. For example, since the Quanta match is based on the
subsystemdrivers/gpu/drm/i915/i915_drv.c +4
-1@@ -434,7 +462,10 @@ static const struct intel_device_info intel_broxton_info = {INTEL_SKL_GT1_IDS (&intel_skylake_info), \INTEL_SKL_GT2_IDS (&intel_skylake_info), \INTEL_SKL_GT3_IDS (&intel_skylake_gt3_info), \ - INTEL_BXT_IDS(&intel_broxton_info) +INTEL_BXT_IDS (&intel_broxton_info), \ +INTEL_KBL_GT1_IDS (&intel_kabylake_info), \ +INTEL_KBL_GT2_IDS (&intel_kabylake_info), \ + INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info) static const struct pci_device_id pciidlist[] = { /* aka */
drivers/gpu/drm/i915/i915_drv.c +0
-0INTEL_PCI_IDS,drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -765,6 +765,7 @@ struct intel_csr { func(is_valleyview) sep \ func(is_haswell) sep \ func(is_skylake) sep \ + func(is_kabylake) sep \ func(is_preliminary) sep \ func(has_fbc) sep \ func(has_pipe_cxsr) sep \@@ -2464,6 +2465,7 @@ struct drm_i915_cmd_table {#define IS_BROADWELL (dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev))#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (!INTEL_INFO(dev)->is_skylake && IS_GEN9(dev)) +#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake)#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile)#define
IS_HSW_EARLY_SDV(dev)(IS_HASWELL(dev)&& \
(INTEL_DEVID(dev)&0xFF00) ==0x0C00)include/drm/i915_pciids.h +29
-0@@ -291,4 +291,33 @@INTEL_VGA_DEVICE (0x1A84 , info), \ INTEL_VGA_DEVICE(0x5A84, info) +#define INTEL_KBL_GT1_IDS (info) \ + INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ +INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ +INTEL_VGA_DEVICE (0x5902 , info),/* DT GT1 */ \ +INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ + INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ + +#define INTEL_KBL_GT2_IDS(info) \ +INTEL_VGA_DEVICE (0x5916 , info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \ +INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ +INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \ +INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ +INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ + +#define INTEL_KBL_GT3_IDS(info) \ +INTEL_VGA_DEVICE (0x5926 , info),/* ULT GT3 */ \ +INTEL_VGA_DEVICE (0x592B , info),/* Halo GT3 */ \ + INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ + +#define INTEL_KBL_IDS(info) \ +INTEL_KBL_GT1_IDS (info), \ +INTEL_KBL_GT2_IDS (info), \ +INTEL_KBL_GT3_IDS (info) + #endif /* _I915_PCIIDS_H */Signature · 1 line
2.4.3
Quoted 5 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/i915/kbl: Add Kabylake PCI ID
Quoted 53 lines · Rodrigo
Quoted 37 lines · Jani Nikula
Quoted 23 lines · Rodrigo Vivi
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Addis_kabylaketo the KBL gt3 structuer (Damien)Sort the platforms in older -> newer order (Damien)Reviewed-by Damien Lespiau <[email protected]>Signed-off-by Deepak S <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +0
-0drivers/gpu/drm/i915/i915_drv.c static const struct intel_device_info · line 400
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 ,Now's the time to call the shots, is this really a good idea or not? See
VLV vs. CHV, we (okay, the royal we) still confuse ourselves withIS_VALLEYVIEW.Quoted 7 lines
Granted, 74 call sites for
IS_SKYLAKE(), all of those would need to be
patched. We'd need something like "is skylake family" including SKL and
KBL. Some of them might be changed to be more like feature flags, which
is something we've decided we need to do more anyway.To be honest I also don't like this approach as I didn't like the chv is vlv one. I always get confused and I thought about changing everything many times during last week, but as you pointed out it would be a change in many entries and not sure what others opinion was since I never saw any complain about this patch before neither the vlv-chv ones...
Quoted 7 lines
But if you and Daniel prefer I can do a s/IS_SKYLAKE(dev)/IS_KABYLAKE(dev) ||
IS_SKYLAKE(dev)Just let me know...The
IS_SKYLAKE_FAMILYI don't like much because it will still confuse people because in ark they will probably be 2 different "families" if they continue with the current scheme they are using so far.
IS_SKYLAKE_FAMILY == IS_GEN9 pretty much everywhere. The exceptions (where bxt is special) are probably worth listing explicitly anyway. So yeah IS_KABYLAKE.
btw the original reasons for putting chv into vlv was that what we really wanted is HAS_GMCH but getting there was a lot more work. At least that's how I remember that particular story ;-)
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/i915/kbl: Add Kabylake PCI ID
Quoted 62 lines · Daniel Vetter
Quoted 53 lines · Rodrigo
Quoted 37 lines · Jani Nikula
Quoted 23 lines · Rodrigo Vivi
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Addis_kabylaketo the KBL gt3 structuer (Damien)Sort the platforms in older -> newer order (Damien)Reviewed-by Damien Lespiau <[email protected]>Signed-off-by Deepak S <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +0
-0drivers/gpu/drm/i915/i915_drv.c static const struct intel_device_info · line 400
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 ,Now's the time to call the shots, is this really a good idea or not? See
VLV vs. CHV, we (okay, the royal we) still confuse ourselves withIS_VALLEYVIEW.Quoted 7 lines
Granted, 74 call sites for
IS_SKYLAKE(), all of those would need to be
patched. We'd need something like "is skylake family" including SKL and
KBL. Some of them might be changed to be more like feature flags, which
is something we've decided we need to do more anyway.To be honest I also don't like this approach as I didn't like the chv is vlv one. I always get confused and I thought about changing everything many times during last week, but as you pointed out it would be a change in many entries and not sure what others opinion was since I never saw any complain about this patch before neither the vlv-chv ones...
Quoted 7 lines
But if you and Daniel prefer I can do a s/IS_SKYLAKE(dev)/IS_KABYLAKE(dev) ||
IS_SKYLAKE(dev)Just let me know...The
IS_SKYLAKE_FAMILYI don't like much because it will still confuse people because in ark they will probably be 2 different "families" if they continue with the current scheme they are using so far.
Quoted 7 lines
IS_SKYLAKE_FAMILY==IS_GEN9pretty much everywhere. The exceptions (where bxt is special) are probably worth listing explicitly anyway. So yeahIS_KABYLAKE.btw the original reasons for putting chv into vlv was that what we really wanted is
HAS_GMCHbut getting there was a lot more work. At least that's how I remember that particular story ;-)
IIRC I left it like that mainly to minimize the diff between upstream and internal when chv was still living there. And I could never come up with any good IS_<whatever> name to cover both platforms, so didn't do such a change upfront in upstream.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/i915/kbl: Add Kabylake PCI ID
In reply to Jani NikulaQuoted 33 lines · Jani Nikula
Quoted 21 lines · Rodrigo Vivi
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Addis_kabylaketo the KBL gt3 structuer (Damien)Sort the platforms in older -> newer order (Damien)Reviewed-by Damien Lespiau <[email protected]>Signed-off-by Deepak S <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +0
-0drivers/gpu/drm/i915/i915_drv.c static const struct intel_device_info intel_broxton_info = { · line 399
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 ,Now's the time to call the shots, is this really a good idea or not? See VLV vs. CHV, we (okay, the royal we) still confuse ourselves with
IS_VALLEYVIEW.
Quoted 3 lines
Granted, 74 call sites for
IS_SKYLAKE(), all of those would need to be patched. We'd need something like "is skylake family" including SKL and KBL.
That would be just gen>=9 in most case, with potentially BXT handled first as the special case. So maybe not much better than IS_SKYLAKE being true for KBL.
Maybe it's best to just have IS_KABYLAKE and go through all the IS_SKYLAKE checks and add BKL where needed (or change to gen>=9 if that's OK).
I'm pretty sure I once did a patch to split IS_CHERRYVIEW from IS_VALLEYVIEW, but I'm not sure where I stashed the work. Maybe I should dig it up to get rid of the bad example?
Quoted 2 lines
Some of them might be changed to be more like feature flags, which is something we've decided we need to do more anyway.
I've also thought about adding a chipset/platform enum or something where the platforms would sit in some sort of logical order. So mostly a .gen except we could actually tell apart the .5 gens and whatnot. Might make the code a bit nicer since we would say eg. '>= HSW' instead of 'gen >= 8 || HSW', but maybe it wouldn't do much else for us. VLV/CHV would still be fairly problematic since the display gen is so different from the gt gen.
Quoted 117 lines
BR,
Jani.Quoted 105 lines
drivers/gpu/drm/i915/i915_drv.c +29
-1+ .is_kabylake = 1, + .gen = 9, .num_pipes = 3, + .need_gfx_hws = 1, .has_hotplug = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, + .has_llc = 1, + .has_ddi = 1, + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , + IVB_CURSOR_OFFSETS, +}; + +static const struct intel_device_info intel_kabylake_gt3_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem @@ -434,7 +462,10 @@ static const struct intel_device_info intel_broxton_info = {INTEL_SKL_GT1_IDS (&intel_skylake_info), \INTEL_SKL_GT2_IDS (&intel_skylake_info), \INTEL_SKL_GT3_IDS (&intel_skylake_gt3_info), \ - INTEL_BXT_IDS(&intel_broxton_info) +INTEL_BXT_IDS (&intel_broxton_info), \ +INTEL_KBL_GT1_IDS (&intel_kabylake_info), \ +INTEL_KBL_GT2_IDS (&intel_kabylake_info), \ + INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info)static const struct pci_device_id pciidlist[] = {/* aka */ INTEL_PCI_IDS ,drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -765,6 +765,7 @@ struct intel_csr { func(is_valleyview) sep \ func(is_haswell) sep \ func(is_skylake) sep \ + func(is_kabylake) sep \ func(is_preliminary) sep \ func(has_fbc) sep \ func(has_pipe_cxsr) sep \@@ -2464,6 +2465,7 @@ struct drm_i915_cmd_table {#define IS_BROADWELL (dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev))#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (!INTEL_INFO(dev)->is_skylake && IS_GEN9(dev)) +#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake)#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile)#define IS_HSW_EARLY_SDV (dev) (IS_HASWELL(dev) && \ (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)include/drm/i915_pciids.h +29
-0@@ -291,4 +291,33 @@INTEL_VGA_DEVICE (0x1A84 , info), \ INTEL_VGA_DEVICE(0x5A84, info) +#define INTEL_KBL_GT1_IDS (info) \ + INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5915 , info),/* ULX GT1.5 */ \ +INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ +INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ +INTEL_VGA_DEVICE (0x5902 , info),/* DT GT1 */ \ +INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ + INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ + +#define INTEL_KBL_GT2_IDS(info) \ +INTEL_VGA_DEVICE (0x5916 , info),/* ULT GT2 */ \ +INTEL_VGA_DEVICE (0x5921 , info),/* ULT GT2F */ \ +INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ +INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \ +INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ +INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ + +#define INTEL_KBL_GT3_IDS(info) \ +INTEL_VGA_DEVICE (0x5926 , info),/* ULT GT3 */ \ +INTEL_VGA_DEVICE (0x592B , info),/* Halo GT3 */ \ + INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ + +#define INTEL_KBL_IDS(info) \ +INTEL_KBL_GT1_IDS (info), \ +INTEL_KBL_GT2_IDS (info), \ +INTEL_KBL_GT3_IDS (info) + #endif /* _I915_PCIIDS_H */Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 1/5] drm/i915/kbl: Add Kabylake PCI ID
In reply to Rodrigo ViviQuoted 98 lines · Rodrigo Vivi
From: Deepak S <[email protected]>
v2: separate out device info into different GT (Damien)
v3: Addis_kabylaketo the KBL gt3 structuer (Damien)Sort the platforms in older -> newer order (Damien)Reviewed-by Damien Lespiau <[email protected]>Signed-off-by Deepak S <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 2 ++ include/drm/i915_pciids.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +32
-1@@ -394,6 +394,34 @@ static const struct intel_device_info intel_broxton_info = { IVB_CURSOR_OFFSETS, }; +static const struct intel_device_info intel_kabylake_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; + +static const struct intel_device_info intel_kabylake_gt3_info = { + .is_preliminary =1 , + .is_skylake =1 , + .is_kabylake =1 , + .gen =9 , .num_pipes =3 , + .need_gfx_hws =1 , .has_hotplug =1 , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , + .has_llc =1 , + .has_ddi =1 , + .has_fbc =1 , +GEN_DEFAULT_PIPEOFFSETS , +IVB_CURSOR_OFFSETS , +}; +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem @@ -434,7 +462,10 @@ static const struct intel_device_info intel_broxton_info = {INTEL_SKL_GT1_IDS (&intel_skylake_info), \INTEL_SKL_GT2_IDS (&intel_skylake_info), \INTEL_SKL_GT3_IDS (&intel_skylake_gt3_info), \ - INTEL_BXT_IDS(&intel_broxton_info) +INTEL_BXT_IDS (&intel_broxton_info), \ +INTEL_KBL_GT1_IDS (&intel_kabylake_info), \ +INTEL_KBL_GT2_IDS (&intel_kabylake_info), \ + INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info)static const struct pci_device_id pciidlist[] = {/* aka */ INTEL_PCI_IDS ,drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -765,6 +765,7 @@ struct intel_csr { func(is_valleyview) sep \ func(is_haswell) sep \ func(is_skylake) sep \ + func(is_kabylake) sep \ func(is_preliminary) sep \ func(has_fbc) sep \ func(has_pipe_cxsr) sep \@@ -2464,6 +2465,7 @@ struct drm_i915_cmd_table {#define IS_BROADWELL (dev) (!INTEL_INFO(dev)->is_valleyview && IS_GEN8(dev))#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (!INTEL_INFO(dev)->is_skylake && IS_GEN9(dev)) +#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake)#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile)#define IS_HSW_EARLY_SDV (dev) (IS_HASWELL(dev) && \ (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)include/drm/i915_pciids.h +3
-0@@ -291,4 +291,33 @@INTEL_VGA_DEVICE (0x1A84 , info), \ INTEL_VGA_DEVICE(0x5A84, info) +#define INTEL_KBL_GT1_IDS (info) \ + INTEL_VGA_DEVICE(0x5913, info),/* ULT GT1.5 */ \ + INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
include/drm/i915_pciids.h line 306
Quoted 10 lines
include/drm/i915_pciids.h +10
-0+INTEL_VGA_DEVICE (0x5917 , info),/* DT GT1.5 */ \ +INTEL_VGA_DEVICE (0x5906 , info),/* ULT GT1 */ \ +INTEL_VGA_DEVICE (0x590E , info),/* ULX GT1 */ \ +INTEL_VGA_DEVICE (0x5902 , info),/* DT GT1 */ \ +INTEL_VGA_DEVICE (0x590B , info),/* Halo GT1 */ \ + INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */ + +#define INTEL_KBL_GT2_IDS(info) \ +INTEL_VGA_DEVICE (0x5916 , info),/* ULT GT2 */ \ + INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
This will match IS_SKL_GT3, making it a good example of just how confusing it will be to have IS_SKYLAKE match Kabylake.
Quoted 24 lines
include/drm/i915_pciids.h +16
-0+INTEL_VGA_DEVICE (0x591E , info),/* ULX GT2 */ \ +INTEL_VGA_DEVICE (0x5912 , info),/* DT GT2 */ \ +INTEL_VGA_DEVICE (0x591B , info),/* Halo GT2 */ \ +INTEL_VGA_DEVICE (0x591A , info),/* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */ + +#define INTEL_KBL_GT3_IDS (info) \ + INTEL_VGA_DEVICE(0x5926, info),/* ULT GT3 */ \ +INTEL_VGA_DEVICE (0x592B , info),/* Halo GT3 */ \ + INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ + +#define INTEL_KBL_IDS (info) \ + INTEL_KBL_GT1_IDS(info), \ + INTEL_KBL_GT2_IDS(info), \ + INTEL_KBL_GT3_IDS(info) +#endif /* _I915_PCIIDS_H */ Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/5 drm/i915/kbl: Use propper ddi buffer translation table for Kabylake ULT and ULX.
In reply to Rodrigo ViviLet's introduce ULT and ULX Kabylake definitions and start using it for a propper DDI buffer translation.
--- drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ drivers/gpu/drm/i915/intel_ddi.c | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +8 -0
@@ -2493,6 +2493,14 @@ struct drm_i915_cmd_table {#define IS_SKL_ULX (dev) (INTEL_DEVID(dev) == 0x190E || \ INTEL_DEVID(dev) == 0x1915 || \ INTEL_DEVID(dev) == 0x191E) +#define IS_KBL_ULT (dev) (INTEL_DEVID(dev) == 0x5906 || \ + INTEL_DEVID(dev) == 0x5913 || \ + INTEL_DEVID(dev) == 0x5916 || \ + INTEL_DEVID(dev) == 0x5921 || \ + INTEL_DEVID(dev) == 0x5926) +#define IS_KBL_ULX (dev) (INTEL_DEVID(dev) == 0x590E || \ + INTEL_DEVID(dev) == 0x5915 || \ + INTEL_DEVID(dev) == 0x591E)#define IS_SKL_GT3 (dev) (IS_SKYLAKE(dev) && \ (INTEL_DEVID(dev) & 0x00F0) == 0x0020)#define IS_SKL_GT4 (dev) (IS_SKYLAKE(dev) && \
drivers/gpu/drm/i915/intel_ddi.c +5 -5
@@ -353,10 +353,10 @@ static const struct ddi_buf_trans *skl_get_buf_trans_dp(struct drm_device *dev, {const struct ddi_buf_trans *ddi_translations; -if (IS_SKL_ULX (dev)) { +if (IS_SKL_ULX (dev) ||IS_KBL_ULX (dev)) { ddi_translations = skl_y_ddi_translations_dp; *n_entries =ARRAY_SIZE (skl_y_ddi_translations_dp); - }else if (IS_SKL_ULT (dev)) { + }else if (IS_SKL_ULT (dev) ||IS_KBL_ULT (dev)) { ddi_translations = skl_u_ddi_translations_dp; *n_entries =ARRAY_SIZE (skl_u_ddi_translations_dp); }else {
@@ -373,7 +373,7 @@ static const struct ddi_buf_trans *skl_get_buf_trans_edp(struct drm_device *dev,struct drm_i915_private *dev_priv = dev->dev_private;const struct ddi_buf_trans *ddi_translations; -if (IS_SKL_ULX (dev)) { +if (IS_SKL_ULX (dev) ||IS_KBL_ULX (dev)) {if (dev_priv->edp_low_vswing) { ddi_translations = skl_y_ddi_translations_edp; *n_entries =ARRAY_SIZE (skl_y_ddi_translations_edp);
@@ -381,7 +381,7 @@ static const struct ddi_buf_trans *skl_get_buf_trans_edp(struct drm_device *dev, ddi_translations = skl_y_ddi_translations_dp; *n_entries =ARRAY_SIZE (skl_y_ddi_translations_dp); } - }else if (IS_SKL_ULT (dev)) { + }else if (IS_SKL_ULT (dev) ||IS_KBL_ULT (dev)) {if (dev_priv->edp_low_vswing) { ddi_translations = skl_u_ddi_translations_edp; *n_entries =ARRAY_SIZE (skl_u_ddi_translations_edp);
@@ -408,7 +408,7 @@ skl_get_buf_trans_hdmi(struct drm_device *dev, {const struct ddi_buf_trans *ddi_translations; -if (IS_SKL_ULX (dev)) { +if (IS_SKL_ULX (dev) ||IS_KBL_ULX (dev)) { ddi_translations = skl_y_ddi_translations_hdmi; *n_entries =ARRAY_SIZE (skl_y_ddi_translations_hdmi); }else {
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 3/5 drm/i915/kbl: Kabylake A0 is based on Skylake H0.
In reply to Rodrigo ViviKabylake is gen 9.5 derivated from Skylake H0 stepping.
So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +6 -1
@@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)
@@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info)->is_preliminary) +#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) +#define SKL_REVID_A0 (0x0)#define SKL_REVID_B0 (0x1)#define SKL_REVID_C0 (0x2)
@@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 (0x4)#define SKL_REVID_F0 (0x5) +/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7) +#define BXT_REVID_A0 (0x0)#define BXT_REVID_B0 (0x3)#define BXT_REVID_C0 (0x9)
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 3/5] drm/i915/kbl: Kabylake A0 is based on Skylake H0.
Quoted 23 lines · Rodrigo Vivi
Kabylake is gen 9.5 derivated from Skylake H0 stepping.
So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2512
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info)->is_preliminary) +#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) +
I am not fond of this at all. It will be really confusing that ->revision is different from INTEL_REVID when checking the workarounds, and that you'll be using SKL_REVID_* to match KBL revision ids. Additionally, we'll probably want to start removing SKL workarounds before KBL workarounds.
Others may disagree, but I'd like KBL revid checks be different from SKL.
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2521
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0#define SKL_REVID_A0 (0x0)#define SKL_REVID_B0 (0x1)#define SKL_REVID_C0 (0x2)@@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 (0x4)#define SKL_REVID_F0 (0x5) +/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7)
You can't compare this against INTEL_REVID() now can you...? Or is this not the one in the spec? Confused already.
BR,
Jani.
Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0+#define BXT_REVID_A0 (0x0)#define BXT_REVID_B0 (0x3)#define BXT_REVID_C0 (0x9)Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerRe: [PATCH 3/5] drm/i915/kbl: Kabylake A0 is based on Skylake H0.
Quoted 29 lines · Jani Nikula
Quoted 28 lines · Rodrigo Vivi
Kabylake is gen 9.5 derivated from Skylake H0 stepping.
So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-2@@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)@@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info) ->is_preliminary)
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2512
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +3
-0+#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) +I am not fond of this at all. It will be really confusing that ->revision is different from
INTEL_REVIDwhen checking the workarounds,
and that you'll be using SKL_REVID_* to match KBL revision ids.
this is exactly one of the reasons why I did this sum in this way so they never match...
Quoted 2 lines
Additionally, we'll probably want to start removing SKL workarounds before KBL workarounds.
I believe this is another discussion... On HSW BDW I remember I was removing old Wa as it was no longer needed, but on SKL I saw this REVID and I believed the idea was to let them there since some devs might be using preliminary platforms yet for other reasons... I don't see a problem of letting the old W/a there.
Quoted 11 lines
Others may disagree, but I'd like KBL revid checks be different from SKL.
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define SKL_REVID_A0 (0x0)#define SKL_REVID_B0 (0x1)#define SKL_REVID_C0 (0x2)@@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 (0x4)#define SKL_REVID_F0 (0x5)
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2521
Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0+/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7)You can't compare this against
INTEL_REVID()now can you...? Or is this
not the one in the spec? Confused already.
Yes, this is confusing indeed. It seems that we have many levels of steppings (according to platform guys) and this platform stepping returning 0 is our KBL A0, but this correspond to our internal gpu stepping H0 (same going to skl h0).
Like dmc firmware loading for instance we need to load the firmware for stepping 7.
So yes, this definition matches BSPec KBL A0.
Quoted 16 lines
BR,
Jani.Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0+#define BXT_REVID_A0 (0x0)#define BXT_REVID_B0 (0x3)#define BXT_REVID_C0 (0x9)Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915/kbl: Kabylake A0 is based on Skylake H0.
cc'ing Ben to get his opinion...
Quoted 97 lines · Rodrigo
Quoted 29 lines · Jani Nikula
Quoted 28 lines · Rodrigo Vivi
Kabylake is gen 9.5 derivated from Skylake H0 stepping.
So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-2@@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)@@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info) ->is_preliminary)Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2512
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +3
-0+#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) +I am not fond of this at all. It will be really confusing that ->revision is different from
INTEL_REVIDwhen checking the workarounds,
and that you'll be using SKL_REVID_* to match KBL revision ids.this is exactly one of the reasons why I did this sum in this way so they never match...
Quoted 2 lines
Additionally, we'll probably want to start removing SKL workarounds before KBL workarounds.
I believe this is another discussion... On HSW BDW I remember I was removing old Wa as it was no longer needed, but on SKL I saw this REVID and I believed the idea was to let them there since some devs might be using preliminary platforms yet for other reasons... I don't see a problem of letting the old W/a there.
Quoted 11 lines
Others may disagree, but I'd like KBL revid checks be different from SKL.
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define SKL_REVID_A0 (0x0)#define SKL_REVID_B0 (0x1)#define SKL_REVID_C0 (0x2)@@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 (0x4)#define SKL_REVID_F0 (0x5)Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2521
Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0+/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7)You can't compare this against
INTEL_REVID()now can you...? Or is this
not the one in the spec? Confused already.Yes, this is confusing indeed. It seems that we have many levels of steppings (according to platform guys) and this platform stepping returning 0 is our KBL A0, but this correspond to our internal gpu stepping H0 (same going to skl h0).
Like dmc firmware loading for instance we need to load the firmware for stepping 7.
So yes, this definition matches BSPec KBL A0.
Quoted 16 lines
BR,
Jani.Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +1
-1+#define BXT_REVID_A0 (0x0)#define BXT_REVID_B0 (0x3)#define BXT_REVID_C0 (0x9) --2.4.3
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915/kbl: Kabylake A0 is based on Skylake H0.
Quoted 2 lines · Rodrigo Vivi
cc'ing Ben to get his opinion...
Of course anything is possible wrt the delta of KBL features vs SKL. With the knowledge we have, we can make a pretty educated guess that there will be no changes, and with an equally high level of confidence say that if there are changes, they will be very minor and self contained.
I am in favor of this minimalistic patch myself. I think both the result, and reduced amount of churn make this patch favorable to the requested alternative. Some finer comments below.
Quoted 6 lines
Quoted 3 lines · Rodrigo
Quoted 2 lines · Jani Nikula
Quoted 1 line · Rodrigo Vivi
Kabylake is gen 9.5 derivated from Skylake H0 stepping.
Don't call it 9.5... some people don't like that... Just say it's a SKL derivative.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
In fact we know some of these workarounds to be harmful.
Quoted 35 lines
Quoted 35 lines
Quoted 34 lines
Quoted 20 lines
Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2513
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info) ->is_preliminary) +#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) +I am not fond of this at all. It will be really confusing that ->revision is different from
INTEL_REVIDwhen checking the workarounds,
and that you'll be using SKL_REVID_* to match KBL revision ids.
Quoted 3 lines
Quoted 3 lines
this is exactly one of the reasons why I did this sum in this way so they never match...
Jani, I do understand your distaste with this patch. However, I think this is a very reasonable, and more importantly, readable wart in the code. It's very obvious what and why the macro does what it does.
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Additionally, we'll probably want to start removing SKL workarounds before KBL workarounds.
I don't see a reason for this. Maybe you have thought of something I haven't? We're not using any of the early SKL workarounds on KBL as a result of this patch, so it shouldn't matter.
Quoted 6 lines
Quoted 6 lines
I believe this is another discussion... On HSW BDW I remember I was removing old Wa as it was no longer needed, but on SKL I saw this REVID and I believed the idea was to let them there since some devs might be using preliminary platforms yet for other reasons... I don't see a problem of letting the old W/a there.
I'm very much in favor of killing pre-production support (not that anyone asked).
Quoted 23 lines
Quoted 23 lines
Quoted 11 lines
Others may disagree, but I'd like KBL revid checks be different from SKL.
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define SKL_REVID_A0 (0x0)#define SKL_REVID_B0 (0x1)#define SKL_REVID_C0 (0x2)@@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 (0x4)#define SKL_REVID_F0 (0x5)Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2521
Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0+/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7)You can't compare this against
INTEL_REVID()now can you...? Or is this
not the one in the spec? Confused already.Yes, this is confusing indeed. It seems that we have many levels of steppings (according to platform guys) and this platform stepping returning 0 is our KBL A0, but this correspond to our internal gpu stepping H0 (same going to skl h0).
Quoted 5 lines
Quoted 5 lines
Like dmc firmware loading for instance we need to load the firmware for stepping 7.
So yes, this definition matches BSPec KBL A0.
Maybe amend the comment to say that the actual PCI header has revid 0 (or whatever it was). With that, it's pretty clear - and yes, it is a value which can and should be used to compare with INTEL_REVID, but as stated above, the comparison isn't needed, and if/when it is, we can/should revisit the more intrusive change you're suggesting.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 3/5] drm/i915/kbl: Kabylake A0 is based on Skylake H0.
Quoted 64 lines · Ben Widawsky
Quoted 2 lines · Rodrigo Vivi
cc'ing Ben to get his opinion...
Of course anything is possible wrt the delta of KBL features vs SKL. With the knowledge we have, we can make a pretty educated guess that there will be no changes, and with an equally high level of confidence say that if there are changes, they will be very minor and self contained.
I am in favor of this minimalistic patch myself. I think both the result, and reduced amount of churn make this patch favorable to the requested alternative. Some finer comments below.
Quoted 6 lines
Quoted 3 lines · Rodrigo
Quoted 2 lines · Jani Nikula
Quoted 1 line · Rodrigo Vivi
Kabylake is gen 9.5 derivated from Skylake H0 stepping.
Don't call it 9.5... some people don't like that... Just say it's a SKL derivative.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
So we don't need pre-production Skylake workaround and also firmware loading will use SKL H0 offsets.
In fact we know some of these workarounds to be harmful.
Quoted 35 lines
Quoted 35 lines
Quoted 34 lines
Quoted 20 lines
Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -2436,7 +2436,6 @@ struct drm_i915_cmd_table { })#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id) -#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)#define IS_I830 (dev) (INTEL_DEVID(dev) == 0x3577)#define IS_845G (dev) (INTEL_DEVID(dev) == 0x2562)drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2513
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -2508,6 +2507,9 @@ struct drm_i915_cmd_table {#define IS_PRELIMINARY_HW (intel_info) ((intel_info) ->is_preliminary) +#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision + \ + IS_KABYLAKE(p) ? 7 : 0) +I am not fond of this at all. It will be really confusing that ->revision is different from
INTEL_REVIDwhen checking the workarounds,
and that you'll be using SKL_REVID_* to match KBL revision ids.
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
this is exactly one of the reasons why I did this sum in this way so they never match...
Jani, I do understand your distaste with this patch. However, I think this is a very reasonable, and more importantly, readable wart in the code. It's very obvious what and why the macro does what it does.
INTEL_REVID() is supposed to be a shorthand for getting at ->dev->pdev->revision. I think it's rather surprising that on one platform this would not hold. It's a clever trick, I'll give you that.
Quoted 15 lines
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Additionally, we'll probably want to start removing SKL workarounds before KBL workarounds.
I don't see a reason for this. Maybe you have thought of something I haven't? We're not using any of the early SKL workarounds on KBL as a result of this patch, so it shouldn't matter.
Quoted 6 lines
Quoted 6 lines
I believe this is another discussion... On HSW BDW I remember I was removing old Wa as it was no longer needed, but on SKL I saw this REVID and I believed the idea was to let them there since some devs might be using preliminary platforms yet for other reasons... I don't see a problem of letting the old W/a there.
Quoted 2 lines
I'm very much in favor of killing pre-production support (not that anyone asked).
It was specifically dropping pre-production SKL workarounds I meant above.
You might be interested in having a look at [1] I wrote to address the revid/workaround part of the SKL vs. KBL discussion. With that, I think we could keep INTEL_REVID() as it is, make IS_SKL_REVID() match only SKL, and add IS_KBL_REVID() to match only KBL. As you say, most early SKL workarounds don't impact KBL, so we wouldn't have to touch so many places in the code to add KBL workarounds.
I also think that patch, incl. adding separate IS_KBL_REVID, is orthogonal to whether IS_SKYLAKE() should match KBL or not.
[1] http://mid.gmane.org/[email protected]
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 11 lines
Others may disagree, but I'd like KBL revid checks be different from SKL.
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define SKL_REVID_A0 (0x0)#define SKL_REVID_B0 (0x1)#define SKL_REVID_C0 (0x2)@@ -2515,6 +2517,9 @@ struct drm_i915_cmd_table {#define SKL_REVID_E0 (0x4)#define SKL_REVID_F0 (0x5)Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2521
Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0+/* KBL A0 is based on SKL H0 */ +#define KBL_REVID_A0 (0x7)You can't compare this against
INTEL_REVID()now can you...? Or is this
not the one in the spec? Confused already.Yes, this is confusing indeed. It seems that we have many levels of steppings (according to platform guys) and this platform stepping returning 0 is our KBL A0, but this correspond to our internal gpu stepping H0 (same going to skl h0).
Like dmc firmware loading for instance we need to load the firmware for stepping 7.
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
So yes, this definition matches BSPec KBL A0.
Maybe amend the comment to say that the actual PCI header has revid 0 (or whatever it was). With that, it's pretty clear - and yes, it is a value which can and should be used to compare with
INTEL_REVID, but as stated above, the comparison isn't needed, and if/when it is, we can/should revisit the more intrusive change you're suggesting.
I am still confused. I fear you may start thinking that no longer supports my side of the argument. :(
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 4/5 drm/i915/kbl: Fix DMC load on Kabylake.
In reply to Rodrigo ViviKabylake A0 is based on Skylake H0. So let's reuse the INTEL_REVID that already takes care of this, so the csr code can find the proper firmware address offset.
--- drivers/gpu/drm/i915/intel_csr.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +10 -6
@@ -190,9 +190,11 @@ static struct stepping_info bxt_stepping_info[] = {static char intel_get_stepping (struct drm_device *dev) { -if (IS_SKYLAKE (dev) && (dev->pdev->revision < -ARRAY_SIZE (skl_stepping_info))) -return skl_stepping_info[dev->pdev->revision].stepping; +int revid =INTEL_REVID (dev); + +if (IS_SKYLAKE (dev) && + revid <ARRAY_SIZE (skl_stepping_info)) +return skl_stepping_info[revid].stepping;else if (IS_BROXTON (dev) && (dev->pdev->revision <ARRAY_SIZE (bxt_stepping_info)))return bxt_stepping_info[dev->pdev->revision].stepping;
@@ -202,9 +204,11 @@ static char intel_get_stepping(struct drm_device *dev)static char intel_get_substepping (struct drm_device *dev) { -if (IS_SKYLAKE (dev) && (dev->pdev->revision < -ARRAY_SIZE (skl_stepping_info))) -return skl_stepping_info[dev->pdev->revision].substepping; +int revid =INTEL_REVID (dev); + +if (IS_SKYLAKE (dev) && + revid <ARRAY_SIZE (skl_stepping_info)) +return skl_stepping_info[revid].substepping;else if (IS_BROXTON (dev) && (dev->pdev->revision <ARRAY_SIZE (bxt_stepping_info)))return bxt_stepping_info[dev->pdev->revision].substepping;
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 5/5 drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake.
In reply to Rodrigo ViviGuC has no version for KBL published yet and it is not recommended to load the Skylake one, so let's avoid loading this for now while we don't have the proper GuC firmware for Kabylake.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -2603,8 +2603,8 @@ struct drm_i915_cmd_table {#define HAS_CSR (dev) (IS_GEN9(dev)) -#define HAS_GUC_UCODE (dev) (IS_GEN9(dev)) -#define HAS_GUC_SCHED (dev) (IS_GEN9(dev)) +#define HAS_GUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_GUC_SCHED (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8)
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx