ICL basic enabling + GEM
Subsystems (2)
cover ICL basic enabling + GEM
Hello
This is the first series of patches for the Icelake platform. Unlike the other series that introduced new platforms, this one is very small and only contains patches for very basic enabling, interrupts and some GEM code. No patches for display or other subsystems yet and GEM is not complete either. I'm hoping that by splitting Icelake enabling into many small series progress will be better tracked and people only interested in one area of the code will be able to ignore everything else more easily. In addition, except for the first very few patches of this series, many of the sub-series that will follow are independent from each other and can be merged in any order. And on top of everything, tracking down any possible issues identified by the CI system will be easier if the problem is in a series with 20 patches instead of 160 patches.
Another point worth mentioning is that some patches already have Reviewed-by tags. It is important to remind everybody that those tags were often given to some early versions of those patches, and rebasing happened since then due to the fast development pacing of our driver. Reworks may have landed on the upstream driver that we missed while rebasing, so it is likely that some reworks need to be applied to these patches now. I considered just removing the R-B tags before submitting the patches here, but I think it's probably better if we give credit to people who already spent time trying to check for problems in earlier versions of the patches. So, those patches that already have R-B tags need to be re-reviewed now, and special consideration should be given to any rebasing problems. I'd love to see some "R-b tag still stands" emails.
Display-related patches and other series should arrive soon.
Thanks,
Paulo
Ceraolo Spurio, Daniele (1):
drm/i915/icl: new context descriptor support
Daniele Ceraolo Spurio (1):
drm/i915/icl: Gen11 forcewake support
Kelvin Gardiner (2):
drm/i915/icl: Update subslice define for ICL 11 drm/i915/icl: Added ICL 11 slice, subslice and EU fuse detection
Michel Thierry (2):
drm/i915/icl: Add Indirect Context Offset for Gen11 drm/i915/icl: Add reset control register changes
Oscar Mateo (7):
drm/i915/icl: Correctly initialize the Gen11 engines drm/i915/icl: Check for fused-off VDBOX and VEBOX instances drm/i915/icl: Enable the extra video decode and enhancement boxes for
Icelake 11
drm/i915/icl: Make use of the SW counter field in the new context
descriptor
drm/i915/icl: Split out the servicing of the Selector and Shared IIR
registers
drm/i915/icl: Handle RPS interrupts correctly for Gen11 drm/i915/icl: Enable RC6 and RPS in Gen11
Paulo Zanoni (4):
drm/i915/icl: Add the ICL PCI IDs
drm/i915/icl: add icelake_init_clock_gating() drm/i915/icl: allow the reg_read ioctl to read the RCS TIMESTAMP
register
drm/i915/gen11: add support for reading the timestamp frequency
Rodrigo Vivi (1):
drm/i915/icl: Add initial Icelake definitions.
Thomas Daniel (1):
drm/i915/icl: Enhanced execution list support
Tomasz Lis (1):
drm/i915/icl: Add configuring MOCS in new Icelake engines
Tvrtko Ursulin (6):
drm/i915/icl: Icelake interrupt register addresses and bits drm/i915/icl: Show interrupt registers in debugfs drm/i915/icl: Prepare for more rings drm/i915/icl: Interrupt handling
drm/i915/icl: Ringbuffer interrupt handling drm/i915/icl: Gen11 render context size
kgardine (1):
drm/i915/icl: Set graphics mode register for gen11
drivers/gpu/drm/i915/i915_debugfs.c | 92 ++++++++- drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 16 +- drivers/gpu/drm/i915/i915_gem.h | 2 +- drivers/gpu/drm/i915/i915_gem_context.c | 14 +- drivers/gpu/drm/i915/i915_gem_context.h | 2 + drivers/gpu/drm/i915/i915_irq.c | 274 +++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_pci.c | 15 ++ drivers/gpu/drm/i915/i915_reg.h | 119 ++++++++++- drivers/gpu/drm/i915/intel_breadcrumbs.c | 20 +- drivers/gpu/drm/i915/intel_device_info.c | 153 ++++++++++++-- drivers/gpu/drm/i915/intel_device_info.h | 10 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 46 ++++- drivers/gpu/drm/i915/intel_lrc.c | 79 +++++++- drivers/gpu/drm/i915/intel_lrc.h | 3 + drivers/gpu/drm/i915/intel_mocs.c | 5 +- drivers/gpu/drm/i915/intel_pm.c | 22 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 16 +- drivers/gpu/drm/i915/intel_uncore.c | 203 ++++++++++++++++++- drivers/gpu/drm/i915/intel_uncore.h | 27 ++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 30 ++- include/drm/i915_pciids.h | 11 ++ 23 files changed, 1083 insertions(+), 79 deletions(-)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/27 drm/i915/icl: Add initial Icelake definitions.
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support and new features coming in following patches.
v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add the ICL_FEATURES macro (Kelvin Gardiner).
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2595,6 +2595,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEMINILAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE)#define IS_COFFEELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE) +#define IS_ICELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)#define IS_MOBILE (dev_priv) ((dev_priv)->info.is_mobile)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
@@ -2706,6 +2707,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(9))) +#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(10)))#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +13 -0
@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE , + .is_alpha_support =1 , + .has_resource_streamer =0 , +}; +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), + PLATFORM_NAME(ICELAKE), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +2 -0
@@ -69,6 +69,8 @@ enum intel_platform {INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Quoted 50 lines · Paulo Zanoni
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support and new features coming in following patches.
v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2595,6 +2595,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEMINILAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE)#define IS_COFFEELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE) +#define IS_ICELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)#define IS_MOBILE (dev_priv) ((dev_priv)->info.is_mobile)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)@@ -2706,6 +2707,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(9))) +#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(10)))#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +3
-0@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { · line 594
Quoted 10 lines
drivers/gpu/drm/i915/i915_pci.c +10
-0+ .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE , + .is_alpha_support =1 , + .has_resource_streamer =0 , +}; +
This needs to change to fit the new GEN features inheritance organization recently introduced by Rodrigo (with a GEN11_FEATURES and I guess an ICL_11_PLATFORM). Should I go ahead?
Quoted 20 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), + PLATFORM_NAME(ICELAKE), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +0
-0
drivers/gpu/drm/i915/intel_device_info.h enum intel_platform { · line 76
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0@@ -69,6 +69,8 @@ enum intel_platform {INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Em Ter, 2018-01-09 às 15:59 -0800, Oscar Mateo escreveu:
Quoted 75 lines · Paulo Zanoni
Quoted 73 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support
and new features coming in following patches.v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2595,6 +2595,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEMINILAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE)#define IS_COFFEELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) IS_PLATFORM(dev_priv,
INTEL_CANNONLAKE)
+#defineIS_ICELAKE(dev_priv)IS_PLATFORM(dev_priv,INTEL_ICELAKE)
#defineIS_MOBILE(dev_priv)((dev_priv)->info.is_mobile)
#defineIS_HSW_EARLY_SDV(dev_priv)(IS_HASWELL(dev_priv)&& \
(INTEL_DEVID(dev_priv)&0xFF00) ==0x0C00)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2706,6 +2707,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask &BIT(9)))
+#defineIS_GEN11(dev_priv)(!!((dev_priv)->info.gen_mask &
BIT(10)))#define
IS_LP(dev_priv)(INTEL_INFO(dev_priv)->is_lp)
#defineIS_GEN9_LP(dev_priv)(IS_GEN9(dev_priv)&&IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +10
-0@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE , + .is_alpha_support =1 ,
Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { · line 594
Quoted 3 lines
drivers/gpu/drm/i915/i915_pci.c +3
-0+ .has_resource_streamer = 0, +}; +This needs to change to fit the new GEN features inheritance organization recently introduced by Rodrigo (with a
GEN11_FEATURESand I
guess anICL_11_PLATFORM). Should I go ahead?
My understanding is that this is already following the new inheritance model. There's already a GEN11_FEATURES and it doesn't include an ICL_11_PLATFORM because it doesn't need to (and CNL also doesn't have a CNL_PLATFORM). What do you think needs to be changed?
The one thing I do see we lack is the __initconst keyword.
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0/* * 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/intel_device_info.c +1
-0@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), + PLATFORM_NAME(ICELAKE), };#undef PLATFORM_NAME
Quoted 16 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.h +0
-0drivers/gpu/drm/i915/intel_device_info.h enum intel_platform { · line 76
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0@@ -69,6 +69,8 @@ enum intel_platform {INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Quoted 82 lines · Paulo Zanoni
Em Ter, 2018-01-09 às 15:59 -0800, Oscar Mateo escreveu:
Quoted 73 lines · Paulo Zanoni
Quoted 72 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support
and new features coming in following patches.v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2595,6 +2595,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEMINILAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE)#define IS_COFFEELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) IS_PLATFORM(dev_priv,
INTEL_CANNONLAKE)
+#defineIS_ICELAKE(dev_priv)IS_PLATFORM(dev_priv,INTEL_ICELAKE)#define IS_MOBILE(dev_priv) ((dev_priv)->info.is_mobile) #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) &
0xFF00) ==0x0C00)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2706,6 +2707,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask &BIT(9)))
+#defineIS_GEN11(dev_priv)(!!((dev_priv)->info.gen_mask &
BIT(10)))#define IS_LP(dev_priv) (INTEL_INFO(dev_priv)->is_lp) #define IS_GEN9_LP(dev_priv) (IS_GEN9(dev_priv) &&
IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +9
-0@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE ,Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { · line 594
Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +4
-0+ .is_alpha_support = 1, + .has_resource_streamer = 0, +}; +This needs to change to fit the new GEN features inheritance organization recently introduced by Rodrigo (with a
GEN11_FEATURESand I
guess anICL_11_PLATFORM). Should I go ahead?
Quoted 6 lines
My understanding is that this is already following the new inheritance model. There's already a
GEN11_FEATURESand it doesn't include anICL_11_PLATFORMbecause it doesn't need to (and CNL also doesn't have aCNL_PLATFORM). What do you think needs to be changed?The one thing I do see we lack is the
__initconstkeyword.
As a minimum there is the __initconst keyword and the fact that the .gen value is not assigned inside the GENX_FEATURES for any other platform. As for the PLATFORM, we can do that now or wait until we need it, I guess it doesn't matter.
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0/* * 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/intel_device_info.c +1
-0@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), + PLATFORM_NAME(ICELAKE), };#undef PLATFORM_NAME
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.h +0
-0@@ -69,6 +69,8 @@ enum intel_platform {Quoted 9 lines
drivers/gpu/drm/i915/intel_device_info.h enum intel_platform { · line 76
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Quoted 88 lines · Oscar Mateo
Quoted 85 lines · Paulo Zanoni
Em Ter, 2018-01-09 às 15:59 -0800, Oscar Mateo escreveu:
Quoted 71 lines · Paulo Zanoni
Quoted 70 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support
and new features coming in following patches.v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2595,6 +2595,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEMINILAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE)#define IS_COFFEELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) IS_PLATFORM(dev_priv,
INTEL_CANNONLAKE)
+#defineIS_ICELAKE(dev_priv)IS_PLATFORM(dev_priv,INTEL_ICELAKE)#define IS_MOBILE(dev_priv) ((dev_priv)->info.is_mobile) #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) &
0xFF00) ==0x0C00)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2706,6 +2707,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask &BIT(9)))
+#defineIS_GEN11(dev_priv)(!!((dev_priv)->info.gen_mask &
BIT(10)))#define IS_LP(dev_priv) (INTEL_INFO(dev_priv)->is_lp) #define IS_GEN9_LP(dev_priv) (IS_GEN9(dev_priv) &&
IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +9
-0@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE ,Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { · line 594
Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +4
-0+ .is_alpha_support = 1, + .has_resource_streamer = 0, +}; +This needs to change to fit the new GEN features inheritance organization recently introduced by Rodrigo (with a
GEN11_FEATURESand I
guess anICL_11_PLATFORM). Should I go ahead?My understanding is that this is already following the new inheritance model. There's already a
GEN11_FEATURESand it doesn't include anICL_11_PLATFORMbecause it doesn't need to (and CNL also doesn't have aCNL_PLATFORM). What do you think needs to be changed?
Quoted 6 lines
Quoted 1 line
The one thing I do see we lack is the
__initconstkeyword.As a minimum there is the
__initconstkeyword and the fact that the .gen value is not assigned inside theGENX_FEATURESfor any other platform. As for the PLATFORM, we can do that now or wait until we need it, I guess it doesn't matter.
On the current code only gen9_lp add the .gen inside the feature blocks, core platform adds on the platform definition.
I can't remember if this was intentional to make inheritance clear on platforms that reuse display from one gen and core from another or it was just a mistake.
Anyways, for this patch here with __initconst I believe it follows the current standard so:
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0/* * 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/intel_device_info.c +1
-0@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), + PLATFORM_NAME(ICELAKE), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +0
-0@@ -69,6 +69,8 @@ enum intel_platform {
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h enum intel_platform { · line 75
Quoted 7 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Em Qua, 2018-01-10 às 10:22 -0800, Rodrigo Vivi escreveu:
Quoted 119 lines · Oscar Mateo
Quoted 110 lines · Paulo Zanoni
Quoted 98 lines
Em Ter, 2018-01-09 às 15:59 -0800, Oscar Mateo escreveu:
Quoted 88 lines · Paulo Zanoni
Quoted 87 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support
and new features coming in following patches.v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2595,6 +2595,7 @@ intel_info(const struct
drm_i915_private*dev_priv)
#defineIS_GEMINILAKE(dev_priv)IS_PLATFORM(dev_pri
v,INTEL_GEMINILAKE)
#defineIS_COFFEELAKE(dev_priv)IS_PLATFORM(dev_pri
v,INTEL_COFFEELAKE)
#defineIS_CANNONLAKE(dev_priv)IS_PLATFORM(dev_pri
v,INTEL_CANNONLAKE)
+#defineIS_ICELAKE(dev_priv)IS_PLATFORM(dev_priv,INTEL_ICELAKE)
#defineIS_MOBILE(dev_priv)((dev_priv)-Quoted 1 line
info.is_mobile)
#define
IS_HSW_EARLY_SDV(dev_priv)(IS_HASWELL(dev_priv)
&& \
(INTEL_DEVID(dev_priv)
&0xFF00) ==0x0C00)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2706,6 +2707,7 @@ intel_info(const struct
drm_i915_private*dev_priv)
#defineIS_GEN8(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(7)))
#defineIS_GEN9(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(8)))
#defineIS_GEN10(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(9)))
+#defineIS_GEN11(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(10)))
#defineIS_LP(dev_priv)(INTEL_INFO(dev_priv)-Quoted 1 line
is_lp)#define
IS_GEN9_LP(dev_priv)(IS_GEN9(dev_priv)&&IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +11
-0@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE , + .is_alpha_support =1 , + .has_resource_streamer =0 ,Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { · line 594
Quoted 2 lines
drivers/gpu/drm/i915/i915_pci.c +2
-0+}; +This needs to change to fit the new GEN features inheritance organization recently introduced by Rodrigo (with a
GEN11_FEATURES
and I
guess anICL_11_PLATFORM). Should I go ahead?Quoted 8 lines
My understanding is that this is already following the new inheritance
model. There's already aGEN11_FEATURESand it doesn't include anICL_11_PLATFORMbecause it doesn't need to (and CNL also doesn't have aCNL_PLATFORM). What do you think needs to be changed?The one thing I do see we lack is the
__initconstkeyword.Quoted 7 lines
As a minimum there is the
__initconstkeyword and the fact that the .gen
value is not assigned inside theGENX_FEATURESfor any other platform. As
for the PLATFORM, we can do that now or wait until we need it, I guess it
doesn't matter.
Quoted 7 lines
On the current code only
gen9_lpadd the .gen inside the feature blocks,
core platform adds on the platform definition.
I can't remember if this was intentional to make inheritance clear on platforms that reuse display from one gen and core from another or it was
just a mistake.
Yeah, there's some confusion on gen 8/9.
Quoted 7 lines
Anyways, for this patch here with
__initconstI believe it follows the
current standard so:Reviewed-by Rodrigo Vivi <[email protected]>
So, since you're the maintainer and I assume you're leading by example, can I start giving R-B tags to my own patches too? :)
Anyway, I also think the next version I'm going to submit will be fine, so I suppose a r-b from me would count.
If anybody disagrees the current plan is mergeable please say so.
Quoted 35 lines
Quoted 35 lines
Quoted 35 lines
Quoted 35 lines
Quoted 35 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0/* * 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/intel_device_info.c +1
-0@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), +PLATFORM_NAME (ICELAKE ), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -69,6 +69,8 @@ enum intel_platform {INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE, +/* gen11 */
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.h enum intel_platform { · line 75
Quoted 3 lines
drivers/gpu/drm/i915/intel_device_info.h +1
-0+INTEL_ICELAKE , INTEL_MAX_PLATFORMS };_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Quoted 136 lines · Paulo Zanoni
Em Qua, 2018-01-10 às 10:22 -0800, Rodrigo Vivi escreveu:
Quoted 119 lines · Oscar Mateo
Quoted 110 lines · Paulo Zanoni
Quoted 98 lines
Em Ter, 2018-01-09 às 15:59 -0800, Oscar Mateo escreveu:
Quoted 88 lines · Paulo Zanoni
Quoted 87 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
This is just an initial Icelake definition. PCI IDs, Icelake support
and new features coming in following patches.v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2595,6 +2595,7 @@ intel_info(const struct
drm_i915_private*dev_priv)
#defineIS_GEMINILAKE(dev_priv)IS_PLATFORM(dev_pri
v,INTEL_GEMINILAKE)
#defineIS_COFFEELAKE(dev_priv)IS_PLATFORM(dev_pri
v,INTEL_COFFEELAKE)
#defineIS_CANNONLAKE(dev_priv)IS_PLATFORM(dev_pri
v,INTEL_CANNONLAKE)
+#defineIS_ICELAKE(dev_priv)IS_PLATFORM(dev_priv,INTEL_ICELAKE)
#defineIS_MOBILE(dev_priv)((dev_priv)-Quoted 1 line
info.is_mobile)
#define
IS_HSW_EARLY_SDV(dev_priv)(IS_HASWELL(dev_priv)
&& \
(INTEL_DEVID(dev_priv)
&0xFF00) ==0x0C00)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2706,6 +2707,7 @@ intel_info(const struct
drm_i915_private*dev_priv)
#defineIS_GEN8(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(7)))
#defineIS_GEN9(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(8)))
#defineIS_GEN10(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(9)))
+#defineIS_GEN11(dev_priv)(!!((dev_priv)-Quoted 1 line
info.gen_mask &
BIT(10)))
#defineIS_LP(dev_priv)(INTEL_INFO(dev_priv)-Quoted 1 line
is_lp)#define
IS_GEN9_LP(dev_priv)(IS_GEN9(dev_priv)&&IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +11
-0@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE , + .is_alpha_support =1 , + .has_resource_streamer =0 ,Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { · line 594
Quoted 2 lines
drivers/gpu/drm/i915/i915_pci.c +2
-0+}; +This needs to change to fit the new GEN features inheritance organization recently introduced by Rodrigo (with a
GEN11_FEATURES
and I
guess anICL_11_PLATFORM). Should I go ahead?Quoted 8 lines
My understanding is that this is already following the new inheritance
model. There's already aGEN11_FEATURESand it doesn't include anICL_11_PLATFORMbecause it doesn't need to (and CNL also doesn't have aCNL_PLATFORM). What do you think needs to be changed?The one thing I do see we lack is the
__initconstkeyword.Quoted 7 lines
As a minimum there is the
__initconstkeyword and the fact that the .gen
value is not assigned inside theGENX_FEATURESfor any other platform. As
for the PLATFORM, we can do that now or wait until we need it, I guess it
doesn't matter.Quoted 7 lines
On the current code only
gen9_lpadd the .gen inside the feature blocks,
core platform adds on the platform definition.
I can't remember if this was intentional to make inheritance clear on platforms that reuse display from one gen and core from another or it was
just a mistake.Yeah, there's some confusion on gen 8/9.
Quoted 6 lines
Anyways, for this patch here with
__initconstI believe it follows the
current standard so:
Quoted 4 lines
Quoted 1 line
Reviewed-by Rodrigo Vivi <[email protected]>So, since you're the maintainer and I assume you're leading by example, can I start giving R-B tags to my own patches too? :)
hahaha I didn't remember and I didn't noticed it! :)
the important part is that we have now 2 people agreeing with this patch
Quoted 49 lines
Anyway, I also think the next version I'm going to submit will be fine, so I suppose a r-b from me would count.
If anybody disagrees the current plan is mergeable please say so.
Quoted 43 lines
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0/* * 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/intel_device_info.c +1
-0@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), +PLATFORM_NAME (ICELAKE ), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +0
-0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h enum intel_platform { · line 75
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0@@ -69,6 +69,8 @@ enum intel_platform {INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
In reply to Paulo ZanoniQuoting Paulo Zanoni (2018-01-09 23:23:10)
Quoted 3 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
One thing to check, is the marketing term now UHD Graphics? -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Em Qua, 2018-01-10 às 10:15 +0000, Chris Wilson escreveu:
Quoted 6 lines
Quoting Paulo Zanoni (2018-01-09 23:23:10)
Quoted 3 lines
From: Rodrigo Vivi <[email protected]>
Icelake is a Intel® Processor containing Intel® HD Graphics.
One thing to check, is the marketing term now UHD Graphics?
Marketing names are not available yet for ICL, and Kernel commit messages should definitely not be considered reliable for that matter. From what I can see on ark.intel.com, in the 8th generation everything is UHD. But, for example, the Iris Plus products on the 7th generation don't even have "HD" in their names, so I guess we've been misleading in the previous commit messages too. I'll change the wording so it doesn't look like we're announcing marketing names.
(also, I'm not a native English speaker, but shouldn't we "s/ a / an /" there too?)
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/27 drm/i915/icl: Add initial Icelake definitions.
In reply to Paulo ZanoniFrom: Rodrigo Vivi <[email protected]>
Icelake is an Intel® Processor containing an Intel® Graphics Controller.
This is just an initial Icelake definition. PCI IDs, Icelake support and new features coming in following patches.
v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add the ICL_FEATURES macro (Kelvin Gardiner).
v4 (from Paulo): Add missing __initconst (Paulo) and say "graphics controller" instead of something that looks like an official marketing name but isn't (Chris).
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 18 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2595,6 +2595,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEMINILAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE)#define IS_COFFEELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE) +#define IS_ICELAKE (dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)#define IS_MOBILE (dev_priv) ((dev_priv)->info.is_mobile)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
@@ -2706,6 +2707,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(9))) +#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(10)))#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +13 -0
@@ -579,6 +579,19 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = { .gt = 2, }; +#define GEN11_FEATURES \ + GEN10_FEATURES, \ + .gen = 11, \ + .ddb_size = 2048, \ + .has_csr = 0 + +static const struct intel_device_info intel_icelake_11_info__initconst = { +GEN11_FEATURES , + .platform =INTEL_ICELAKE , + .is_alpha_support =1 , + .has_resource_streamer =0 , +}; +/* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -56,6 +56,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (GEMINILAKE ),PLATFORM_NAME (COFFEELAKE ),PLATFORM_NAME (CANNONLAKE ), + PLATFORM_NAME(ICELAKE), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +2 -0
@@ -69,6 +69,8 @@ enum intel_platform {INTEL_COFFEELAKE ,/* gen10 */ INTEL_CANNONLAKE , +/* gen11 */ +INTEL_ICELAKE , INTEL_MAX_PLATFORMS };
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH 01/27] drm/i915/icl: Add initial Icelake definitions.
Quoted 14 lines · Paulo Zanoni
From: Rodrigo Vivi <[email protected]>
Icelake is an Intel® Processor containing an Intel® Graphics Controller.
This is just an initial Icelake definition. PCI IDs, Icelake support and new features coming in following patches.
v2: Add .ddb_size and .has_guc (Michal Wajdeczko).
v3: Add theICL_FEATURESmacro (Kelvin Gardiner).
v4 (from Paulo): Add missing__initconst(Paulo) and say "graphics controller" instead of something that looks like an official marketing name but isn't (Chris).
Quoted 4 lines
Reviewed-by Rodrigo Vivi <[email protected]>Reviewed-by Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>
No-no, I don't think Rodrigo meant this in seriousness :)
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/27 drm/i915/icl: Add the ICL PCI IDs
In reply to Paulo ZanoniThis is the current PCI ID list in our documentation.
Let's leave the _gt#_ part out for now since our current documentation is not 100% clear and we don't need this info now anyway.
v2: Use the new ICL_11 naming (Kelvin Gardiner).
v3: Latest IDs as per BSpec (Oscar).
v4: Make it compile (Paulo).
v5: Remove comments (Lucas).
v6: Multile rebases (Paulo).
--- drivers/gpu/drm/i915/i915_pci.c | 1 + include/drm/i915_pciids.h | 11 +++++++++++ 2 files changed, 12 insertions(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_CFL_U_GT3_IDS (&intel_coffeelake_gt3_info),INTEL_CNL_U_GT2_IDS (&intel_cannonlake_gt2_info),INTEL_CNL_Y_GT2_IDS (&intel_cannonlake_gt2_info), +INTEL_ICL_11_IDS (&intel_icelake_11_info), {0, 0, 0} };MODULE_DEVICE_TABLE (pci, pciidlist);
include/drm/i915_pciids.h +11 -0
@@ -434,4 +434,15 @@INTEL_CNL_U_GT2_IDS (info), \ INTEL_CNL_Y_GT2_IDS(info) +#define INTEL_ICL_11_IDS (info) \ + INTEL_VGA_DEVICE(0x8A50, info), \ + INTEL_VGA_DEVICE(0x8A51, info), \ + INTEL_VGA_DEVICE(0x8A5C, info), \ + INTEL_VGA_DEVICE(0x8A5D, info), \ + INTEL_VGA_DEVICE(0x8A52, info), \ + INTEL_VGA_DEVICE(0x8A5A, info), \ + INTEL_VGA_DEVICE(0x8A5B, info), \ + INTEL_VGA_DEVICE(0x8A71, info), \ + INTEL_VGA_DEVICE(0x8A70, info) +#endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/27] drm/i915/icl: Add the ICL PCI IDs
Quoted 26 lines · Paulo Zanoni
This is the current PCI ID list in our documentation.
Let's leave the _gt#_ part out for now since our current documentation is not 100% clear and we don't need this info now anyway.
v2: Use the new
ICL_11naming (Kelvin Gardiner).
v3: Latest IDs as per BSpec (Oscar).
v4: Make it compile (Paulo).
v5: Remove comments (Lucas).
v6: Multile rebases (Paulo).Reviewed-by Anuj Phogat <[email protected]> (v1)Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 + include/drm/i915_pciids.h | 11 +++++++++++ 2 files changed, 12 insertions(+)drivers/gpu/drm/i915/i915_pci.c +0
-0
drivers/gpu/drm/i915/i915_pci.c static const struct pci_device_id pciidlist[] = { · line 656
Quoted 6 lines
drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_CFL_U_GT3_IDS (&intel_coffeelake_gt3_info),INTEL_CNL_U_GT2_IDS (&intel_cannonlake_gt2_info),INTEL_CNL_Y_GT2_IDS (&intel_cannonlake_gt2_info), +INTEL_ICL_11_IDS (&intel_icelake_11_info), {0, 0, 0} };
And apparently the latest trend here is to add the GT info (as per a patch from Lionel) which we are also not doing in ICL yet.
Quoted 11 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0MODULE_DEVICE_TABLE (pci, pciidlist);include/drm/i915_pciids.h +2
-0@@ -434,4 +434,15 @@INTEL_CNL_U_GT2_IDS (info), \ INTEL_CNL_Y_GT2_IDS(info) +#define INTEL_ICL_11_IDS (info) \ + INTEL_VGA_DEVICE(0x8A50, info), \
include/drm/i915_pciids.h line 448
Quoted 10 lines
include/drm/i915_pciids.h +9
-0+INTEL_VGA_DEVICE (0x8A51 , info), \ +INTEL_VGA_DEVICE (0x8A5C , info), \ +INTEL_VGA_DEVICE (0x8A5D , info), \ +INTEL_VGA_DEVICE (0x8A52 , info), \ +INTEL_VGA_DEVICE (0x8A5A , info), \ +INTEL_VGA_DEVICE (0x8A5B , info), \ +INTEL_VGA_DEVICE (0x8A71 , info), \ +INTEL_VGA_DEVICE (0x8A70 , info) + #endif /* _I915_PCIIDS_H */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/27] drm/i915/icl: Add the ICL PCI IDs
Quoted 23 lines · Oscar Mateo
Quoted 21 lines · Paulo Zanoni
This is the current PCI ID list in our documentation.
Let's leave the _gt#_ part out for now since our current documentation is not 100% clear and we don't need this info now anyway.
v2: Use the new
ICL_11naming (Kelvin Gardiner).
v3: Latest IDs as per BSpec (Oscar).
v4: Make it compile (Paulo).
v5: Remove comments (Lucas).
v6: Multile rebases (Paulo).Reviewed-by Anuj Phogat <[email protected]> (v1)Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 + include/drm/i915_pciids.h | 11 +++++++++++ 2 files changed, 12 insertions(+)
Quoted 15 lines
drivers/gpu/drm/i915/i915_pci.c static const struct pci_device_id pciidlist[] = { · line 656
Quoted 12 lines
drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_CFL_U_GT3_IDS (&intel_coffeelake_gt3_info),INTEL_CNL_U_GT2_IDS (&intel_cannonlake_gt2_info),INTEL_CNL_Y_GT2_IDS (&intel_cannonlake_gt2_info), +INTEL_ICL_11_IDS (&intel_icelake_11_info), {0, 0, 0} };And apparently the latest trend here is to add the GT info (as per a patch from Lionel) which we are also not doing in ICL yet.
With a reason... that I think is well explained in the commit message, isn't it?
Lucas De Marchi
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0MODULE_DEVICE_TABLE (pci, pciidlist);include/drm/i915_pciids.h +0
-0@@ -434,4 +434,15 @@INTEL_CNL_U_GT2_IDS (info), \INTEL_CNL_Y_GT2_IDS (info)
Quoted 14 lines
include/drm/i915_pciids.h line 448
Quoted 12 lines
include/drm/i915_pciids.h +11
-0+#define INTEL_ICL_11_IDS (info) \ + INTEL_VGA_DEVICE(0x8A50, info), \ + INTEL_VGA_DEVICE(0x8A51, info), \ + INTEL_VGA_DEVICE(0x8A5C, info), \ + INTEL_VGA_DEVICE(0x8A5D, info), \ + INTEL_VGA_DEVICE(0x8A52, info), \ + INTEL_VGA_DEVICE(0x8A5A, info), \ + INTEL_VGA_DEVICE(0x8A5B, info), \ + INTEL_VGA_DEVICE(0x8A71, info), \ + INTEL_VGA_DEVICE(0x8A70, info) +#endif /* _I915_PCIIDS_H */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/27] drm/i915/icl: Add the ICL PCI IDs
Quoted 37 lines · Lucas
Quoted 22 lines · Oscar Mateo
Quoted 21 lines · Paulo Zanoni
This is the current PCI ID list in our documentation.
Let's leave the _gt#_ part out for now since our current documentation is not 100% clear and we don't need this info now anyway.
v2: Use the new
ICL_11naming (Kelvin Gardiner).
v3: Latest IDs as per BSpec (Oscar).
v4: Make it compile (Paulo).
v5: Remove comments (Lucas).
v6: Multile rebases (Paulo).Reviewed-by Anuj Phogat <[email protected]> (v1)Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 + include/drm/i915_pciids.h | 11 +++++++++++ 2 files changed, 12 insertions(+)Quoted 14 lines
drivers/gpu/drm/i915/i915_pci.c static const struct pci_device_id pciidlist[] = { · line 656
Quoted 12 lines
drivers/gpu/drm/i915/i915_pci.c +1
-0@@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_CFL_U_GT3_IDS (&intel_coffeelake_gt3_info),INTEL_CNL_U_GT2_IDS (&intel_cannonlake_gt2_info),INTEL_CNL_Y_GT2_IDS (&intel_cannonlake_gt2_info), +INTEL_ICL_11_IDS (&intel_icelake_11_info), {0, 0, 0} };And apparently the latest trend here is to add the GT info (as per a patch from Lionel) which we are also not doing in ICL yet.
Quoted 3 lines
With a reason... that I think is well explained in the commit message, isn't it?
Yeah, I just saw that warning in the commit message (right when I was wondering how to represent a GT 0.5...). Paulo: are we still happy with this patch as is? Also: do we want to split the table into Y & U skus like CNL does now?
Quoted 11 lines
Lucas De Marchi
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/i915_pci.c +0
-0MODULE_DEVICE_TABLE (pci, pciidlist);include/drm/i915_pciids.h +0
-0@@ -434,4 +434,15 @@INTEL_CNL_U_GT2_IDS (info), \INTEL_CNL_Y_GT2_IDS (info)
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
include/drm/i915_pciids.h +4
-0+#define INTEL_ICL_11_IDS (info) \ + INTEL_VGA_DEVICE(0x8A50, info), \ + INTEL_VGA_DEVICE(0x8A51, info), \ + INTEL_VGA_DEVICE(0x8A5C, info), \Quoted 8 lines
include/drm/i915_pciids.h line 448
Quoted 8 lines
include/drm/i915_pciids.h +7
-0+INTEL_VGA_DEVICE (0x8A5D , info), \ +INTEL_VGA_DEVICE (0x8A52 , info), \ +INTEL_VGA_DEVICE (0x8A5A , info), \ +INTEL_VGA_DEVICE (0x8A5B , info), \ +INTEL_VGA_DEVICE (0x8A71 , info), \ + INTEL_VGA_DEVICE(0x8A70, info) +#endif /* _I915_PCIIDS_H */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/27] drm/i915/icl: Add the ICL PCI IDs
Em Ter, 2018-01-09 às 17:07 -0800, Oscar Mateo escreveu:
Quoted 49 lines · Lucas
Quoted 42 lines · Oscar Mateo
Quoted 32 lines · Paulo Zanoni
Quoted 31 lines
This is the current PCI ID list in our documentation.
Let's leave the _gt#_ part out for now since our current documentation
is not 100% clear and we don't need this info now anyway.v2: Use the new
ICL_11naming (Kelvin Gardiner).
v3: Latest IDs as per BSpec (Oscar).
v4: Make it compile (Paulo).
v5: Remove comments (Lucas).
v6: Multile rebases (Paulo).Reviewed-by Anuj Phogat <[email protected]> (v1)Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 1 + include/drm/i915_pciids.h | 11 +++++++++++ 2 files changed, 12 insertions(+)drivers/gpu/drm/i915/i915_pci.c +0
-0@@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {INTEL_CFL_U_GT3_IDS (&intel_coffeelake_gt3_info), INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),Quoted 8 lines
drivers/gpu/drm/i915/i915_pci.c static const struct pci_device_id pciidlist[] = { · line 656
Quoted 4 lines
drivers/gpu/drm/i915/i915_pci.c +1
-0INTEL_CNL_Y_GT2_IDS (&intel_cannonlake_gt2_info), +INTEL_ICL_11_IDS (&intel_icelake_11_info), {0, 0, 0} };And apparently the latest trend here is to add the GT info (as per a
patch from Lionel) which we are also not doing in ICL yet.Quoted 4 lines
With a reason... that I think is well explained in the commit message, isn't
it?
Quoted 5 lines
Yeah, I just saw that warning in the commit message (right when I was
wondering how to represent a GT 0.5...). Paulo: are we still happy with
this patch as is?
Well, I am :).
Quoted 2 lines
Also: do we want to split the table into Y & U skus like CNL does now?
There's a CNL patch from Rodrigo unsplitting the Y&U thing.
Quoted 13 lines
Quoted 13 lines
Lucas De Marchi
Quoted 10 lines
Quoted 10 lines
MODULE_DEVICE_TABLE(pci, pciidlist);include/drm/i915_pciids.h +0
-0@@ -434,4 +434,15 @@INTEL_CNL_U_GT2_IDS (info), \INTEL_CNL_Y_GT2_IDS (info)
Quoted 14 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
include/drm/i915_pciids.h +4
-0+#define INTEL_ICL_11_IDS (info) \ + INTEL_VGA_DEVICE(0x8A50, info), \ + INTEL_VGA_DEVICE(0x8A51, info), \ + INTEL_VGA_DEVICE(0x8A5C, info), \Quoted 8 lines
Quoted 8 lines
include/drm/i915_pciids.h line 448
Quoted 8 lines
include/drm/i915_pciids.h +7
-0+INTEL_VGA_DEVICE (0x8A5D , info), \ +INTEL_VGA_DEVICE (0x8A52 , info), \ +INTEL_VGA_DEVICE (0x8A5A , info), \ +INTEL_VGA_DEVICE (0x8A5B , info), \ +INTEL_VGA_DEVICE (0x8A71 , info), \ + INTEL_VGA_DEVICE(0x8A70, info) +#endif /* _I915_PCIIDS_H */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/27 drm/i915/icl: add icelake_init_clock_gating()
In reply to Paulo ZanoniFor now it does nothing, except for avoiding a MISSING_CASE.
v2: Rebase.
--- drivers/gpu/drm/i915/intel_pm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +8 -1
@@ -8423,6 +8423,11 @@ static void cnp_init_clock_gating(struct drm_i915_private *dev_priv) CNP_PWM_CGE_GATING_DISABLE); } +static void icl_init_clock_gating (struct drm_i915_private *dev_priv) +{ + +} +static void cnl_init_clock_gating (struct drm_i915_private *dev_priv) {u32 val;
@@ -8933,7 +8938,9 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)*/ void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) { -if (IS_CANNONLAKE (dev_priv)) +if (IS_ICELAKE (dev_priv)) + dev_priv->display.init_clock_gating = icl_init_clock_gating; +else if (IS_CANNONLAKE (dev_priv)) dev_priv->display.init_clock_gating = cnl_init_clock_gating;else if (IS_COFFEELAKE (dev_priv)) dev_priv->display.init_clock_gating = cfl_init_clock_gating;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH 03/27] drm/i915/icl: add icelake_init_clock_gating()
Quoted 5 lines · Paulo Zanoni
For now it does nothing, except for avoiding a
MISSING_CASE.v2: Rebase.
Signed-off-by Paulo Zanoni <[email protected]>
<SNIP>
drivers/gpu/drm/i915/intel_pm.c static void cnp_init_clock_gating(struct drm_i915_private *dev_priv) · line 8429
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +4
-0+static void icl_init_clock_gating (struct drm_i915_private *dev_priv) +{ + +}
Is this intentionally empty? If we don't foresee need for this in future, we could factor it out at higher level.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/27] drm/i915/icl: add icelake_init_clock_gating()
Em Qua, 2018-01-10 às 11:39 +0200, Joonas Lahtinen escreveu:
Quoted 9 lines · Paulo Zanoni
Quoted 5 lines
For now it does nothing, except for avoiding a
MISSING_CASE.v2: Rebase.
Signed-off-by Paulo Zanoni <[email protected]><SNIP>
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c static void cnp_init_clock_gating(struct drm_i915_private *dev_priv) · line 8429
Quoted 5 lines
+static void
icl_init_clock_gating(struct drm_i915_private *dev_priv)drivers/gpu/drm/i915/intel_pm.c +3
-0+{ + +}Is this intentionally empty? If we don't foresee need for this in future, we could factor it out at higher level.
It's not in this series, but there exist patches that add code to it. To be sent soon.
Having the empty function here will make conflicts a little easier to handle later.
Quoted 2 lines
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/27 drm/i915/icl: Icelake interrupt register addresses and bits
In reply to Paulo ZanoniFrom: Tvrtko Ursulin <[email protected]>
MMIO addresses and register definition for the new interrupt registers in Gen11.
v2: Removed spelt out VCS and VECS bit definitions. (Daniel Vetter)
v3: Adjust VCS and VECS. (Daniele Ceraolo Spurio)
v4: Bikeshedding (Paulo).
--- drivers/gpu/drm/i915/i915_reg.h | 63 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +63 -0
@@ -6956,6 +6956,69 @@ enum {#define GEN8_PCU_IIR _MMIO(0x444e8)#define GEN8_PCU_IER _MMIO(0x444ec) +#define GEN11_GFX_MSTR_IRQ _MMIO(0x190010) +#define GEN11_MASTER_IRQ (1 << 31) +#define GEN11_PCU_IRQ (1 << 30) +#define GEN11_DISPLAY_IRQ (1 << 16) +#define GEN11_GT_DW_IRQ (x) (1 << (x)) +#define GEN11_GT_DW1_IRQ (1 << 1) +#define GEN11_GT_DW0_IRQ (1 << 0) + +#define GEN11_DISPLAY_INT_CTL _MMIO(0x44200) +#define GEN11_DISPLAY_IRQ_ENABLE (1 << 31) +#define GEN11_AUDIO_CODEC_IRQ (1 << 24) +#define GEN11_DE_PCH_IRQ (1 << 23) +#define GEN11_DE_MISC_IRQ (1 << 22) +#define GEN11_DE_PORT_IRQ (1 << 20) +#define GEN11_DE_PIPE_C (1 << 18) +#define GEN11_DE_PIPE_B (1 << 17) +#define GEN11_DE_PIPE_A (1 << 16) + +#define GEN11_GT_INTR_DW0 _MMIO(0x190018) +#define GEN11_CSME (31) +#define GEN11_GUNIT (28) +#define GEN11_GUC (25) +#define GEN11_WDPERF (20) +#define GEN11_KCR (19) +#define GEN11_GTPM (16) +#define GEN11_BCS (15) +#define GEN11_RCS0 (0) + +#define GEN11_GT_INTR_DW1 _MMIO(0x19001c) +#define GEN11_VECS (x) (31 - (x)) +#define GEN11_VCS (x) (x) + +#define GEN11_GT_INTR_DW (x) _MMIO(0x190018 + (x * 4)) + +#define GEN11_INTR_IDENTITY_REG0 _MMIO(0x190060) +#define GEN11_INTR_IDENTITY_REG1 _MMIO(0x190064) +#define GEN11_INTR_DATA_VALID (1 << 31) +#define GEN11_INTR_ENGINE_MASK (0xffff) + +#define GEN11_INTR_IDENTITY_REG (x) _MMIO(0x190060 + (x * 4)) + +#define GEN11_IIR_REG0_SELECTOR _MMIO(0x190070) +#define GEN11_IIR_REG1_SELECTOR _MMIO(0x190074) + +#define GEN11_IIR_REG_SELECTOR (x) _MMIO(0x190070 + (x * 4)) + +#define GEN11_RENDER_COPY_INTR_ENABLE _MMIO(0x190030) +#define GEN11_VCS_VECS_INTR_ENABLE _MMIO(0x190034) +#define GEN11_GUC_SG_INTR_ENABLE _MMIO(0x190038) +#define GEN11_GPM_WGBOXPERF_INTR_ENABLE _MMIO(0x19003c) +#define GEN11_CRYPTO_RSVD_INTR_ENABLE _MMIO(0x190040) +#define GEN11_GUNIT_CSME_INTR_ENABLE _MMIO(0x190044) + +#define GEN11_RCS0_RSVD_INTR_MASK _MMIO(0x190090) +#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0) +#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8) +#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac) +#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0) +#define GEN11_GUC_SG_INTR_MASK _MMIO(0x1900e8) +#define GEN11_GPM_WGBOXPERF_INTR_MASK _MMIO(0x1900ec) +#define GEN11_CRYPTO_RSVD_INTR_MASK _MMIO(0x1900f0) +#define GEN11_GUNIT_CSME_INTR_MASK _MMIO(0x1900f4) +#define ILK_DISPLAY_CHICKEN2 _MMIO(0x42004)/* Required on all Ironlake and Sandybridge according to the B-Spec. */ #define ILK_ELPIN_409_SELECT (1 << 25)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/27] drm/i915/icl: Icelake interrupt register addresses and bits
Em Ter, 2018-01-09 às 21:23 -0200, Paulo Zanoni escreveu:
Quoted 8 lines
From: Tvrtko Ursulin <[email protected]>
MMIO addresses and register definition for the new interrupt registers in Gen11.
v2: Removed spelt out VCS and VECS bit definitions. (Daniel Vetter)
v3: Adjust VCS and VECS. (Daniele Ceraolo Spurio)
v4: Bikeshedding (Paulo).
Addresses and bits seem to match the spec.
Quoted 2 lines
Cc Ceraolo Spurio, Daniele <[email protected]>
The "," char above seems to confuse git send-email.
Quoted 83 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 63 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)drivers/gpu/drm/i915/i915_reg.h +63
-0@@ -6956,6 +6956,69 @@ enum {#define GEN8_PCU_IIR _MMIO(0x444e8)#define GEN8_PCU_IER _MMIO(0x444ec) +#define GEN11_GFX_MSTR_IRQ _MMIO(0x190010) +#define GEN11_MASTER_IRQ (1 << 31) +#define GEN11_PCU_IRQ (1 << 30) +#define GEN11_DISPLAY_IRQ (1 << 16) +#define GEN11_GT_DW_IRQ (x) (1 << (x)) +#define GEN11_GT_DW1_IRQ (1 << 1) +#define GEN11_GT_DW0_IRQ (1 << 0) + +#define GEN11_DISPLAY_INT_CTL _MMIO(0x44200) +#define GEN11_DISPLAY_IRQ_ENABLE (1 << 31) +#define GEN11_AUDIO_CODEC_IRQ (1 << 24) +#define GEN11_DE_PCH_IRQ (1 << 23) +#define GEN11_DE_MISC_IRQ (1 << 22) +#define GEN11_DE_PORT_IRQ (1 << 20) +#define GEN11_DE_PIPE_C (1 << 18) +#define GEN11_DE_PIPE_B (1 << 17) +#define GEN11_DE_PIPE_A (1 << 16) + +#define GEN11_GT_INTR_DW0 _MMIO(0x190018) +#define GEN11_CSME (31) +#define GEN11_GUNIT (28) +#define GEN11_GUC (25) +#define GEN11_WDPERF (20) +#define GEN11_KCR (19) +#define GEN11_GTPM (16) +#define GEN11_BCS (15) +#define GEN11_RCS0 (0) + +#define GEN11_GT_INTR_DW1 _MMIO(0x19001c) +#define GEN11_VECS (x) (31 - (x)) +#define GEN11_VCS (x) (x) + +#define GEN11_GT_INTR_DW (x) _MMIO(0x190018 + (x * 4)) + +#define GEN11_INTR_IDENTITY_REG0 _MMIO(0x190060) +#define GEN11_INTR_IDENTITY_REG1 _MMIO(0x190064) +#define GEN11_INTR_DATA_VALID (1 << 31) +#define GEN11_INTR_ENGINE_MASK (0xffff) + +#define GEN11_INTR_IDENTITY_REG (x) _MMIO(0x190060 + (x * 4)) + +#define GEN11_IIR_REG0_SELECTOR _MMIO(0x190070) +#define GEN11_IIR_REG1_SELECTOR _MMIO(0x190074) + +#define GEN11_IIR_REG_SELECTOR (x) _MMIO(0x190070 + (x * 4)) + +#define GEN11_RENDER_COPY_INTR_ENABLE _MMIO(0x190030) +#define GEN11_VCS_VECS_INTR_ENABLE _MMIO(0x190034) +#define GEN11_GUC_SG_INTR_ENABLE _MMIO(0x190038) +#define GEN11_GPM_WGBOXPERF_INTR_ENABLE _MMIO(0x19003c) +#define GEN11_CRYPTO_RSVD_INTR_ENABLE _MMIO(0x190040) +#define GEN11_GUNIT_CSME_INTR_ENABLE _MMIO(0x190044) + +#define GEN11_RCS0_RSVD_INTR_MASK _MMIO(0x190090) +#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0) +#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8) +#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac) +#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0) +#define GEN11_GUC_SG_INTR_MASK _MMIO(0x1900e8) +#define GEN11_GPM_WGBOXPERF_INTR_MASK _MMIO(0x1900ec) +#define GEN11_CRYPTO_RSVD_INTR_MASK _MMIO(0x1900f0) +#define GEN11_GUNIT_CSME_INTR_MASK _MMIO(0x1900f4) +#define ILK_DISPLAY_CHICKEN2 _MMIO(0x42004)/* Required on all Ironlake and Sandybridge according to the B-Spec. */
Quoted 1 line
#define
ILK_ELPIN_409_SELECT(1 << 25)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/27 drm/i915/icl: Show interrupt registers in debugfs
In reply to Paulo ZanoniFrom: Tvrtko Ursulin <[email protected]>
v2: Update for POR changes. (Daniele Ceraolo Spurio)
--- drivers/gpu/drm/i915/i915_debugfs.c | 82 ++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +81 -1
@@ -702,6 +702,64 @@ static int i915_interrupt_info(struct seq_file *m, void *data) i, I915_READ(GEN8_GT_IER(i))); } +seq_printf (m,"PCU interrupt mask:\t%08x\n" , +I915_READ (GEN8_PCU_IMR )); +seq_printf (m,"PCU interrupt identity:\t%08x\n" , +I915_READ (GEN8_PCU_IIR )); +seq_printf (m,"PCU interrupt enable:\t%08x\n" , +I915_READ (GEN8_PCU_IER )); + }else if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"Master Interrupt Control: %08x\n" , +I915_READ (GEN11_GFX_MSTR_IRQ )); + +seq_printf (m,"Render/Copy Intr Enable: %08x\n" , +I915_READ (GEN11_RENDER_COPY_INTR_ENABLE )); +seq_printf (m,"VCS/VECS Intr Enable: %08x\n" , +I915_READ (GEN11_VCS_VECS_INTR_ENABLE )); +seq_printf (m,"GUC/SG Intr Enable:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_ENABLE )); +seq_printf (m,"GPM/WGBOXPERF Intr Enable: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_ENABLE )); +seq_printf (m,"Crypto Intr Enable:\t %08x\n" , +I915_READ (GEN11_CRYPTO_RSVD_INTR_ENABLE )); +seq_printf (m,"GUnit/CSME Intr Enable:\t %08x\n" , +I915_READ (GEN11_GUNIT_CSME_INTR_ENABLE )); + +seq_printf (m,"Display Interrupt Control:\t%08x\n" , +I915_READ (GEN11_DISPLAY_INT_CTL )); + +for_each_pipe (dev_priv, pipe) { +if (!intel_display_power_is_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) { +seq_printf (m,"Pipe %c power disabled\n" , +pipe_name (pipe)); +continue ; + } +seq_printf (m,"Pipe %c IMR:\t%08x\n" , +pipe_name (pipe), +I915_READ (GEN8_DE_PIPE_IMR (pipe))); +seq_printf (m,"Pipe %c IIR:\t%08x\n" , +pipe_name (pipe), +I915_READ (GEN8_DE_PIPE_IIR (pipe))); +seq_printf (m,"Pipe %c IER:\t%08x\n" , +pipe_name (pipe), +I915_READ (GEN8_DE_PIPE_IER (pipe))); + } + +seq_printf (m,"Display Engine port interrupt mask:\t%08x\n" , +I915_READ (GEN8_DE_PORT_IMR )); +seq_printf (m,"Display Engine port interrupt identity:\t%08x\n" , +I915_READ (GEN8_DE_PORT_IIR )); +seq_printf (m,"Display Engine port interrupt enable:\t%08x\n" , +I915_READ (GEN8_DE_PORT_IER )); + +seq_printf (m,"Display Engine misc interrupt mask:\t%08x\n" , +I915_READ (GEN8_DE_MISC_IMR )); +seq_printf (m,"Display Engine misc interrupt identity:\t%08x\n" , +I915_READ (GEN8_DE_MISC_IIR )); +seq_printf (m,"Display Engine misc interrupt enable:\t%08x\n" , +I915_READ (GEN8_DE_MISC_IER )); +seq_printf (m,"PCU interrupt mask:\t%08x\n" ,I915_READ (GEN8_PCU_IMR )); seq_printf(m, "PCU interrupt identity:\t%08x\n",
@@ -845,13 +903,35 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Graphics Interrupt mask: %08x\n" ,I915_READ (GTIMR )); } -if (INTEL_GEN (dev_priv) >=6 ) { + +if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"RCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_RCS0_RSVD_INTR_MASK )); +seq_printf (m,"BCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_BCS_RSVD_INTR_MASK )); +seq_printf (m,"VCS0/VCS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS0_VCS1_INTR_MASK )); +seq_printf (m,"VCS2/VCS3 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS2_VCS3_INTR_MASK )); +seq_printf (m,"VECS0/VECS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VECS0_VECS1_INTR_MASK )); +seq_printf (m,"GUC/SG Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_MASK )); +seq_printf (m,"GPM/WGBOXPERF Intr Mask: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_MASK )); +seq_printf (m,"Crypto Intr Mask:\t %08x\n" , +I915_READ (GEN11_CRYPTO_RSVD_INTR_MASK )); +seq_printf (m,"Gunit/CSME Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUNIT_CSME_INTR_MASK )); + + }else if (INTEL_GEN (dev_priv) >=6 ) {for_each_engine (engine, dev_priv, id) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine)); } } +intel_runtime_pm_put (dev_priv);return 0 ;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/27] drm/i915/icl: Show interrupt registers in debugfs
Quoted 16 lines · Paulo Zanoni
From: Tvrtko Ursulin <[email protected]>
v2: Update for POR changes. (Daniele Ceraolo Spurio)
Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Cc Ceraolo Spurio, Daniele <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 82 ++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data) · line 710
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-0@@ -702,6 +702,64 @@ static int i915_interrupt_info(struct seq_file *m, void *data) i, I915_READ(GEN8_GT_IER(i))); } +seq_printf (m,"PCU interrupt mask:\t%08x\n" , +I915_READ (GEN8_PCU_IMR )); +seq_printf (m,"PCU interrupt identity:\t%08x\n" , +I915_READ (GEN8_PCU_IIR )); +seq_printf (m,"PCU interrupt enable:\t%08x\n" , +I915_READ (GEN8_PCU_IER ));
^^^ This looks dodgy, like it was butchered by the auto-rebaser, vvv ?
Tvrtko
Quoted 83 lines
drivers/gpu/drm/i915/i915_debugfs.c +74
-1+ }else if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"Master Interrupt Control: %08x\n" , +I915_READ (GEN11_GFX_MSTR_IRQ )); + +seq_printf (m,"Render/Copy Intr Enable: %08x\n" , +I915_READ (GEN11_RENDER_COPY_INTR_ENABLE )); +seq_printf (m,"VCS/VECS Intr Enable: %08x\n" , +I915_READ (GEN11_VCS_VECS_INTR_ENABLE )); +seq_printf (m,"GUC/SG Intr Enable:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_ENABLE )); +seq_printf (m,"GPM/WGBOXPERF Intr Enable: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_ENABLE )); +seq_printf (m,"Crypto Intr Enable:\t %08x\n" , +I915_READ (GEN11_CRYPTO_RSVD_INTR_ENABLE )); +seq_printf (m,"GUnit/CSME Intr Enable:\t %08x\n" , +I915_READ (GEN11_GUNIT_CSME_INTR_ENABLE )); + +seq_printf (m,"Display Interrupt Control:\t%08x\n" , +I915_READ (GEN11_DISPLAY_INT_CTL )); + +for_each_pipe (dev_priv, pipe) { +if (!intel_display_power_is_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) { +seq_printf (m,"Pipe %c power disabled\n" , +pipe_name (pipe)); +continue ; + } +seq_printf (m,"Pipe %c IMR:\t%08x\n" , +pipe_name (pipe), +I915_READ (GEN8_DE_PIPE_IMR (pipe))); +seq_printf (m,"Pipe %c IIR:\t%08x\n" , +pipe_name (pipe), +I915_READ (GEN8_DE_PIPE_IIR (pipe))); +seq_printf (m,"Pipe %c IER:\t%08x\n" , +pipe_name (pipe), +I915_READ (GEN8_DE_PIPE_IER (pipe))); + } + +seq_printf (m,"Display Engine port interrupt mask:\t%08x\n" , +I915_READ (GEN8_DE_PORT_IMR )); +seq_printf (m,"Display Engine port interrupt identity:\t%08x\n" , +I915_READ (GEN8_DE_PORT_IIR )); +seq_printf (m,"Display Engine port interrupt enable:\t%08x\n" , +I915_READ (GEN8_DE_PORT_IER )); + +seq_printf (m,"Display Engine misc interrupt mask:\t%08x\n" , +I915_READ (GEN8_DE_MISC_IMR )); +seq_printf (m,"Display Engine misc interrupt identity:\t%08x\n" , +I915_READ (GEN8_DE_MISC_IIR )); +seq_printf (m,"Display Engine misc interrupt enable:\t%08x\n" , +I915_READ (GEN8_DE_MISC_IER )); +seq_printf (m,"PCU interrupt mask:\t%08x\n" ,I915_READ (GEN8_PCU_IMR )); seq_printf(m, "PCU interrupt identity:\t%08x\n",@@ -845,13 +903,35 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Graphics Interrupt mask: %08x\n" ,I915_READ (GTIMR )); } -if (INTEL_GEN (dev_priv) >=6 ) { + +if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"RCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_RCS0_RSVD_INTR_MASK )); +seq_printf (m,"BCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_BCS_RSVD_INTR_MASK )); +seq_printf (m,"VCS0/VCS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS0_VCS1_INTR_MASK )); +seq_printf (m,"VCS2/VCS3 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS2_VCS3_INTR_MASK )); +seq_printf (m,"VECS0/VECS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VECS0_VECS1_INTR_MASK )); +seq_printf (m,"GUC/SG Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_MASK )); +seq_printf (m,"GPM/WGBOXPERF Intr Mask: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_MASK )); +seq_printf (m,"Crypto Intr Mask:\t %08x\n" , +I915_READ (GEN11_CRYPTO_RSVD_INTR_MASK )); +seq_printf (m,"Gunit/CSME Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUNIT_CSME_INTR_MASK )); + + }else if (INTEL_GEN (dev_priv) >=6 ) {
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data) · line 937
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0for_each_engine (engine, dev_priv, id) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine)); } } +intel_runtime_pm_put (dev_priv);return 0 ;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/27] drm/i915/icl: Show interrupt registers in debugfs
Em Qua, 2018-01-10 às 09:02 +0000, Tvrtko Ursulin escreveu:
Quoted 23 lines · Paulo Zanoni
Quoted 22 lines
From: Tvrtko Ursulin <[email protected]>
v2: Update for POR changes. (Daniele Ceraolo Spurio)
Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Cc Ceraolo Spurio, Daniele <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 82 ++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -702,6 +702,64 @@ static int i915_interrupt_info(struct seq_file *m, void *data) i, I915_READ(GEN8_GT_IER(i))); }
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data) · line 710
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+seq_printf (m,"PCU interrupt mask:\t%08x\n" , +I915_READ (GEN8_PCU_IMR )); +seq_printf (m,"PCU interrupt identity:\t%08x\n" , +I915_READ (GEN8_PCU_IIR )); +seq_printf (m,"PCU interrupt enable:\t%08x\n" , +I915_READ (GEN8_PCU_IER ));^^^ This looks dodgy, like it was butchered by the auto-rebaser, vvv ?
With the patch applied, both the CHV and the ICL branches of the if statement include these 3 seq_printf() calls.
The patch is "adding" these printfs to the CHV part of the if, but if you see below it "moves" the printfs that were originally part of CHV to ICL. I think it's just a case of diff organizing things in a different way than a human would.
Now, if we don't want to print these things on ICL too, then that's an error.
Quoted 119 lines
Tvrtko
Quoted 116 lines
drivers/gpu/drm/i915/i915_debugfs.c +14
-0+ }else if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"Master Interrupt Control: %08x\n" , +I915_READ (GEN11_GFX_MSTR_IRQ )); + +seq_printf (m,"Render/Copy Intr Enable: %08x\n" , +I915_READ (GEN11_RENDER_COPY_INTR_ENABLE )); +seq_printf (m,"VCS/VECS Intr Enable: %08x\n" , +I915_READ (GEN11_VCS_VECS_INTR_ENABLE )); +seq_printf (m,"GUC/SG Intr Enable:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_ENABLE )); +seq_printf (m,"GPM/WGBOXPERF Intr Enable: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_ENAB LE)); + seq_printf(m, "Crypto Intr Enable:\t %08x\n", + I915_READ(GEN11_CRYPTO_RSVD_INTR_ENABLE));
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ seq_printf(m, "GUnit/CSME IntrEnable:\t %08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+I915_READ (GEN11_GUNIT_CSME_INTR_ENABLE ));
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ + seq_printf(m, "Display InterruptControl:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +4
-0+ I915_READ(GEN11_DISPLAY_INT_CTL)); + +for_each_pipe (dev_priv, pipe) { + if(!intel_display_power_is_enabled(dev_priv,
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ POWER_DOMAIN_PIPE(pipe))) {
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ seq_printf(m, "Pipe %c powerdisabled\n",
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+ pipe_name(pipe)); +continue ; + } + seq_printf(m, "Pipe %c IMR:\t%08x\n", + pipe_name(pipe), + I915_READ(GEN8_DE_PIPE_IMR(pipe)));
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ seq_printf(m, "Pipe %c IIR:\t%08x\n", + pipe_name(pipe), + I915_READ(GEN8_DE_PIPE_IIR(pipe)));
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ seq_printf(m, "Pipe %c IER:\t%08x\n", + pipe_name(pipe), + I915_READ(GEN8_DE_PIPE_IER(pipe)));
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ } + + seq_printf(m, "Display Engine port interruptmask:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_PORT_IMR)); + seq_printf(m, "Display Engine port interruptidentity:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_PORT_IIR)); + seq_printf(m, "Display Engine port interruptenable:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ I915_READ(GEN8_DE_PORT_IER)); + + seq_printf(m, "Display Engine misc interruptmask:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_MISC_IMR)); + seq_printf(m, "Display Engine misc interruptidentity:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_MISC_IIR)); + seq_printf(m, "Display Engine misc interruptenable:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +24
-1+ I915_READ(GEN8_DE_MISC_IER)); +seq_printf (m,"PCU interrupt mask:\t%08x\n" ,I915_READ (GEN8_PCU_IMR )); seq_printf(m, "PCU interrupt identity:\t%08x\n",@@ -845,13 +903,35 @@ static int i915_interrupt_info(struct seq_file *m, void *data) seq_printf(m, "Graphics Interrupt mask: %08x\n",I915_READ (GTIMR )); } -if (INTEL_GEN (dev_priv) >=6 ) { + +if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"RCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_RCS0_RSVD_INTR_MASK )); +seq_printf (m,"BCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_BCS_RSVD_INTR_MASK )); +seq_printf (m,"VCS0/VCS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS0_VCS1_INTR_MASK )); +seq_printf (m,"VCS2/VCS3 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS2_VCS3_INTR_MASK )); +seq_printf (m,"VECS0/VECS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VECS0_VECS1_INTR_MASK )) ; +seq_printf (m,"GUC/SG Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_MASK )); +seq_printf (m,"GPM/WGBOXPERF Intr Mask: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_MASK )); +seq_printf (m,"Crypto Intr Mask:\t %08x\n" , +I915_READ (GEN11_CRYPTO_RSVD_INTR_MASK )) ; +seq_printf (m,"Gunit/CSME Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUNIT_CSME_INTR_MASK )); + + }else if (INTEL_GEN (dev_priv) >=6 ) {for_each_engine (engine, dev_priv, id) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n", engine->name,
I915_READ_IMR(engine));
}
}
+
intel_runtime_pm_put(dev_priv);
Quoted 2 lines
Quoted 2 lines
return 0;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/27] drm/i915/icl: Show interrupt registers in debugfs
Quoted 34 lines · Paulo Zanoni
Em Qua, 2018-01-10 às 09:02 +0000, Tvrtko Ursulin escreveu:
Quoted 23 lines · Paulo Zanoni
Quoted 22 lines
From: Tvrtko Ursulin <[email protected]>
v2: Update for POR changes. (Daniele Ceraolo Spurio)
Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Cc Ceraolo Spurio, Daniele <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 82 ++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -702,6 +702,64 @@ static int i915_interrupt_info(struct seq_file *m, void *data) i, I915_READ(GEN8_GT_IER(i))); }Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data) · line 710
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+seq_printf (m,"PCU interrupt mask:\t%08x\n" , +I915_READ (GEN8_PCU_IMR )); +seq_printf (m,"PCU interrupt identity:\t%08x\n" , +I915_READ (GEN8_PCU_IIR )); +seq_printf (m,"PCU interrupt enable:\t%08x\n" , +I915_READ (GEN8_PCU_IER ));^^^ This looks dodgy, like it was butchered by the auto-rebaser, vvv ?
Quoted 7 lines
With the patch applied, both the CHV and the ICL branches of the if statement include these 3
seq_printf()calls.The patch is "adding" these printfs to the CHV part of the if, but if you see below it "moves" the printfs that were originally part of CHV to ICL. I think it's just a case of diff organizing things in a different way than a human would.
My bad, I think I misread the alignment levels in the diff!
Regards,
Tvrtko
Quoted 122 lines
Now, if we don't want to print these things on ICL too, then that's an error.
Quoted 119 lines
Tvrtko
Quoted 116 lines
drivers/gpu/drm/i915/i915_debugfs.c +14
-0+ }else if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"Master Interrupt Control: %08x\n" , +I915_READ (GEN11_GFX_MSTR_IRQ )); + +seq_printf (m,"Render/Copy Intr Enable: %08x\n" , +I915_READ (GEN11_RENDER_COPY_INTR_ENABLE )); +seq_printf (m,"VCS/VECS Intr Enable: %08x\n" , +I915_READ (GEN11_VCS_VECS_INTR_ENABLE )); +seq_printf (m,"GUC/SG Intr Enable:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_ENABLE )); +seq_printf (m,"GPM/WGBOXPERF Intr Enable: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_ENAB LE)); + seq_printf(m, "Crypto Intr Enable:\t %08x\n", + I915_READ(GEN11_CRYPTO_RSVD_INTR_ENABLE));
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ seq_printf(m, "GUnit/CSME IntrEnable:\t %08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+I915_READ (GEN11_GUNIT_CSME_INTR_ENABLE ));
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ + seq_printf(m, "Display InterruptControl:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +4
-0+ I915_READ(GEN11_DISPLAY_INT_CTL)); + +for_each_pipe (dev_priv, pipe) { + if(!intel_display_power_is_enabled(dev_priv,
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ POWER_DOMAIN_PIPE(pipe))) {
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+ seq_printf(m, "Pipe %c powerdisabled\n",
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+ pipe_name(pipe)); +continue ; + } + seq_printf(m, "Pipe %c IMR:\t%08x\n", + pipe_name(pipe), + I915_READ(GEN8_DE_PIPE_IMR(pipe)));
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ seq_printf(m, "Pipe %c IIR:\t%08x\n", + pipe_name(pipe), + I915_READ(GEN8_DE_PIPE_IIR(pipe)));
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ seq_printf(m, "Pipe %c IER:\t%08x\n", + pipe_name(pipe), + I915_READ(GEN8_DE_PIPE_IER(pipe)));
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ } + + seq_printf(m, "Display Engine port interruptmask:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_PORT_IMR)); + seq_printf(m, "Display Engine port interruptidentity:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_PORT_IIR)); + seq_printf(m, "Display Engine port interruptenable:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+ I915_READ(GEN8_DE_PORT_IER)); + + seq_printf(m, "Display Engine misc interruptmask:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_MISC_IMR)); + seq_printf(m, "Display Engine misc interruptidentity:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+ I915_READ(GEN8_DE_MISC_IIR)); + seq_printf(m, "Display Engine misc interruptenable:\t%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c +24
-1+ I915_READ(GEN8_DE_MISC_IER)); +seq_printf (m,"PCU interrupt mask:\t%08x\n" ,I915_READ (GEN8_PCU_IMR )); seq_printf(m, "PCU interrupt identity:\t%08x\n",@@ -845,13 +903,35 @@ static int i915_interrupt_info(struct seq_file *m, void *data) seq_printf(m, "Graphics Interrupt mask: %08x\n",I915_READ (GTIMR )); } -if (INTEL_GEN (dev_priv) >=6 ) { + +if (INTEL_GEN (dev_priv) >=11 ) { +seq_printf (m,"RCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_RCS0_RSVD_INTR_MASK )); +seq_printf (m,"BCS Intr Mask:\t %08x\n" , +I915_READ (GEN11_BCS_RSVD_INTR_MASK )); +seq_printf (m,"VCS0/VCS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS0_VCS1_INTR_MASK )); +seq_printf (m,"VCS2/VCS3 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VCS2_VCS3_INTR_MASK )); +seq_printf (m,"VECS0/VECS1 Intr Mask:\t %08x\n" , +I915_READ (GEN11_VECS0_VECS1_INTR_MASK )) ; +seq_printf (m,"GUC/SG Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUC_SG_INTR_MASK )); +seq_printf (m,"GPM/WGBOXPERF Intr Mask: %08x\n" , +I915_READ (GEN11_GPM_WGBOXPERF_INTR_MASK )); +seq_printf (m,"Crypto Intr Mask:\t %08x\n" , +I915_READ (GEN11_CRYPTO_RSVD_INTR_MASK )) ; +seq_printf (m,"Gunit/CSME Intr Mask:\t %08x\n" , +I915_READ (GEN11_GUNIT_CSME_INTR_MASK )); + + }else if (INTEL_GEN (dev_priv) >=6 ) {for_each_engine (engine, dev_priv, id) { seq_printf(m, "Graphics Interrupt mask (%s): %08x\n", engine->name,I915_READ_IMR(engine)); } }+
intel_runtime_pm_put(dev_priv);
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
return 0;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/27 drm/i915/icl: Prepare for more rings
In reply to Paulo ZanoniFrom: Tvrtko Ursulin <[email protected]>
Gen11 will add more VCS and VECS rings so prepare the infrastructure to support that.
Bspec: 7021
v2: Rebase.
v3: Rebase.
v4: Rebase.
v5: Rebase.
v6:
- Update for POR changes. (Daniele Ceraolo Spurio)
- Add provisional guc engine ids - to be checked and confirmed.
v7:
- Rebased.
- Added the new ring masks.
- Added the new HW ids.
v8:
- Introduce I915_MAX_VCS/VECS to avoid magic numbers (Michal)
v9: increase MAX_ENGINE_INSTANCE to 3
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_gem.h | 2 +- drivers/gpu/drm/i915/i915_reg.h | 5 ++++- drivers/gpu/drm/i915/intel_device_info.c | 3 +++ drivers/gpu/drm/i915/intel_device_info.h | 4 +++- drivers/gpu/drm/i915/intel_ringbuffer.h | 9 ++++++++- 6 files changed, 22 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -2719,6 +2719,9 @@ intel_info(const struct drm_i915_private *dev_priv)#define BLT_RING ENGINE_MASK(BCS)#define VEBOX_RING ENGINE_MASK(VECS)#define BSD2_RING ENGINE_MASK(VCS2) +#define BSD3_RING ENGINE_MASK(VCS3) +#define BSD4_RING ENGINE_MASK(VCS4) +#define VEBOX2_RING ENGINE_MASK(VECS2)#define ALL_ENGINES (~0)#define HAS_ENGINE (dev_priv, id) \
drivers/gpu/drm/i915/i915_gem.h +1 -1
@@ -54,6 +54,6 @@#define GEM_TRACE (...) do { } while (0)#endif -#define I915_NUM_ENGINES 5 +#define I915_NUM_ENGINES 8#endif /* __I915_GEM_H__ */
drivers/gpu/drm/i915/i915_reg.h +4 -1
@@ -178,6 +178,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define BCS_HW 2#define VECS_HW 3#define VCS2_HW 4 +#define VCS3_HW 6 +#define VCS4_HW 7 +#define VECS2_HW 12/* Engine class */
@@ -188,7 +191,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define OTHER_CLASS 4#define MAX_ENGINE_CLASS 4 -#define MAX_ENGINE_INSTANCE 1 +#define MAX_ENGINE_INSTANCE 3/* PCI config space */
drivers/gpu/drm/i915/intel_device_info.c +3 -0
@@ -489,6 +489,9 @@ void intel_device_info_runtime_init(struct intel_device_info *info) info->num_scalers[PIPE_C ] =1 ; } +BUILD_BUG_ON (I915_NUM_ENGINES > +sizeof (intel_ring_mask_t) *BITS_PER_BYTE ); +/* * Skylake and Broxton currently don't expose the topmost plane as its * use is exclusive with the legacy cursor and we only want to expose
drivers/gpu/drm/i915/intel_device_info.h +3 -1
@@ -125,6 +125,8 @@ struct sseu_dev_info { u8 has_eu_pg:1; }; +typedef u8 intel_ring_mask_t ; +struct intel_device_info {u16 device_id;u16 gen_mask;
@@ -132,7 +134,7 @@ struct intel_device_info {u8 gen;u8 gt;/* GT number, 0 if undefined */ u8 num_rings; -u8 ring_mask;/* Rings supported by the HW */ +intel_ring_mask_t ring_mask;/* Rings supported by the HW */ enum intel_platform platform;u32 platform_mask;
drivers/gpu/drm/i915/intel_ringbuffer.h +8 -1
@@ -158,6 +158,9 @@ struct i915_ctx_workarounds {struct drm_i915_gem_request ; +#define I915_MAX_VCS 4 +#define I915_MAX_VECS 2 +/* * Engine IDs definitions. * Keep instances of the same type engine together.
@@ -167,8 +170,12 @@ enum intel_engine_id {BCS ,VCS ,VCS2 , +VCS3 , +VCS4 , #define _VCS(n) (VCS + (n)) -VECS +VECS , + VECS2 +#define _VECS (n) (VECS + (n)) };struct i915_priolist {
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/27] drm/i915/icl: Prepare for more rings
Quoted 21 lines · Paulo Zanoni
From: Tvrtko Ursulin <[email protected]>
Gen11 will add more VCS and VECS rings so prepare the infrastructure to support that.
Bspec: 7021
v2: Rebase.
v3: Rebase.
v4: Rebase.
v5: Rebase.
v6:
- Update for POR changes. (Daniele Ceraolo Spurio)
- Add provisional guc engine ids - to be checked and confirmed.
v7:
- Rebased.
- Added the new ring masks.
- Added the new HW ids.
v8:
- Introduce I915_MAX_VCS/VECS to avoid magic numbers (Michal)
Quoted 4 lines
v9: increase
MAX_ENGINE_INSTANCEto 3Cc Michal Wajdeczko <[email protected]>Reviewed-by Oscar Mateo <[email protected]>
My r-b stands. I also have an s-o-b, but IIRC the only thing I did to this patch was rebasing it on upstream at some point.
Quoted 116 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_gem.h | 2 +- drivers/gpu/drm/i915/i915_reg.h | 5 ++++- drivers/gpu/drm/i915/intel_device_info.c | 3 +++ drivers/gpu/drm/i915/intel_device_info.h | 4 +++- drivers/gpu/drm/i915/intel_ringbuffer.h | 9 ++++++++- 6 files changed, 22 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -2719,6 +2719,9 @@ intel_info(const struct drm_i915_private *dev_priv)#define BLT_RING ENGINE_MASK(BCS)#define VEBOX_RING ENGINE_MASK(VECS)#define BSD2_RING ENGINE_MASK(VCS2) +#define BSD3_RING ENGINE_MASK(VCS3) +#define BSD4_RING ENGINE_MASK(VCS4) +#define VEBOX2_RING ENGINE_MASK(VECS2)#define ALL_ENGINES (~0)#define HAS_ENGINE (dev_priv, id) \drivers/gpu/drm/i915/i915_gem.h +1
-1@@ -54,6 +54,6 @@#define GEM_TRACE (...) do { } while (0)#endif -#define I915_NUM_ENGINES 5 +#define I915_NUM_ENGINES 8#endif /* __I915_GEM_H__ */ drivers/gpu/drm/i915/i915_reg.h +4
-1@@ -178,6 +178,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define BCS_HW 2#define VECS_HW 3#define VCS2_HW 4 +#define VCS3_HW 6 +#define VCS4_HW 7 +#define VECS2_HW 12/* Engine class */ @@ -188,7 +191,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define OTHER_CLASS 4#define MAX_ENGINE_CLASS 4 -#define MAX_ENGINE_INSTANCE 1 +#define MAX_ENGINE_INSTANCE 3/* PCI config space */ drivers/gpu/drm/i915/intel_device_info.c +3
-0@@ -489,6 +489,9 @@ void intel_device_info_runtime_init(struct intel_device_info *info) info->num_scalers[PIPE_C ] =1 ; } +BUILD_BUG_ON (I915_NUM_ENGINES > +sizeof (intel_ring_mask_t) *BITS_PER_BYTE ); +/* * Skylake and Broxton currently don't expose the topmost plane as its * use is exclusive with the legacy cursor and we only want to expose drivers/gpu/drm/i915/intel_device_info.h +3
-1@@ -125,6 +125,8 @@ struct sseu_dev_info { u8 has_eu_pg:1; }; +typedef u8 intel_ring_mask_t ; +struct intel_device_info {u16 device_id;u16 gen_mask;@@ -132,7 +134,7 @@ struct intel_device_info {u8 gen;u8 gt;/* GT number, 0 if undefined */ u8 num_rings; -u8 ring_mask;/* Rings supported by the HW */ +intel_ring_mask_t ring_mask;/* Rings supported by the HW */ enum intel_platform platform;u32 platform_mask;drivers/gpu/drm/i915/intel_ringbuffer.h +3
-0@@ -158,6 +158,9 @@ struct i915_ctx_workarounds {struct drm_i915_gem_request ; +#define I915_MAX_VCS 4 +#define I915_MAX_VECS 2 +/* * Engine IDs definitions. * Keep instances of the same type engine together. @@ -167,8 +170,12 @@ enum intel_engine_id {BCS ,VCS , VCS2,
drivers/gpu/drm/i915/intel_ringbuffer.h enum intel_engine_id { · line 181
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +5
-1+VCS3 , +VCS4 , #define _VCS(n) (VCS + (n)) -VECS +VECS , + VECS2 +#define _VECS (n) (VECS + (n)) };struct i915_priolist {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/27 drm/i915/icl: Interrupt handling
In reply to Paulo ZanoniFrom: Tvrtko Ursulin <[email protected]>
v2: Rebase.
v3:
* Remove DPF, it has been removed from SKL+.
* Fix -internal rebase wrt. execlists interrupt handling.
v4: Rebase.
v5:
* Updated for POR changes. (Daniele Ceraolo Spurio)
* Merged with irq handling fixes by Daniele Ceraolo Spurio:
* Simplify the code by using gen8_cs_irq_handler.
* Fix interrupt handling for the upstream kernel.
v6:
* Remove early bringup debug messages (Tvrtko)
* Add NB about arbitrary spin wait timeout (Tvrtko)
v7 (from Paulo):
* Don't try to write RO bits to registers.
* Don't check for PCH types that don't exist. PCH interrupts are not here yet.
--- drivers/gpu/drm/i915/i915_irq.c | 210 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_pm.c | 7 +- 2 files changed, 216 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +210 -0
@@ -415,6 +415,9 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)if (READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +spin_lock_irq (&dev_priv->irq_lock);WARN_ON_ONCE (rps->pm_iir);WARN_ON_ONCE (I915_READ (gen6_pm_iir (dev_priv)) & dev_priv->pm_rps_events);
@@ -431,6 +434,9 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)if (!READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +spin_lock_irq (&dev_priv->irq_lock); rps->interrupts_enabled = false;
@@ -2751,6 +2757,131 @@ static void __fini_wedge(struct wedge_me *w) (W )->i915; \ __fini_wedge((W))) +static __always_inline void +gen11_cs_irq_handler (struct intel_engine_cs *engine,u32 iir) +{ +gen8_cs_irq_handler (engine, iir,0 ); +} + +static irqreturn_t +gen11_gt_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl) +{ +irqreturn_t ret =IRQ_NONE ; +u16 irq[2 ][32 ]; +u32 dw, ident; +unsigned long tmp; +unsigned int bank, bit, engine; +unsigned long wait_start, wait_end; + +memset (irq,0 ,sizeof (irq)); + +for (bank =0 ; bank <2 ; bank++) { +if (master_ctl &GEN11_GT_DW_IRQ (bank)) { + dw =I915_READ_FW (GEN11_GT_INTR_DW (bank)); +if (!dw) +DRM_ERROR ("GT_INTR_DW%u blank!\n" , bank); + tmp = dw; +for_each_set_bit (bit, &tmp,32 ) { +I915_WRITE_FW (GEN11_IIR_REG_SELECTOR (bank),1 << bit); + wait_start =local_clock () >>10 ; +/* NB: Specs do not specify how long to spin wait. +* Taking 100us as an educated guess */ + wait_end = wait_start +100 ; +do { + ident =I915_READ_FW (GEN11_INTR_IDENTITY_REG (bank)); + }while (!(ident &GEN11_INTR_DATA_VALID ) && + !time_after ((unsigned long )local_clock () >>10 , wait_end)); + +if (!(ident &GEN11_INTR_DATA_VALID )) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u timed out!\n" , + bank, bit); + + irq[bank][bit] = ident &GEN11_INTR_ENGINE_MASK ; +if (!irq[bank][bit]) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u blank!\n" , + bank, bit); +I915_WRITE_FW (GEN11_INTR_IDENTITY_REG (bank), ident); + } +I915_WRITE_FW (GEN11_GT_INTR_DW (bank), dw); + } + } + +if (irq[0 ][GEN11_RCS0 ]) { +gen11_cs_irq_handler (dev_priv->engine[RCS ], + irq[0 ][GEN11_RCS0 ]); + ret =IRQ_HANDLED ; + } + +if (irq[0 ][GEN11_BCS ]) { +gen11_cs_irq_handler (dev_priv->engine[BCS ], + irq[0 ][GEN11_BCS ]); + ret =IRQ_HANDLED ; + } + +for (engine =0 ; engine <4 ; engine++) { +if (irq[1 ][GEN11_VCS (engine)]) { +gen11_cs_irq_handler (dev_priv->engine[_VCS (engine)], + irq[1 ][GEN11_VCS (engine)]); + ret =IRQ_HANDLED ; + } + } + +for (engine =0 ; engine <2 ; engine++) { +if (irq[1 ][GEN11_VECS (engine)]) { +gen11_cs_irq_handler (dev_priv->engine[_VECS (engine)], + irq[1 ][GEN11_VECS (engine)]); + ret =IRQ_HANDLED ; + } + } + +if (irq[0 ][GEN11_GTPM ] & dev_priv->pm_rps_events) { + ret =IRQ_HANDLED ; +gen6_rps_irq_handler (dev_priv, tmp); + } + +return ret; +} + +static irqreturn_t gen11_irq_handler (int irq,void *arg) +{ +struct drm_device *dev = arg; +struct drm_i915_private *dev_priv = dev->dev_private; +u32 master_ctl; +u32 disp_ctl; +irqreturn_t ret; + +if (!intel_irqs_enabled (dev_priv)) +return IRQ_NONE ; + + master_ctl =I915_READ_FW (GEN11_GFX_MSTR_IRQ ); + + master_ctl &= ~GEN11_MASTER_IRQ ; +if (!master_ctl) +return IRQ_NONE ; + +/* Disable interrupts. */ +I915_WRITE_FW (GEN11_GFX_MSTR_IRQ ,0 ); + +/* IRQs are synced during runtime_suspend, we don't require a wakeref */ +disable_rpm_wakeref_asserts (dev_priv); + +/* Find, clear, then process each source of interrupt. */ + ret =gen11_gt_irq_handler (dev_priv, master_ctl); + +if (master_ctl &GEN11_DISPLAY_IRQ ) { + disp_ctl =I915_READ_FW (GEN11_DISPLAY_INT_CTL ); + ret |=gen8_de_irq_handler (dev_priv, disp_ctl); + } + +/* Acknowledge and enable interrupts. */ +I915_WRITE_FW (GEN11_GFX_MSTR_IRQ ,GEN11_MASTER_IRQ | master_ctl); +POSTING_READ_FW (GEN11_GFX_MSTR_IRQ ); + +enable_rpm_wakeref_asserts (dev_priv); + +return ret; +} +/** * i915_reset_device - do process context error handling work * @dev_priv: i915 device private
@@ -3164,6 +3295,42 @@ static void gen8_irq_reset(struct drm_device *dev)ibx_irq_reset (dev_priv); } +static void gen11_gt_irq_reset (struct drm_i915_private *dev_priv) +{ +/* Disable RCS, BCS, VCS and VECS class engines. */ +I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE ,0 ); +I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE ,0 ); + +/* Restore masks irqs on RCS, BCS, VCS and VECS engines. */ +I915_WRITE (GEN11_RCS0_RSVD_INTR_MASK , ~0 ); +I915_WRITE (GEN11_BCS_RSVD_INTR_MASK , ~0 ); +I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~0 ); +I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~0 ); +I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~0 ); +} + +static void gen11_irq_reset (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +int pipe; + +I915_WRITE (GEN11_GFX_MSTR_IRQ ,0 ); +POSTING_READ (GEN11_GFX_MSTR_IRQ ); + +gen11_gt_irq_reset (dev_priv); + +I915_WRITE (GEN11_DISPLAY_INT_CTL ,0 ); + +for_each_pipe (dev_priv, pipe) +if (intel_display_power_is_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) +GEN8_IRQ_RESET_NDX (DE_PIPE , pipe); + +GEN3_IRQ_RESET (GEN8_DE_PORT_ ); +GEN3_IRQ_RESET (GEN8_DE_MISC_ ); +GEN3_IRQ_RESET (GEN8_PCU_ ); +} +void gen8_irq_power_well_post_enable (struct drm_i915_private *dev_priv,u8 pipe_mask) {
@@ -3658,6 +3825,41 @@ static int gen8_irq_postinstall(struct drm_device *dev)return 0 ; } +static void gen11_gt_irq_postinstall (struct drm_i915_private *dev_priv) +{ +const u32 irqs =GT_RENDER_USER_INTERRUPT |GT_CONTEXT_SWITCH_INTERRUPT ; + +BUILD_BUG_ON (irqs &0xffff0000 ); + +/* Enable RCS, BCS, VCS and VECS class interrupts. */ +I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE , irqs <<16 | irqs); +I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE , irqs <<16 | irqs); + +/* Unmask irqs on RCS, BCS, VCS and VECS engines. */ +I915_WRITE (GEN11_RCS0_RSVD_INTR_MASK , ~(irqs <<16 )); +I915_WRITE (GEN11_BCS_RSVD_INTR_MASK , ~(irqs <<16 )); +I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~(irqs | irqs <<16 )); +I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~(irqs | irqs <<16 )); +I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~(irqs | irqs <<16 )); + + dev_priv->pm_imr =0xffffffff ;/* TODO */ +} + +static int gen11_irq_postinstall (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + +gen11_gt_irq_postinstall (dev_priv); +gen8_de_irq_postinstall (dev_priv); + +I915_WRITE (GEN11_DISPLAY_INT_CTL ,GEN11_DISPLAY_IRQ_ENABLE ); + +I915_WRITE (GEN11_GFX_MSTR_IRQ ,GEN11_MASTER_IRQ ); +POSTING_READ (GEN11_GFX_MSTR_IRQ ); + +return 0 ; +} +static int cherryview_irq_postinstall (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -4106,6 +4308,14 @@ void intel_irq_init(struct drm_i915_private *dev_priv) dev->driver->enable_vblank = i965_enable_vblank; dev->driver->disable_vblank = i965_disable_vblank; dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup; + }else if (INTEL_GEN (dev_priv) >=11 ) { + dev->driver->irq_handler = gen11_irq_handler; + dev->driver->irq_preinstall = gen11_irq_reset; + dev->driver->irq_postinstall = gen11_irq_postinstall; + dev->driver->irq_uninstall = gen11_irq_reset; + dev->driver->enable_vblank = gen8_enable_vblank; + dev->driver->disable_vblank = gen8_disable_vblank; + dev_priv->display.hpd_irq_setup = spt_hpd_irq_setup; }else if (INTEL_GEN (dev_priv) >=8 ) { dev->driver->irq_handler = gen8_irq_handler; dev->driver->irq_preinstall = gen8_irq_reset;
drivers/gpu/drm/i915/intel_pm.c +6 -1
@@ -7957,7 +7957,10 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) dev_priv->gt_pm.rc6.enabled = true;/* force RC6 disabling */ intel_disable_gt_powersave (dev_priv); -gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) +gen6_reset_rps_interrupts (dev_priv); +else +WARN_ON_ONCE (1 ); }static inline void intel_disable_llc_pstate (struct drm_i915_private *i915)
@@ -8070,6 +8073,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rps (dev_priv); + }else if (WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 )) { +/* TODO */ }else if (INTEL_GEN (dev_priv) >=9 ) {gen9_enable_rps (dev_priv); }else if (IS_BROADWELL (dev_priv)) {
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH 07/27] drm/i915/icl: Interrupt handling
Quoted 30 lines · Paulo Zanoni
From: Tvrtko Ursulin <[email protected]>
v2: Rebase.
v3:
* Remove DPF, it has been removed from SKL+.
* Fix -internal rebase wrt. execlists interrupt handling.v4: Rebase.
v5:
* Updated for POR changes. (Daniele Ceraolo Spurio)
* Merged with irq handling fixes by Daniele Ceraolo Spurio:
* Simplify the code by usinggen8_cs_irq_handler.
* Fix interrupt handling for the upstream kernel.v6:
* Remove early bringup debug messages (Tvrtko)
* Add NB about arbitrary spin wait timeout (Tvrtko)v7 (from Paulo):
* Don't try to write RO bits to registers.
* Don't check for PCH types that don't exist. PCH interrupts are not here yet.Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>
<SNIP>
Quoted 12 lines
+++
b/drivers/gpu/drm/i915/i915_irq.cdrivers/gpu/drm/i915/i915_irq.c +3
-0@@ -415,6 +415,9 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)if (READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +spin_lock_irq (&dev_priv->irq_lock);WARN_ON_ONCE (rps->pm_iir);WARN_ON_ONCE (I915_READ (gen6_pm_iir (dev_priv)) & dev_priv->pm_rps_events);
drivers/gpu/drm/i915/i915_irq.c void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv) · line 439
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0@@ -431,6 +434,9 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)if (!READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +
These should be GEM_BUG_ON at most and should be the first thing in function.
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0spin_lock_irq (&dev_priv->irq_lock); rps->interrupts_enabled = false;@@ -2751,6 +2757,131 @@ static void __fini_wedge(struct wedge_me *w) (W )->i915; \
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2767
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +8
-0__fini_wedge((W))) +static __always_inline void +gen11_cs_irq_handler (struct intel_engine_cs *engine,u32 iir) +{ +gen8_cs_irq_handler (engine, iir,0 ); +} + +static irqreturn_t +gen11_gt_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl)
This function could use some readability :)
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2779
Quoted 12 lines
drivers/gpu/drm/i915/i915_irq.c +12
-0+{ +irqreturn_t ret =IRQ_NONE ; +u16 irq[2 ][32 ]; +u32 dw, ident; +unsigned long tmp; +unsigned int bank, bit, engine; +unsigned long wait_start, wait_end; + +memset (irq,0 ,sizeof (irq)); + +for (bank =0 ; bank <2 ; bank++) { +if (master_ctl &GEN11_GT_DW_IRQ (bank)) {
Invert condition and use continue;
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2782
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ dw =I915_READ_FW (GEN11_GT_INTR_DW (bank)); +if (!dw) +DRM_ERROR ("GT_INTR_DW%u blank!\n" , bank);
Probably needs a more appropriate action, GEM_BUG_ON if we've never seen this on HW.
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2785
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ tmp = dw; +for_each_set_bit (bit, &tmp,32 ) { +I915_WRITE_FW (GEN11_IIR_REG_SELECTOR (bank),1 << bit);
BIT(bit)
+ newline here
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2793
Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c +8
-0+ wait_start =local_clock () >>10 ; +/* NB: Specs do not specify how long to spin wait. +* Taking 100us as an educated guess */ + wait_end = wait_start +100 ; +do { + ident =I915_READ_FW (GEN11_INTR_IDENTITY_REG (bank)); + }while (!(ident &GEN11_INTR_DATA_VALID ) && + !time_after ((unsigned long )local_clock () >>10 , wait_end));
Uh oh, not a really nice thing to do in IRQ handler :( We should probably look at some actual delay numbers and not do this.
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2802
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +9
-0+ +if (!(ident &GEN11_INTR_DATA_VALID )) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u timed out!\n" , + bank, bit); + + irq[bank][bit] = ident &GEN11_INTR_ENGINE_MASK ; +if (!irq[bank][bit]) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u blank!\n" , + bank, bit);
DRM_ERROR again seems like bit of an understatement for interrupt.
+ newline here
Review static void __fini_wedge(struct wedge_me *w) · line 2804
Quoted 2 lines
(quoted diff) +2
-0+ I915_WRITE_FW(GEN11_INTR_IDENTITY_REG(bank), ident); + }
+ newline here
Quoted 21 lines
drivers/gpu/drm/i915/i915_irq.c +21
-0+I915_WRITE_FW (GEN11_GT_INTR_DW (bank), dw); + } + } + +if (irq[0 ][GEN11_RCS0 ]) { +gen11_cs_irq_handler (dev_priv->engine[RCS ], + irq[0 ][GEN11_RCS0 ]); + ret =IRQ_HANDLED ; + } + +if (irq[0 ][GEN11_BCS ]) { +gen11_cs_irq_handler (dev_priv->engine[BCS ], + irq[0 ][GEN11_BCS ]); + ret =IRQ_HANDLED ; + } + +for (engine =0 ; engine <4 ; engine++) { +if (irq[1 ][GEN11_VCS (engine)]) { +gen11_cs_irq_handler (dev_priv->engine[_VCS (engine)], + irq[1 ][GEN11_VCS (engine)]); + ret =IRQ_HANDLED ;
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2835
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +10
-0+ } + } + +for (engine =0 ; engine <2 ; engine++) { +if (irq[1 ][GEN11_VECS (engine)]) { +gen11_cs_irq_handler (dev_priv->engine[_VECS (engine)], + irq[1 ][GEN11_VECS (engine)]); + ret =IRQ_HANDLED ; + } + }
Doesn't the above code look like a table to be iterated over?
<SNIP>
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3832
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +5
-0+static void gen11_gt_irq_postinstall (struct drm_i915_private *dev_priv) +{ +const u32 irqs =GT_RENDER_USER_INTERRUPT |GT_CONTEXT_SWITCH_INTERRUPT ; + +BUILD_BUG_ON (irqs &0xffff0000 );
#define for the mask.
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3843
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +11
-0+ +/* Enable RCS, BCS, VCS and VECS class interrupts. */ +I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE , irqs <<16 | irqs); +I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE , irqs <<16 | irqs); + +/* Unmask irqs on RCS, BCS, VCS and VECS engines. */ +I915_WRITE (GEN11_RCS0_RSVD_INTR_MASK , ~(irqs <<16 )); +I915_WRITE (GEN11_BCS_RSVD_INTR_MASK , ~(irqs <<16 )); +I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~(irqs | irqs <<16 )); +I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~(irqs | irqs <<16 )); +I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~(irqs | irqs <<16 ));
We should also have an actual shift and mask #defines for these, now it's all hardcoded here.
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3845
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +2
-0+ + dev_priv->pm_imr =0xffffffff ;/* TODO */
Some code missing it seems.
Quoted 1 line
(quoted diff) +1
-0+}
<SNIP>
drivers/gpu/drm/i915/intel_pm.c void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) · line 7963
Quoted 10 lines
+++
b/drivers/gpu/drm/i915/intel_pm.cdrivers/gpu/drm/i915/intel_pm.c +4
-1@@ -7957,7 +7957,10 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) dev_priv->gt_pm.rc6.enabled = true;/* force RC6 disabling */ intel_disable_gt_powersave (dev_priv); -gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) +gen6_reset_rps_interrupts (dev_priv); +else +WARN_ON_ONCE (1 );
Some code is obviously missing here.
drivers/gpu/drm/i915/intel_pm.c static void intel_enable_rps(struct drm_i915_private *dev_priv) · line 8077
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +2
-0}static inline void intel_disable_llc_pstate (struct drm_i915_private *i915)@@ -8070,6 +8073,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rps (dev_priv); + }else if (WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 )) { +/* TODO */
Ditto.
If these are in a later patch, should be squashed here.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/27] drm/i915/icl: Interrupt handling
Em Qua, 2018-01-10 às 12:16 +0200, Joonas Lahtinen escreveu:
Quoted 265 lines · Paulo Zanoni
Quoted 32 lines
From: Tvrtko Ursulin <[email protected]>
v2: Rebase.
v3:
* Remove DPF, it has been removed from SKL+.
* Fix -internal rebase wrt. execlists interrupt handling.v4: Rebase.
v5:
* Updated for POR changes. (Daniele Ceraolo Spurio)
* Merged with irq handling fixes by Daniele Ceraolo Spurio:
* Simplify the code by usinggen8_cs_irq_handler.
* Fix interrupt handling for the upstream kernel.v6:
* Remove early bringup debug messages (Tvrtko)
* Add NB about arbitrary spin wait timeout (Tvrtko)v7 (from Paulo):
* Don't try to write RO bits to registers.
* Don't check for PCH types that don't exist. PCH interrupts are
not
here yet.Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Paulo Zanoni <[email protected]><SNIP>
Quoted 14 lines
+++
b/drivers/gpu/drm/i915/i915_irq.cdrivers/gpu/drm/i915/i915_irq.c +3
-0@@ -415,6 +415,9 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)if (READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +spin_lock_irq (&dev_priv->irq_lock);WARN_ON_ONCE (rps->pm_iir);WARN_ON_ONCE(I915_READ(gen6_pm_iir(dev_priv)) & dev_priv-
Quoted 1 line
pm_rps_events);drivers/gpu/drm/i915/i915_irq.c void gen6_disable_rps_interrupts(struct · line 440
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0@@ -431,6 +434,9 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)if (!READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +These should be
GEM_BUG_ONat most and should be the first thing in function.Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0spin_lock_irq (&dev_priv->irq_lock); rps->interrupts_enabled = false;@@ -2751,6 +2757,131 @@ static void __fini_wedge(struct wedge_me *w) (W )->i915; \ __fini_wedge((W)))drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me · line 2770
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +8
-0+static __always_inline void +gen11_cs_irq_handler (struct intel_engine_cs *engine,u32 iir) +{ +gen8_cs_irq_handler (engine, iir,0 ); +} + +static irqreturn_t +gen11_gt_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl)This function could use some readability :)
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2779
Quoted 12 lines
drivers/gpu/drm/i915/i915_irq.c +12
-0+{ +irqreturn_t ret =IRQ_NONE ; +u16 irq[2 ][32 ]; +u32 dw, ident; +unsigned long tmp; +unsigned int bank, bit, engine; +unsigned long wait_start, wait_end; + +memset (irq,0 ,sizeof (irq)); + +for (bank =0 ; bank <2 ; bank++) { +if (master_ctl &GEN11_GT_DW_IRQ (bank)) {Invert condition and use continue;
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ dw =I915_READ_FW (GEN11_GT_INTR_DW (bank)); +if (!dw) + DRM_ERROR("GT_INTR_DW%u blank!\n",bank);
Probably needs a more appropriate action,
GEM_BUG_ONif we've never seen this on HW.Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ tmp = dw; +for_each_set_bit (bit, &tmp,32 ) { + I915_WRITE_FW(GEN11_IIR_REG_SELECTOR(bank), 1 << bit);
BIT(bit)
+ newline here
Quoted 12 lines
(quoted diff) +2
-0+ wait_start = local_clock() >> 10; + /* NB: Specs do not specify howlong to spin wait.
(quoted diff) +1
-0+ * Taking 100us as an educatedguess */
drivers/gpu/drm/i915/i915_irq.c +3
-0+ wait_end = wait_start +100 ; + do { + ident =I915_READ_FW(GEN11_INTR_IDENTITY_REG(bank));
(quoted diff) +1
-0+ } while (!(ident &
GEN11_INTR_DATA_VALID) &&(quoted diff) +1
-0+ !time_after((unsignedQuoted 1 line
long)local_clock() >> 10,
wait_end));Uh oh, not a really nice thing to do in IRQ handler :( We should probably look at some actual delay numbers and not do this.
Review
Quoted 13 lines
(quoted diff) +2
-0+ + if (!(ident &
GEN11_INTR_DATA_VALID))(quoted diff) +1
-0+ DRM_ERROR("INTR_IDENTITY_REG%u:%u timed out!\n",
drivers/gpu/drm/i915/i915_irq.c +3
-0+ bank, bit); + + irq[bank][bit] = ident &
GEN11_INTR_ENGINE_MASK;(quoted diff) +2
-0+ if (!irq[bank][bit]) + DRM_ERROR("INTR_IDENTITY_REG%u:%u blank!\n",
(quoted diff) +1
-0+ bank, bit);
DRM_ERRORagain seems like bit of an understatement for interrupt.+ newline here
Review
Quoted 3 lines
(quoted diff) +1
-0+ I915_WRITE_FW(GEN11_INTR_IDENTITY_REG(bank), ident);
(quoted diff) +1
-0+ }+ newline here
Quoted 32 lines
drivers/gpu/drm/i915/i915_irq.c +19
-0+I915_WRITE_FW (GEN11_GT_INTR_DW (bank), dw); + } + } + +if (irq[0 ][GEN11_RCS0 ]) { +gen11_cs_irq_handler (dev_priv->engine[RCS ], + irq[0 ][GEN11_RCS0 ]); + ret =IRQ_HANDLED ; + } + +if (irq[0 ][GEN11_BCS ]) { +gen11_cs_irq_handler (dev_priv->engine[BCS ], + irq[0 ][GEN11_BCS ]); + ret =IRQ_HANDLED ; + } + +for (engine =0 ; engine <4 ; engine++) { +if (irq[1 ][GEN11_VCS (engine)]) { + gen11_cs_irq_handler(dev_priv-Quoted 1 line
engine[_VCS(engine)],
(quoted diff) +1
-0+ irq[1][GEN11_VCS(engine)]);
drivers/gpu/drm/i915/i915_irq.c +7
-0+ ret =IRQ_HANDLED ; + } + } + +for (engine =0 ; engine <2 ; engine++) { +if (irq[1 ][GEN11_VECS (engine)]) { + gen11_cs_irq_handler(dev_priv-Quoted 1 line
engine[_VECS(engine)],
(quoted diff) +1
-0+ irq[1][GEN11_VECS(engine)]);
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2819
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ ret =IRQ_HANDLED ; + } + }Doesn't the above code look like a table to be iterated over?
<SNIP>
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3832
Quoted 7 lines
+static void
gen11_gt_irq_postinstall(struct drm_i915_private *dev_priv)(quoted diff) +2
-0+{ + const u32 irqs = GT_RENDER_USER_INTERRUPT |
GT_CONTEXT_SWITCH_INTERRUPT;drivers/gpu/drm/i915/i915_irq.c +2
-0+ +BUILD_BUG_ON (irqs &0xffff0000 );#define for the mask.
Quoted 17 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ +/* Enable RCS, BCS, VCS and VECS class interrupts. */ + I915_WRITE(GEN11_RENDER_COPY_INTR_ENABLE, irqs << 16 |irqs);
(quoted diff) +1
-0+ I915_WRITE(GEN11_VCS_VECS_INTR_ENABLE, irqs << 16| irqs);
drivers/gpu/drm/i915/i915_irq.c +3
-0+ +/* Unmask irqs on RCS, BCS, VCS and VECS engines. */ + I915_WRITE(GEN11_RCS0_RSVD_INTR_MASK, ~(irqs <<16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_BCS_RSVD_INTR_MASK, ~(irqs <<16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_VCS0_VCS1_INTR_MASK, ~(irqs | irqs<< 16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_VCS2_VCS3_INTR_MASK, ~(irqs | irqs<< 16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_VECS0_VECS1_INTR_MASK, ~(irqs |Quoted 1 line
irqs << 16));
We should also have an actual shift and mask #defines for these, now it's all hardcoded here.
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3845
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +2
-0+ + dev_priv->pm_imr =0xffffffff ;/* TODO */ Some code missing it seems.
Quoted 1 line
+}
<SNIP>
drivers/gpu/drm/i915/intel_pm.c void intel_sanitize_gt_powersave(struct · line 7965
Quoted 12 lines
+++
b/drivers/gpu/drm/i915/intel_pm.cdrivers/gpu/drm/i915/intel_pm.c +4
-1@@ -7957,7 +7957,10 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) dev_priv->gt_pm.rc6.enabled = true; /* force RC6 disabling*/ intel_disable_gt_powersave (dev_priv); -gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) +gen6_reset_rps_interrupts (dev_priv); +else +WARN_ON_ONCE (1 );Some code is obviously missing here.
drivers/gpu/drm/i915/intel_pm.c static void intel_enable_rps(struct · line 8078
Quoted 11 lines
(quoted diff) +0
-0}static inline void intel_disable_llc_pstate(struct
drm_i915_private*i915)drivers/gpu/drm/i915/intel_pm.c +2
-0@@ -8070,6 +8073,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)cherryview_enable_rps (dev_priv ); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rps (dev_priv); + }else if (WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 )) { +/* TODO */ Ditto.
Quoted 1 line
If these are in a later patch, should be squashed here.
Some of the TODOs and WARNs added by this patch are implemented later in the series. I'm not in favor of squashing everything into a single
patch: this patch is more like "add the foundation for interrupts" and later patches implement specific features that are missing here (rps, rc6, etc).
In addition to that, they are done by different authors, so squashing makes authorship even more complicated. If these were features of an existing and already-working platform then squashing would be needed, but not here in this case where we know nothing works for ICL yet.
Quoted 2 lines
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/27] drm/i915/icl: Interrupt handling
In reply to Joonas LahtinenQuoted 49 lines · Joonas Lahtinen
Quoted 30 lines · Paulo Zanoni
From: Tvrtko Ursulin <[email protected]>
v2: Rebase.
v3:
* Remove DPF, it has been removed from SKL+.
* Fix -internal rebase wrt. execlists interrupt handling.v4: Rebase.
v5:
* Updated for POR changes. (Daniele Ceraolo Spurio)
* Merged with irq handling fixes by Daniele Ceraolo Spurio:
* Simplify the code by usinggen8_cs_irq_handler.
* Fix interrupt handling for the upstream kernel.v6:
* Remove early bringup debug messages (Tvrtko)
* Add NB about arbitrary spin wait timeout (Tvrtko)v7 (from Paulo):
* Don't try to write RO bits to registers.
* Don't check for PCH types that don't exist. PCH interrupts are not here yet.Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Paulo Zanoni <[email protected]><SNIP>
Quoted 15 lines
+++
b/drivers/gpu/drm/i915/i915_irq.cdrivers/gpu/drm/i915/i915_irq.c +3
-0@@ -415,6 +415,9 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)if (READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +spin_lock_irq (&dev_priv->irq_lock);WARN_ON_ONCE (rps->pm_iir);WARN_ON_ONCE (I915_READ (gen6_pm_iir (dev_priv)) & dev_priv->pm_rps_events);@@ -431,6 +434,9 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)if (!READ_ONCE (rps->interrupts_enabled))return ;
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv) · line 420
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +These should be
GEM_BUG_ONat most and should be the first thing in function.
That would be a bit unfriendly when you are bringing up the codebase and not all pices have been implemented yet. It gets removed later in the series, or in a following series, whatever.
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0spin_lock_irq (&dev_priv->irq_lock); rps->interrupts_enabled = false;@@ -2751,6 +2757,131 @@ static void __fini_wedge(struct wedge_me *w) (W )->i915; \ __fini_wedge((W)))
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2767
Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c +8
-0+static __always_inline void +gen11_cs_irq_handler (struct intel_engine_cs *engine,u32 iir) +{ +gen8_cs_irq_handler (engine, iir,0 ); +} + +static irqreturn_t +gen11_gt_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl)This function could use some readability :)
Name or body?
Quoted 15 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2779
Quoted 12 lines
drivers/gpu/drm/i915/i915_irq.c +12
-0+{ +irqreturn_t ret =IRQ_NONE ; +u16 irq[2 ][32 ]; +u32 dw, ident; +unsigned long tmp; +unsigned int bank, bit, engine; +unsigned long wait_start, wait_end; + +memset (irq,0 ,sizeof (irq)); + +for (bank =0 ; bank <2 ; bank++) { +if (master_ctl &GEN11_GT_DW_IRQ (bank)) {Invert condition and use continue;
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2782
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ dw =I915_READ_FW (GEN11_GT_INTR_DW (bank)); +if (!dw) +DRM_ERROR ("GT_INTR_DW%u blank!\n" , bank);Probably needs a more appropriate action,
GEM_BUG_ONif we've never seen this on HW.
To early to know. TBD.
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2785
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ tmp = dw; +for_each_set_bit (bit, &tmp,32 ) { +I915_WRITE_FW (GEN11_IIR_REG_SELECTOR (bank),1 << bit);BIT(bit)
+ newline here
Yes sir!
Quoted 12 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2793
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +8
-0+ wait_start =local_clock () >>10 ; +/* NB: Specs do not specify how long to spin wait. +* Taking 100us as an educated guess */ + wait_end = wait_start +100 ; +do { + ident =I915_READ_FW (GEN11_INTR_IDENTITY_REG (bank)); + }while (!(ident &GEN11_INTR_DATA_VALID ) && + !time_after ((unsigned long )local_clock () >>10 , wait_end));Uh oh, not a really nice thing to do in IRQ handler :( We should probably look at some actual delay numbers and not do this.
Too early to know. TBD. Spec wants us to busy poll and doesn't specify the timeout. Chris also complained and we chatted about this on IRC, guess you missed this particular stream of conversation.
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2802
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +9
-0+ +if (!(ident &GEN11_INTR_DATA_VALID )) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u timed out!\n" , + bank, bit); + + irq[bank][bit] = ident &GEN11_INTR_ENGINE_MASK ; +if (!irq[bank][bit]) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u blank!\n" , + bank, bit);
DRM_ERRORagain seems like bit of an understatement for interrupt.
Precedent in "master control interrupt lied" messages. Can be revisited when it is known how the real silicon behaves.
Quoted 33 lines
+ newline here
Review static void __fini_wedge(struct wedge_me *w) · line 2804
Quoted 2 lines
(quoted diff) +2
-0+ I915_WRITE_FW(GEN11_INTR_IDENTITY_REG(bank), ident); + }+ newline here
Quoted 25 lines
drivers/gpu/drm/i915/i915_irq.c +25
-0+I915_WRITE_FW (GEN11_GT_INTR_DW (bank), dw); + } + } + +if (irq[0 ][GEN11_RCS0 ]) { +gen11_cs_irq_handler (dev_priv->engine[RCS ], + irq[0 ][GEN11_RCS0 ]); + ret =IRQ_HANDLED ; + } + +if (irq[0 ][GEN11_BCS ]) { +gen11_cs_irq_handler (dev_priv->engine[BCS ], + irq[0 ][GEN11_BCS ]); + ret =IRQ_HANDLED ; + } + +for (engine =0 ; engine <4 ; engine++) { +if (irq[1 ][GEN11_VCS (engine)]) { +gen11_cs_irq_handler (dev_priv->engine[_VCS (engine)], + irq[1 ][GEN11_VCS (engine)]); + ret =IRQ_HANDLED ; + } + } + +for (engine =0 ; engine <2 ; engine++) {
Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2835
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +6
-0+if (irq[1 ][GEN11_VECS (engine)]) { +gen11_cs_irq_handler (dev_priv->engine[_VECS (engine)], + irq[1 ][GEN11_VECS (engine)]); + ret =IRQ_HANDLED ; + } + }Doesn't the above code look like a table to be iterated over?
Chris also had some ideas on how to modify the looping, maybe the same as yours. Best we chat about it when we are all present.
Quoted 26 lines
<SNIP>
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3832
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +5
-0+static void gen11_gt_irq_postinstall (struct drm_i915_private *dev_priv) +{ +const u32 irqs =GT_RENDER_USER_INTERRUPT |GT_CONTEXT_SWITCH_INTERRUPT ; + +BUILD_BUG_ON (irqs &0xffff0000 );#define for the mask.
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3843
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +11
-0+ +/* Enable RCS, BCS, VCS and VECS class interrupts. */ +I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE , irqs <<16 | irqs); +I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE , irqs <<16 | irqs); + +/* Unmask irqs on RCS, BCS, VCS and VECS engines. */ +I915_WRITE (GEN11_RCS0_RSVD_INTR_MASK , ~(irqs <<16 )); +I915_WRITE (GEN11_BCS_RSVD_INTR_MASK , ~(irqs <<16 )); +I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~(irqs | irqs <<16 )); +I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~(irqs | irqs <<16 )); +I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~(irqs | irqs <<16 ));We should also have an actual shift and mask #defines for these, now it's all hardcoded here.
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3845
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +2
-0+ + dev_priv->pm_imr =0xffffffff ;/* TODO */ Some code missing it seems.
Not sure on the states of patches which bring up these bits. Maybe it can be re-arranged somehow but not sure.
Quoted 10 lines
Quoted 2 lines
+}
<SNIP>
Quoted 5 lines
+++
b/drivers/gpu/drm/i915/intel_pm.cdrivers/gpu/drm/i915/intel_pm.c +0
-0@@ -7957,7 +7957,10 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) dev_priv->gt_pm.rc6.enabled = true;/* force RC6 disabling */ intel_disable_gt_powersave (dev_priv);
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) · line 7963
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +4
-1-gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) +gen6_reset_rps_interrupts (dev_priv); +else +WARN_ON_ONCE (1 );Some code is obviously missing here.
Yes, as above.
Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c static void intel_enable_rps(struct drm_i915_private *dev_priv) · line 8077
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +2
-0}static inline void intel_disable_llc_pstate (struct drm_i915_private *i915)@@ -8070,6 +8073,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rps (dev_priv); + }else if (WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 )) { +/* TODO */ Ditto.
Quoted 1 line
If these are in a later patch, should be squashed here.
It might be possible in some cases, or it might be quite challenging in others. Need to look into it but no promises. We might have to live with having place holders like this in the code which get removed by later patches/series. It's quite complex logistically to organise multiple series, written by multiple authors, at different times, and make it look 100% pretty. (And not just squash and butcher everything up at merge time.)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/27] drm/i915/icl: Interrupt handling
Em Sex, 2018-01-19 às 17:30 +0000, Tvrtko Ursulin escreveu:
Quoted 147 lines · Joonas Lahtinen
Quoted 54 lines · Paulo Zanoni
Quoted 32 lines
From: Tvrtko Ursulin <[email protected]>
v2: Rebase.
v3:
* Remove DPF, it has been removed from SKL+.
* Fix -internal rebase wrt. execlists interrupt handling.v4: Rebase.
v5:
* Updated for POR changes. (Daniele Ceraolo Spurio)
* Merged with irq handling fixes by Daniele Ceraolo Spurio:
* Simplify the code by usinggen8_cs_irq_handler.
* Fix interrupt handling for the upstream kernel.v6:
* Remove early bringup debug messages (Tvrtko)
* Add NB about arbitrary spin wait timeout (Tvrtko)v7 (from Paulo):
* Don't try to write RO bits to registers.
* Don't check for PCH types that don't exist. PCH interrupts
are not
here yet.Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Paulo Zanoni <[email protected]><SNIP>
Quoted 18 lines
+++
b/drivers/gpu/drm/i915/i915_irq.cdrivers/gpu/drm/i915/i915_irq.c +3
-0@@ -415,6 +415,9 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)if (READ_ONCE (rps->interrupts_enabled))return ; +if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +spin_lock_irq (&dev_priv->irq_lock);WARN_ON_ONCE (rps->pm_iir);WARN_ON_ONCE(I915_READ(gen6_pm_iir(dev_priv)) &
dev_priv->pm_rps_events);drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -431,6 +434,9 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)if (!READ_ONCE (rps->interrupts_enabled))return ;Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv) · line 420
Quoted 3 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) +return ; +These should be
GEM_BUG_ONat most and should be the first thing in function.That would be a bit unfriendly when you are bringing up the codebase and
not all pices have been implemented yet. It gets removed later in the
series, or in a following series, whatever.Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0spin_lock_irq (&dev_priv->irq_lock); rps->interrupts_enabled = false;@@ -2751,6 +2757,131 @@ static void __fini_wedge(struct wedge_me *w) (W )->i915; \ __fini_wedge((W)))Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w)
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +8
-0+static __always_inline void +gen11_cs_irq_handler (struct intel_engine_cs *engine,u32 iir) +{ +gen8_cs_irq_handler (engine, iir,0 ); +} + +static irqreturn_t +gen11_gt_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl)This function could use some readability :)
Name or body?
Quoted 15 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2779
Quoted 12 lines
drivers/gpu/drm/i915/i915_irq.c +12
-0+{ +irqreturn_t ret =IRQ_NONE ; +u16 irq[2 ][32 ]; +u32 dw, ident; +unsigned long tmp; +unsigned int bank, bit, engine; +unsigned long wait_start, wait_end; + +memset (irq,0 ,sizeof (irq)); + +for (bank =0 ; bank <2 ; bank++) { +if (master_ctl &GEN11_GT_DW_IRQ (bank)) {Invert condition and use continue;
Quoted 8 lines
Quoted 5 lines
(quoted diff) +1
-0+ dw =I915_READ_FW(GEN11_GT_INTR_DW(bank));
(quoted diff) +2
-0+ if (!dw) + DRM_ERROR("GT_INTR_DW%ublank!\n", bank);
Probably needs a more appropriate action,
GEM_BUG_ONif we've never seen this on HW.To early to know. TBD.
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ tmp = dw; +for_each_set_bit (bit, &tmp,32 ) { + I915_WRITE_FW(GEN11_IIR_REG_SELECTOR(bank), 1 << bit);
BIT(bit)
+ newline here
Yes sir!
Quoted 10 lines
Quoted 10 lines
(quoted diff) +1
-0+ wait_start = local_clock() >>10;
(quoted diff) +1
-0+ /* NB: Specs do not specify howlong to spin wait.
(quoted diff) +1
-0+ * Taking 100us as an educatedguess */
drivers/gpu/drm/i915/i915_irq.c +3
-0+ wait_end = wait_start +100 ; + do { + ident =Quoted 8 lines
Quoted 5 lines
I915_READ_FW(GEN11_INTR_IDENTITY_REG(bank));
(quoted diff) +1
-0+ } while (!(ident &
GEN11_INTR_DATA_VALID) &&(quoted diff) +1
-0+ !time_after((unsignedlong)local_clock() >> 10,
wait_end));Uh oh, not a really nice thing to do in IRQ handler :( We should probably look at some actual delay numbers and not do this.
Quoted 4 lines
Too early to know. TBD. Spec wants us to busy poll and doesn't specify
the timeout. Chris also complained and we chatted about this on IRC, guess you missed this particular stream of conversation.
And so did I. What was the summary of the conversation? What did you two conclude should be done in this case? Is the current code acceptable?
Quoted 69 lines
Quoted 16 lines
Quoted 13 lines
(quoted diff) +2
-0+ + if (!(ident &
GEN11_INTR_DATA_VALID))(quoted diff) +1
-0+ DRM_ERROR("INTR_IDENTITY_REG%u:%u timed out!\n",
drivers/gpu/drm/i915/i915_irq.c +3
-0+ bank, bit); + + irq[bank][bit] = ident &
GEN11_INTR_ENGINE_MASK;(quoted diff) +2
-0+ if (!irq[bank][bit]) + DRM_ERROR("INTR_IDENTITY_REG%u:%u blank!\n",
Review
Quoted 1 line
(quoted diff) +1
-0+ bank, bit);
DRM_ERRORagain seems like bit of an understatement for interrupt.Precedent in "master control interrupt lied" messages. Can be revisited
when it is known how the real silicon behaves.Quoted 39 lines
+ newline here
Review
Quoted 3 lines
(quoted diff) +1
-0+ I915_WRITE_FW(GEN11_INTR_IDENTIT
Y_REG(bank), ident);(quoted diff) +1
-0+ }+ newline here
Quoted 30 lines
(quoted diff) +1
-0+ I915_WRITE_FW(GEN11_GT_INTR_DW(bank),dw);
drivers/gpu/drm/i915/i915_irq.c +18
-0+ } + } + +if (irq[0 ][GEN11_RCS0 ]) { +gen11_cs_irq_handler (dev_priv->engine[RCS ], + irq[0 ][GEN11_RCS0 ]); + ret =IRQ_HANDLED ; + } + +if (irq[0 ][GEN11_BCS ]) { +gen11_cs_irq_handler (dev_priv->engine[BCS ], + irq[0 ][GEN11_BCS ]); + ret =IRQ_HANDLED ; + } + +for (engine =0 ; engine <4 ; engine++) { +if (irq[1 ][GEN11_VCS (engine)]) { + gen11_cs_irq_handler(dev_priv-Quoted 1 line
engine[_VCS(engine)],
(quoted diff) +1
-0+ irq[1][GEN11_VCS(engine)]);
drivers/gpu/drm/i915/i915_irq.c +7
-0+ ret =IRQ_HANDLED ; + } + } + +for (engine =0 ; engine <2 ; engine++) { +if (irq[1 ][GEN11_VECS (engine)]) { + gen11_cs_irq_handler(dev_priv-Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2819
Quoted 6 lines
Quoted 1 line
engine[_VECS(engine)],
(quoted diff) +1
-0+ irq[1][GEN11_VECS(engine)]);
drivers/gpu/drm/i915/i915_irq.c +3
-0+ ret =IRQ_HANDLED ; + } + }Doesn't the above code look like a table to be iterated over?
Quoted 3 lines
Chris also had some ideas on how to modify the looping, maybe the same
as yours. Best we chat about it when we are all present.
Please make sure conclusions are posted to this list so the public review is properly documented.
Quoted 85 lines
Quoted 37 lines
<SNIP>
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3832
Quoted 7 lines
+static void
gen11_gt_irq_postinstall(struct drm_i915_private *dev_priv)(quoted diff) +2
-0+{ + const u32 irqs = GT_RENDER_USER_INTERRUPT |
GT_CONTEXT_SWITCH_INTERRUPT;drivers/gpu/drm/i915/i915_irq.c +2
-0+ +BUILD_BUG_ON (irqs &0xffff0000 );#define for the mask.
Quoted 17 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ +/* Enable RCS, BCS, VCS and VECS class interrupts. */ + I915_WRITE(GEN11_RENDER_COPY_INTR_ENABLE, irqs << 16 |irqs);
(quoted diff) +1
-0+ I915_WRITE(GEN11_VCS_VECS_INTR_ENABLE, irqs <<16 | irqs);
drivers/gpu/drm/i915/i915_irq.c +3
-0+ +/* Unmask irqs on RCS, BCS, VCS and VECS engines. */ + I915_WRITE(GEN11_RCS0_RSVD_INTR_MASK, ~(irqs <<16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_BCS_RSVD_INTR_MASK, ~(irqs <<16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_VCS0_VCS1_INTR_MASK, ~(irqs |irqs << 16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_VCS2_VCS3_INTR_MASK, ~(irqs |irqs << 16));
(quoted diff) +1
-0+ I915_WRITE(GEN11_VECS0_VECS1_INTR_MASK, ~(irqs |Quoted 1 line
irqs << 16));
We should also have an actual shift and mask #defines for these, now
it's all hardcoded here.Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c static int gen8_irq_postinstall(struct drm_device *dev) · line 3845
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +2
-0+ + dev_priv->pm_imr =0xffffffff ;/* TODO */ Some code missing it seems.
Not sure on the states of patches which bring up these bits. Maybe it
can be re-arranged somehow but not sure.Quoted 12 lines
Quoted 2 lines
+}
<SNIP>
Quoted 7 lines
+++
b/drivers/gpu/drm/i915/intel_pm.c(quoted diff) +0
-0@@ -7957,7 +7957,10 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) dev_priv->gt_pm.rc6.enabled = true; /* force RC6disabling */
intel_disable_gt_powersave(dev_priv);Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) · line 7963
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +4
-1-gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) <11 ) +gen6_reset_rps_interrupts (dev_priv); +else +WARN_ON_ONCE (1 );Some code is obviously missing here.
Yes, as above.
Quoted 15 lines
drivers/gpu/drm/i915/intel_pm.c static void intel_enable_rps(struct · line 8078
Quoted 12 lines
}static inline void intel_disable_llc_pstate(struct
drm_i915_private*i915)drivers/gpu/drm/i915/intel_pm.c +2
-0@@ -8070,6 +8073,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)cherryview_enable_rps (dev_priv ); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rps (dev_priv); + }else if (WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 )) { +/* TODO */ Ditto.
Quoted 1 line
If these are in a later patch, should be squashed here.
Quoted 10 lines
It might be possible in some cases, or it might be quite challenging in
others. Need to look into it but no promises. We might have to live with
having place holders like this in the code which get removed by later
patches/series. It's quite complex logistically to organise multiple series, written by multiple authors, at different times, and make it look 100% pretty. (And not just squash and butcher everything up at merge time.)
I agree with Tvrtko here and in the other points above. If we take Joonas's point to the extreme, ICL enabling would be a single giant patch. We have to accept that some things are going to be incomplete in the series that enable a platform. We also have the alpha_support option to protect us here, and CI to make sure ICL's incompleteness doesn't affect the other platforms.
Quoted 4 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/27] drm/i915/icl: Interrupt handling
Quoting Paulo Zanoni (2018-01-19 18:10:51)
Quoted 15 lines
Em Sex, 2018-01-19 às 17:30 +0000, Tvrtko Ursulin escreveu:
Quoted 13 lines · Joonas Lahtinen
Quoted 1 line
If these are in a later patch, should be squashed here.
It might be possible in some cases, or it might be quite challenging in
others. Need to look into it but no promises. We might have to live with
having place holders like this in the code which get removed by later
patches/series. It's quite complex logistically to organise multiple series, written by multiple authors, at different times, and make it look 100% pretty. (And not just squash and butcher everything up at merge time.)
Quoted 6 lines
I agree with Tvrtko here and in the other points above. If we take Joonas's point to the extreme, ICL enabling would be a single giant patch. We have to accept that some things are going to be incomplete in the series that enable a platform. We also have the
alpha_supportoption to protect us here, and CI to make sure ICL's incompleteness doesn't affect the other platforms.
Later in this series is a patch which fixes a bug in this patch. That certainly needs to be addressed. ;)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 07/27] drm/i915/icl: Interrupt handling
Quoted 20 lines · Chris Wilson
Quoting Paulo Zanoni (2018-01-19 18:10:51)
Quoted 12 lines
Em Sex, 2018-01-19 às 17:30 +0000, Tvrtko Ursulin escreveu:
Quoted 10 lines · Joonas Lahtinen
Quoted 1 line
If these are in a later patch, should be squashed here.
It might be possible in some cases, or it might be quite challenging in others. Need to look into it but no promises. We might have to live with having place holders like this in the code which get removed by later patches/series. It's quite complex logistically to organise multiple series, written by multiple authors, at different times, and make it look 100% pretty. (And not just squash and butcher everything up at merge time.)
Quoted 6 lines
I agree with Tvrtko here and in the other points above. If we take Joonas's point to the extreme, ICL enabling would be a single giant patch. We have to accept that some things are going to be incomplete in the series that enable a platform. We also have the
alpha_supportoption to protect us here, and CI to make sure ICL's incompleteness doesn't affect the other platforms.
Quoted 2 lines
Later in this series is a patch which fixes a bug in this patch. That certainly needs to be addressed. ;)
Might be helpful to point that out...
As to the larger point of squashing stuff, it's hard to make the division into patches for large enabling series just right. Sometimes it's just an arbitrary choice that's been made at some point to not bloat the patches too much and to not make the rebasing unnecessarily hard. All other things being equal, I'd err toward whatever gets us closer to merging the patches.
BR,
Jani.
Quoted 5 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/27] drm/i915/icl: Interrupt handling
In reply to Paulo Zanoni<snip>
Quoted 28 lines
drivers/gpu/drm/i915/i915_irq.c +28
-0+ +static irqreturn_t +gen11_gt_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl) +{ +irqreturn_t ret =IRQ_NONE ; +u16 irq[2 ][32 ]; +u32 dw, ident; +unsigned long tmp; +unsigned int bank, bit, engine; +unsigned long wait_start, wait_end; + +memset (irq,0 ,sizeof (irq)); + +for (bank =0 ; bank <2 ; bank++) { +if (master_ctl &GEN11_GT_DW_IRQ (bank)) { + dw =I915_READ_FW (GEN11_GT_INTR_DW (bank)); +if (!dw) +DRM_ERROR ("GT_INTR_DW%u blank!\n" , bank); + tmp = dw; +for_each_set_bit (bit, &tmp,32 ) { +I915_WRITE_FW (GEN11_IIR_REG_SELECTOR (bank),1 << bit); + wait_start =local_clock () >>10 ; +/* NB: Specs do not specify how long to spin wait. +* Taking 100us as an educated guess */ + wait_end = wait_start +100 ; + do { + ident = I915_READ_FW(GEN11_INTR_IDENTITY_REG(bank)); + } while (!(ident & GEN11_INTR_DATA_VALID) &&
drivers/gpu/drm/i915/i915_irq.c static void __fini_wedge(struct wedge_me *w) · line 2802
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +10
-0+ !time_after((unsigned long)local_clock() >> 10, wait_end)); + +if (!(ident &GEN11_INTR_DATA_VALID )) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u timed out!\n" , + bank, bit); + + irq[bank][bit] = ident &GEN11_INTR_ENGINE_MASK ; +if (!irq[bank][bit]) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u blank!\n" , + bank, bit);
I think having the identity reg valid but empty is a possible case and we shouldn't error on it. The scenario I'm thinking of is:
- Interrupt on engine, we read master IRQ and disable interrupts
- we read GEN11_GT_INTR_DW. the register is now locked until a write occurs
- a second interrupt arrives on the same engine, gets double buffered behind the current one in GEN11_GT_INTR_DW
- we read the irq vector (which will now contain both interrupts), process it and clear it
- we write to GEN11_GT_INTR_DW to clear it and the buffered value is now propagated to it
- GEN11_GT_INTR_DW now has the bit set, but we already serviced the interrupt so the identity register will be zero.
Just dropping the error message should be enough since we have correctly serviced everything.
Daniele
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/27 drm/i915/icl: Ringbuffer interrupt handling
In reply to Paulo ZanoniFrom: Tvrtko Ursulin <[email protected]>
Since it is not possible to mask individual engine instances and they are all permanently unmasked we do not need to do anything for engine interrupt management.
v2: Rebase.
v3: Remove gen 11 extra check in logical_render_ring_init.
v4: Rebase fixes.
v5: Rebase/refactor.
v6: Rebase.
v7: Rebase.
--- drivers/gpu/drm/i915/intel_breadcrumbs.c | 20 ++++++++++++-------- drivers/gpu/drm/i915/intel_lrc.c | 11 +++++++++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +++++ 3 files changed, 26 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_breadcrumbs.c +12 -8
@@ -178,18 +178,22 @@ static void irq_enable(struct intel_engine_cs *engine)*/ set_bit (ENGINE_IRQ_BREADCRUMB , &engine->irq_posted); -/* Caller disables interrupts */ -spin_lock (&engine->i915->irq_lock); - engine->irq_enable (engine); -spin_unlock (&engine->i915->irq_lock); +if (engine->irq_enable) { +/* Caller disables interrupts */ +spin_lock (&engine->i915->irq_lock); + engine->irq_enable (engine); +spin_unlock (&engine->i915->irq_lock); + } }static void irq_disable (struct intel_engine_cs *engine) { -/* Caller disables interrupts */ -spin_lock (&engine->i915->irq_lock); - engine->irq_disable (engine); -spin_unlock (&engine->i915->irq_lock); +if (engine->irq_disable) { +/* Caller disables interrupts */ +spin_lock (&engine->i915->irq_lock); + engine->irq_disable (engine); +spin_unlock (&engine->i915->irq_lock); + } }void __intel_engine_disarm_breadcrumbs (struct intel_engine_cs *engine)
drivers/gpu/drm/i915/intel_lrc.c +9 -2
@@ -1963,8 +1963,15 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) engine->set_default_submission = execlists_set_default_submission; - engine->irq_enable = gen8_logical_ring_enable_irq; - engine->irq_disable = gen8_logical_ring_disable_irq; +if (INTEL_GEN (engine->i915) <11 ) { + engine->irq_enable = gen8_logical_ring_enable_irq; + engine->irq_disable = gen8_logical_ring_disable_irq; + }else { +/* +* On Gen11 interrupts are permanently unmasked and there +* are no per-engine instance mask bits. +*/ + } engine->emit_bb_start = gen8_emit_bb_start; }
drivers/gpu/drm/i915/intel_ringbuffer.h +5 -0
@@ -402,6 +402,11 @@ struct intel_engine_cs {u32 irq_keep_mask;/* always keep these interrupts */ u32 irq_enable_mask;/* bitmask to enable ring interrupt */ + +/* +* irq_enable and irq_disable do not have to be provided for +* an engine. In other words they can be NULL. +*/ void (*irq_enable)(struct intel_engine_cs *engine);void (*irq_disable)(struct intel_engine_cs *engine);
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/27] drm/i915/icl: Ringbuffer interrupt handling
Quoting Paulo Zanoni (2018-01-09 23:23:17)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Since it is not possible to mask individual engine instances and they are all permanently unmasked we do not need to do anything for engine interrupt management.
This scares me as we will more than double our interrupt generation rate as we have a breadcrumb interrupt after every request, just in case we need to synchronize with the request. We've been relying on the ability to mask those interrupts off, as historically we have been able to saturate cpus with the amount of interrupts we could generate. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/27] drm/i915/icl: Ringbuffer interrupt handling
Quoted 7 lines · Chris Wilson
Quoting Paulo Zanoni (2018-01-09 23:23:17)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Since it is not possible to mask individual engine instances and they are all permanently unmasked we do not need to do anything for engine interrupt management.
Quoted 6 lines
This scares me as we will more than double our interrupt generation rate as we have a breadcrumb interrupt after every request, just in case we need to synchronize with the request. We've been relying on the ability to mask those interrupts off, as historically we have been able to saturate cpus with the amount of interrupts we could generate. -Chris
We do have masks per instance, but they're in gunit and not in the CS. they're defined in patch 4 of this series:
+#define GEN11_RCS0_RSVD_INTR_MASK _MMIO(0x190090)
+#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0)
+#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8)
+#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac)
+#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0)
Each instance gets half of a register for a 16 bits vector. I think there was some gotcha with the masks being in gunit but can't remember exactly what. Tvrtko, do you remember anything on this?
Thanks,
Daniele
Quoted 5 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/27] drm/i915/icl: Ringbuffer interrupt handling
Quoted 25 lines · Daniele Ceraolo Spurio
Quoted 7 lines · Chris Wilson
Quoting Paulo Zanoni (2018-01-09 23:23:17)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Since it is not possible to mask individual engine instances and they are all permanently unmasked we do not need to do anything for engine interrupt management.
Quoted 6 lines
This scares me as we will more than double our interrupt generation rate as we have a breadcrumb interrupt after every request, just in case we need to synchronize with the request. We've been relying on the ability to mask those interrupts off, as historically we have been able to saturate cpus with the amount of interrupts we could generate. -Chris
We do have masks per instance, but they're in gunit and not in the CS. they're defined in patch 4 of this series:
(quoted diff) +5
-0+#define GEN11_RCS0_RSVD_INTR_MASK _MMIO(0x190090) +#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0) +#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8) +#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac) +#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0)
Quoted 1 line
Each instance gets half of a register for a 16 bits vector. I think there was some gotcha with the masks being in gunit but can't remember exactly what. Tvrtko, do you remember anything on this?
I remember the message was to not use them since they were pencilled in for removal from the HW. There was some issue with them in general which made that decision attractive, coupled with the fact other OS did not have a need for them.
If that removal did not materialize we could perhaps revisit the plans. It would require a locked RMW cycle as minimum since there are two instances in each reg but that probably isn't such a big deal.
So yeah, I think summary would be someone needs to pull on sleeves of a HW designer, or someone close, to check what happened with the removal plans, and what exactly was the problematic bit with frequent (un)masking.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/27] drm/i915/icl: Ringbuffer interrupt handling
Quoted 27 lines · Tvrtko Ursulin
Quoted 25 lines · Daniele Ceraolo Spurio
Quoted 7 lines · Chris Wilson
Quoting Paulo Zanoni (2018-01-09 23:23:17)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Since it is not possible to mask individual engine instances and they are all permanently unmasked we do not need to do anything for engine interrupt management.
Quoted 6 lines
This scares me as we will more than double our interrupt generation rate as we have a breadcrumb interrupt after every request, just in case we need to synchronize with the request. We've been relying on the ability to mask those interrupts off, as historically we have been able to saturate cpus with the amount of interrupts we could generate. -Chris
We do have masks per instance, but they're in gunit and not in the CS. they're defined in patch 4 of this series:
(quoted diff) +5
-0+#define GEN11_RCS0_RSVD_INTR_MASK _MMIO(0x190090) +#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0) +#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8) +#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac) +#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0)
Quoted 7 lines
Quoted 1 line
Each instance gets half of a register for a 16 bits vector. I think there was some gotcha with the masks being in gunit but can't remember exactly what. Tvrtko, do you remember anything on this?
I remember the message was to not use them since they were pencilled in for removal from the HW. There was some issue with them in general which made that decision attractive, coupled with the fact other OS did not have a need for them.
If that removal did not materialize we could perhaps revisit the plans. It would require a locked RMW cycle as minimum since there are two instances in each reg but that probably isn't such a big deal.
So yeah, I think summary would be someone needs to pull on sleeves of a HW designer, or someone close, to check what happened with the removal plans, and what exactly was the problematic bit with frequent (un)masking.
I asked the hardware team about the removal, and that does not seem to be the case. I have added you to the email if you want more clarification.
Thanks,
Vinay.
Quoted 8 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/27] drm/i915/icl: Ringbuffer interrupt handling
Quoted 34 lines · Vinay
Quoted 31 lines · Tvrtko Ursulin
Quoted 25 lines · Daniele Ceraolo Spurio
Quoted 7 lines · Chris Wilson
Quoting Paulo Zanoni (2018-01-09 23:23:17)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
Since it is not possible to mask individual engine instances and they are all permanently unmasked we do not need to do anything for engine interrupt management.
Quoted 6 lines
This scares me as we will more than double our interrupt generation rate as we have a breadcrumb interrupt after every request, just in case we need to synchronize with the request. We've been relying on the ability to mask those interrupts off, as historically we have been able to saturate cpus with the amount of interrupts we could generate. -Chris
We do have masks per instance, but they're in gunit and not in the CS. they're defined in patch 4 of this series:
(quoted diff) +5
-0+#define GEN11_RCS0_RSVD_INTR_MASK _MMIO(0x190090) +#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0) +#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8) +#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac) +#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0)Quoted 1 line
Each instance gets half of a register for a 16 bits vector. I think there was some gotcha with the masks being in gunit but can't remember exactly what. Tvrtko, do you remember anything on this?
I remember the message was to not use them since they were pencilled in for removal from the HW. There was some issue with them in general which made that decision attractive, coupled with the fact other OS did not have a need for them.
Quoted 5 lines
Quoted 3 lines
If that removal did not materialize we could perhaps revisit the plans. It would require a locked RMW cycle as minimum since there are two instances in each reg but that probably isn't such a big deal.
So yeah, I think summary would be someone needs to pull on sleeves of a HW designer, or someone close, to check what happened with the removal plans, and what exactly was the problematic bit with frequent (un)masking.
I asked the hardware team about the removal, and that does not seem to be the case. I have added you to the email if you want more clarification.
Please disregard that comment, looks like there was already a separate discussion on this.
Thanks,
Vinay.
Quoted 12 lines
Thanks,
Vinay.Quoted 8 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/27 drm/i915/icl: Correctly initialize the Gen11 engines
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
Gen11 has up to 4 VCS and up to 2 VECS engines, this patch adds mmio base definitions for all of them.
Bspec: 20944
Bspec: 7021
v2: Set the correct mmio_base in intel_engines_init_mmio; updating the base mmio values any later would cause incorrect reads in i915_gem_sanitize (Michel).
--- drivers/gpu/drm/i915/i915_reg.h | 6 +++++ drivers/gpu/drm/i915/intel_engine_cs.c | 44 +++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -2316,7 +2316,13 @@ enum i915_power_well_id {#define BSD_RING_BASE 0x04000#define GEN6_BSD_RING_BASE 0x12000#define GEN8_BSD2_RING_BASE 0x1c000 +#define GEN11_BSD_RING_BASE 0x1c0000 +#define GEN11_BSD2_RING_BASE 0x1c4000 +#define GEN11_BSD3_RING_BASE 0x1d0000 +#define GEN11_BSD4_RING_BASE 0x1d4000#define VEBOX_RING_BASE 0x1a000 +#define GEN11_VEBOX_RING_BASE 0x1c8000 +#define GEN11_VEBOX2_RING_BASE 0x1d8000#define BLT_RING_BASE 0x22000#define RING_TAIL (base) _MMIO((base)+0x30)#define RING_HEAD (base) _MMIO((base)+0x34)
drivers/gpu/drm/i915/intel_engine_cs.c +43 -1
62 lines not on this page · raw message
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/27 drm/i915/icl: Enhanced execution list support
In reply to Paulo ZanoniFrom: Thomas Daniel <[email protected]>
Supports two-element submission using the new enhanced execlist mechanism
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
--- drivers/gpu/drm/i915/intel_lrc.c | 21 ++++++++++++++++++++- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_lrc.c +20 -1
@@ -430,9 +430,18 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port; +u32 __iomem *elsq = + engine->i915->regs +i915_mmio_reg_offset (RING_ELSQ (engine));unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;
@@ -456,8 +465,18 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (engine->i915) >=11 ) { +writel (lower_32_bits (desc), elsq + n *2 ); +writel (upper_32_bits (desc), elsq + n *2 +1 ); + }else { +elsp_write (desc, engine->execlists.elsp); + } } + +/* for gen11+ we need to manually load the submit queue */ +if (INTEL_GEN (engine->i915) >=11 ) +I915_WRITE_FW (RING_ELCR (engine),ELCR_LOAD ); +execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }
drivers/gpu/drm/i915/intel_lrc.h +3 -0
@@ -38,6 +38,9 @@#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0)#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF_BASE (engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_ELSQ (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_ELCR (engine) _MMIO((engine)->mmio_base + 0x550) +#define ELCR_LOAD (1 << 0)#define RING_CONTEXT_STATUS_BUF_LO (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8)#define RING_CONTEXT_STATUS_BUF_HI (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4)#define RING_CONTEXT_STATUS_PTR (engine) _MMIO((engine)->mmio_base + 0x3a0)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/27 drm/i915/icl: Gen11 render context size
From: Tvrtko Ursulin <[email protected]>
The current size may be bigger than the correct one, this needs to be revisited later.
v2: Rebase.
--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +2 -0
@@ -181,6 +181,8 @@ __intel_engine_context_size(struct drm_i915_private *dev_priv, u8 class)switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv)); +case 11 : +/* TODO: Make sure this is correct. */ case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH 11/27] drm/i915/icl: Gen11 render context size
Quoted 4 lines · Paulo Zanoni
From: Tvrtko Ursulin <[email protected]>
The current size may be bigger than the correct one, this needs to be revisited later.
I don't believe this is true anymore. When this was written initially CNL had a higher value.
Higher values are ok, but smaller can be problematic if I understood correctly.
So we might need to check the accurate number.
Oscar has a good method for that if iirc ;)
Quoted 26 lines
v2: Rebase.
Acked-by Ben Widawsky <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_engine_cs.c +2
-0@@ -181,6 +181,8 @@ __intel_engine_context_size(struct drm_i915_private *dev_priv, u8 class)switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv)); +case 11 : +/* TODO: Make sure this is correct. */ case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :Signature · 1 line
2.14.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 11/27] drm/i915/icl: Gen11 render context size
Quoted 5 lines · Rodrigo Vivi
Quoted 4 lines · Paulo Zanoni
From: Tvrtko Ursulin <[email protected]>
The current size may be bigger than the correct one, this needs to be revisited later.
Quoted 7 lines
I don't believe this is true anymore. When this was written initially CNL had a higher value.
Higher values are ok, but smaller can be problematic if I understood correctly.
So we might need to check the accurate number.
Oscar has a good method for that if iirc ;)
My method says 14 pages. Seems a bit low, so I went ahead and tested it. Everything seems to work fine, so I'll send a new patch.
Quoted 9 lines
Quoted 9 lines
v2: Rebase.
Acked-by Ben Widawsky <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 ++ 1 file changed, 2 insertions(+)
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_engine_cs.c +2
-0@@ -181,6 +181,8 @@ __intel_engine_context_size(struct drm_i915_private *dev_priv, u8 class)switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv)); +case 11 : +/* TODO: Make sure this is correct. */ case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :Signature · 1 line
2.14.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/icl: Gen11 render context size
In reply to Paulo ZanoniFrom: Tvrtko Ursulin <[email protected]>
Gen11 removes the Resource Streamer, which frees up a big chunk of the context image. BSpec indicates 12538 DWORDs (13 pages), plus one page for PPHWSP.
Please notice that, when looking at the BSpec context image table, the right filter has to be applied (e.g. "IcelakeLP") as some rows are excluded for specific GENs. Also, some rows apply per-subslice (for the calculation above, we have supposed 8 subslices which is the maximum SKU we expect).
v2: Rebase.
v3: Use the right size as per the BSpec.
BSpec: 18907
--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -41,6 +41,7 @@#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE) +#define GEN11_LR_CONTEXT_RENDER_SIZE (14 * PAGE_SIZE)#define GEN8_LR_CONTEXT_OTHER_SIZE ( 2 * PAGE_SIZE)
@@ -181,6 +182,8 @@ struct engine_info {switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv)); +case 11 : +return GEN11_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: [PATCH v3] drm/i915/icl: Gen11 render context size
Quoted 37 lines · Oscar Mateo
From: Tvrtko Ursulin <[email protected]>
Gen11 removes the Resource Streamer, which frees up a big chunk of the context image. BSpec indicates 12538 DWORDs (13 pages), plus one page for PPHWSP.
Please notice that, when looking at the BSpec context image table, the right filter has to be applied (e.g. "IcelakeLP") as some rows are excluded for specific GENs. Also, some rows apply per-subslice (for the calculation above, we have supposed 8 subslices which is the maximum SKU we expect).
v2: Rebase.
v3: Use the right size as per the BSpec.BSpec: 18907
Acked-by Ben Widawsky <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Oscar Mateo <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_engine_cs.c +1
-0@@ -41,6 +41,7 @@#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE) +#define GEN11_LR_CONTEXT_RENDER_SIZE (14 * PAGE_SIZE)#define GEN8_LR_CONTEXT_OTHER_SIZE ( 2 * PAGE_SIZE)
drivers/gpu/drm/i915/intel_engine_cs.c struct engine_info { · line 184
Quoted 3 lines
drivers/gpu/drm/i915/intel_engine_cs.c +0
-0@@ -181,6 +182,8 @@ struct engine_info {switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv));
I believe this default is getting danger as we decrease the size here. I believe the safest one for missing case is the largest one whatever that is.
Quoted 12 lines
drivers/gpu/drm/i915/intel_engine_cs.c +2
-0+case 11 : +return GEN11_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3] drm/i915/icl: Gen11 render context size
Quoted 35 lines · Rodrigo Vivi
Quoted 34 lines · Oscar Mateo
From: Tvrtko Ursulin <[email protected]>
Gen11 removes the Resource Streamer, which frees up a big chunk of the context image. BSpec indicates 12538 DWORDs (13 pages), plus one page for PPHWSP.
Please notice that, when looking at the BSpec context image table, the right filter has to be applied (e.g. "IcelakeLP") as some rows are excluded for specific GENs. Also, some rows apply per-subslice (for the calculation above, we have supposed 8 subslices which is the maximum SKU we expect).
v2: Rebase.
v3: Use the right size as per the BSpec.BSpec: 18907
Acked-by Ben Widawsky <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Oscar Mateo <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_engine_cs.c +1
-0@@ -41,6 +41,7 @@#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE) +#define GEN11_LR_CONTEXT_RENDER_SIZE (14 * PAGE_SIZE)
Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c struct engine_info { · line 184
Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +0
-0#define GEN8_LR_CONTEXT_OTHER_SIZE ( 2 * PAGE_SIZE)@@ -181,6 +182,8 @@ struct engine_info {switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv));I believe this default is getting danger as we decrease the size here. I believe the safest one for missing case is the largest one whatever that is.
That's a very sensible idea. I don't know to put the default case in the middle of the other ones or change the numerical order, so I'll create a new define for the default case...
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c +2
-0+case 11 : +return GEN11_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :Signature · 1 line
1.9.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Return a default RCS context size
In reply to Oscar MateoInstead of returning whatever size the latest GEN used. This is because context sizes for new GENs can go up or down, but the only safe thing to do for missing cases is to use the largest known one, whatever that is.
--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +2 -0
@@ -38,6 +38,7 @@*/ #define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE) +#define DEFAULT_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE)
@@ -181,6 +182,7 @@ struct engine_info {switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv)); +return DEFAULT_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/2 drm/i915/icl: Gen11 render context size
From: Tvrtko Ursulin <[email protected]>
Gen11 removes the Resource Streamer, which frees up a big chunk of the context image. BSpec indicates 12538 DWORDs (13 pages), plus one page for PPHWSP.
Please notice that, when looking at the BSpec context image table, the right filter has to be applied as some rows are excluded for specific GENs. Also, some rows apply per-subslice (for the calculation above, we have supposed I915_MAX_SUBSLICES = 8).
v2: Rebase.
v3: Use the right size as per the BSpec.
v4:
- Rebased on top of the default context size (Rodrigo)
- Clarify in the commit message where the subslice calculation comes from.
BSpec: 18907
--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -42,6 +42,7 @@#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE) +#define GEN11_LR_CONTEXT_RENDER_SIZE (14 * PAGE_SIZE)#define GEN8_LR_CONTEXT_OTHER_SIZE ( 2 * PAGE_SIZE)
@@ -183,6 +184,8 @@ struct engine_info {default :MISSING_CASE (INTEL_GEN (dev_priv));return DEFAULT_LR_CONTEXT_RENDER_SIZE ; +case 11 : +return GEN11_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2 v4] drm/i915/icl: Gen11 render context size
Quoted 6 lines · Oscar Mateo
From: Tvrtko Ursulin <[email protected]>
Gen11 removes the Resource Streamer, which frees up a big chunk of the context image. BSpec indicates 12538 DWORDs (13 pages), plus one page for PPHWSP.
This is actually 12544 dwords according to the specs (I've already confirmed it with Oscar via IM). Still 13 pages anyway.
Thanks,
Daniele
Quoted 37 lines
Please notice that, when looking at the BSpec context image table, the right filter has to be applied as some rows are excluded for specific GENs. Also, some rows apply per-subslice (for the calculation above, we have supposed
I915_MAX_SUBSLICES= 8).v2: Rebase.
v3: Use the right size as per the BSpec.
v4:
- Rebased on top of the default context size (Rodrigo)
- Clarify in the commit message where the subslice calculation comes from.BSpec: 18907
Acked-by Ben Widawsky <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_engine_cs.c +1
-0@@ -42,6 +42,7 @@#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE) +#define GEN11_LR_CONTEXT_RENDER_SIZE (14 * PAGE_SIZE)#define GEN8_LR_CONTEXT_OTHER_SIZE ( 2 * PAGE_SIZE)
drivers/gpu/drm/i915/intel_engine_cs.c struct engine_info { · line 191
Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c +2
-0@@ -183,6 +184,8 @@ struct engine_info {default :MISSING_CASE (INTEL_GEN (dev_priv));return DEFAULT_LR_CONTEXT_RENDER_SIZE ; +case 11 : +return GEN11_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Return a default RCS context size
In reply to Oscar MateoQuoted 16 lines · Oscar Mateo
Instead of returning whatever size the latest GEN used. This is because context sizes for new GENs can go up or down, but the only safe thing to do for missing cases is to use the largest known one, whatever that is.
Suggested-by Rodrigo Vivi <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_engine_cs.c +0
-0
drivers/gpu/drm/i915/intel_engine_cs.c line 40
Quoted 3 lines
drivers/gpu/drm/i915/intel_engine_cs.c +0
-0@@ -38,6 +38,7 @@*/ #define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE)
Could use a comment here with the explanation in the commit message, but it is relatively clear anyway, so:
Thanks,
Daniele
drivers/gpu/drm/i915/intel_engine_cs.c struct engine_info { · line 188
Quoted 13 lines
drivers/gpu/drm/i915/intel_engine_cs.c +2
-0+#define DEFAULT_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)#define GEN10_LR_CONTEXT_RENDER_SIZE (18 * PAGE_SIZE)@@ -181,6 +182,7 @@ struct engine_info {switch (INTEL_GEN (dev_priv)) {default :MISSING_CASE (INTEL_GEN (dev_priv)); +return DEFAULT_LR_CONTEXT_RENDER_SIZE ;case 10 :return GEN10_LR_CONTEXT_RENDER_SIZE ;case 9 :
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/27 drm/i915/icl: Add Indirect Context Offset for Gen11
In reply to Paulo ZanoniFrom: Michel Thierry <[email protected]>
v2: rebased to intel_lr_indirect_ctx_offset
--- drivers/gpu/drm/i915/intel_lrc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_lrc.c +5 -0
@@ -204,6 +204,7 @@#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26#define GEN10_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x19 +#define GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x1A/* Typical size of the average request (2 pipecontrols and a MI_BB) */ #define EXECLISTS_REQUEST_SIZE 64/* bytes */
@@ -2148,6 +2149,10 @@ static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)default :MISSING_CASE (INTEL_GEN (engine->i915));/* fall through */ +case 11 : + indirect_ctx_offset = +GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ;case 10 : indirect_ctx_offset =GEN10_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 12/27] drm/i915/icl: Add Indirect Context Offset for Gen11
Quoted 10 lines · Paulo Zanoni
From: Michel Thierry <[email protected]>
v2: rebased to
intel_lr_indirect_ctx_offsetSigned-off-by Michel Thierry <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 5 +++++ 1 file changed, 5 insertions(+)
We can add the BSpec tag to the commit message:
Bspec: 11740
with that:
Quoted 13 lines
drivers/gpu/drm/i915/intel_lrc.c +1
-0@@ -204,6 +204,7 @@#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26#define GEN10_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x19 +#define GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x1A/* Typical size of the average request (2 pipecontrols and a MI_BB) */ #define EXECLISTS_REQUEST_SIZE 64/* bytes */
drivers/gpu/drm/i915/intel_lrc.c static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine) · line 2158
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +4
-0@@ -2148,6 +2149,10 @@ static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)default :MISSING_CASE (INTEL_GEN (engine->i915));/* fall through */ +case 11 : + indirect_ctx_offset = +GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ;case 10 : indirect_ctx_offset =GEN10_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 12/27 drm/i915/icl: Add Indirect Context Offset for Gen11
In reply to Paulo Zanoniv2: rebased to intel_lr_indirect_ctx_offset
v3: rebase, move define to intel_lrc_reg.h
BSpec: 11740
--- drivers/gpu/drm/i915/intel_lrc.c | 4 ++++ drivers/gpu/drm/i915/intel_lrc_reg.h | 1 + 2 files changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_lrc.c +4 -0
@@ -2426,6 +2426,10 @@ static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)default :MISSING_CASE (INTEL_GEN (engine->i915));/* fall through */ +case 11 : + indirect_ctx_offset = +GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ;case 10 : indirect_ctx_offset =GEN10_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ;
drivers/gpu/drm/i915/intel_lrc_reg.h +1 -0
@@ -63,5 +63,6 @@#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26#define GEN10_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x19 +#define GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x1A#endif /* _INTEL_LRC_REG_H_ */
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/27 drm/i915/icl: Gen11 forcewake support
In reply to Paulo ZanoniFrom: Daniele Ceraolo Spurio <[email protected]>
The main difference with previous GENs is that starting from Gen11 each VCS and VECS engine has its own power well, which only exist if the related engine exists in the HW.
The fallback forcewake request workaround is only needed on gen9 according to the HSDES WA entry (1604254524), so we can go back to using the simpler fw_domains_get/put functions.
BSpec: 18331
v2: fix fwtable, use array to test shadow tables, create new
accessors to avoid check on every access (Tvrtko)
v3 (from Paulo): Rebase.
v4:
- Range 09400-097FF should be FORCEWAKE_ALL (Daniele)
- Use the BIT macro for forcewake domains (Daniele)
- Add a comment about the range ordering (Oscar)
- Updated commit message (Oscar)
v5: Rebased
v6: Use I915_MAX_VCS/VECS (Michal)
v7: translate FORCEWAKE_ALL to available domains
v8: rebase, add clarification on fallback ack in commit message.
v9: fix rebase issue, change check in fw_domains_init from IS_GEN11
to GEN >= 11
--- drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_uncore.c | 148 +++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uncore.h | 27 ++++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 30 ++++-- 4 files changed, 191 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -7895,9 +7895,13 @@ enum {#define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7)#define FORCEWAKE_MT _MMIO(0xa188)/* multi-threaded */ #define FORCEWAKE_MEDIA_GEN9 _MMIO(0xa270) +#define FORCEWAKE_MEDIA_VDBOX_GEN11 (n) _MMIO(0xa540 + (n) * 4) +#define FORCEWAKE_MEDIA_VEBOX_GEN11 (n) _MMIO(0xa560 + (n) * 4)#define FORCEWAKE_RENDER_GEN9 _MMIO(0xa278)#define FORCEWAKE_BLITTER_GEN9 _MMIO(0xa188)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0x0D88) +#define FORCEWAKE_ACK_MEDIA_VDBOX_GEN11 (n) _MMIO(0x0D50 + (n) * 4) +#define FORCEWAKE_ACK_MEDIA_VEBOX_GEN11 (n) _MMIO(0x0D70 + (n) * 4)#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0x0D84)#define FORCEWAKE_ACK_BLITTER_GEN9 _MMIO(0x130044)#define FORCEWAKE_KERNEL BIT(0)
drivers/gpu/drm/i915/intel_uncore.c +144 -4
255 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.h +23 -4
@@ -37,17 +37,36 @@ enum forcewake_domain_id {FW_DOMAIN_ID_RENDER =0 ,FW_DOMAIN_ID_BLITTER ,FW_DOMAIN_ID_MEDIA , +FW_DOMAIN_ID_MEDIA_VDBOX0 , +FW_DOMAIN_ID_MEDIA_VDBOX1 , +FW_DOMAIN_ID_MEDIA_VDBOX2 , +FW_DOMAIN_ID_MEDIA_VDBOX3 , +FW_DOMAIN_ID_MEDIA_VEBOX0 , +FW_DOMAIN_ID_MEDIA_VEBOX1 ,FW_DOMAIN_ID_COUNT };enum forcewake_domains { -FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), -FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), -FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), +FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), +FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_MEDIA_VDBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX0 ), +FORCEWAKE_MEDIA_VDBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX1 ), +FORCEWAKE_MEDIA_VDBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX2 ), +FORCEWAKE_MEDIA_VDBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX3 ), +FORCEWAKE_MEDIA_VEBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX0 ), +FORCEWAKE_MEDIA_VEBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX1 ), +FORCEWAKE_ALL = (FORCEWAKE_RENDER |FORCEWAKE_BLITTER | -FORCEWAKE_MEDIA ) +FORCEWAKE_MEDIA | +FORCEWAKE_MEDIA_VDBOX0 | +FORCEWAKE_MEDIA_VDBOX1 | +FORCEWAKE_MEDIA_VDBOX2 | +FORCEWAKE_MEDIA_VDBOX3 | +FORCEWAKE_MEDIA_VEBOX0 | +FORCEWAKE_MEDIA_VEBOX1 ) }; struct intel_uncore_funcs {
drivers/gpu/drm/i915/selftests/intel_uncore.c +20 -10
@@ -61,20 +61,30 @@ static int intel_fw_table_check(const struct intel_forcewake_range *ranges,static int intel_shadow_table_check (void ) { -const i915_reg_t *reg = gen8_shadowed_regs; -unsigned int i; +struct { +const i915_reg_t *regs; +unsigned int size; + } reg_lists[] = { + { gen8_shadowed_regs,ARRAY_SIZE (gen8_shadowed_regs) }, + { gen11_shadowed_regs,ARRAY_SIZE (gen11_shadowed_regs) }, + }; +const i915_reg_t *reg; +unsigned int i, j;s32 prev; -for (i =0 , prev =-1 ; i <ARRAY_SIZE (gen8_shadowed_regs); i++, reg++) { -u32 offset =i915_mmio_reg_offset (*reg); +for (j =0 ; j <ARRAY_SIZE (reg_lists); ++j) { + reg = reg_lists[j].regs; +for (i =0 , prev =-1 ; i < reg_lists[j].size; i++, reg++) { +u32 offset =i915_mmio_reg_offset (*reg); -if (prev >= (s32 )offset) { -pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , - __func__, i, offset, prev); -return -EINVAL ; - } +if (prev >= (s32 )offset) { +pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , + __func__, i, offset, prev); +return -EINVAL ; + } - prev = offset; + prev = offset; + } }return 0 ;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 1/1 drm/i915/icl: Gen11 forcewake support
From: Daniele Ceraolo Spurio <[email protected]>
The main difference with previous GENs is that starting from Gen11 each VCS and VECS engine has its own power well, which only exist if the related engine exists in the HW.
The fallback forcewake request workaround is only needed on gen9 according to the HSDES WA entry (1604254524), so we can go back to using the simpler fw_domains_get/put functions.
BSpec: 18331
v2: fix fwtable, use array to test shadow tables, create new
accessors to avoid check on every access (Tvrtko)
v3 (from Paulo): Rebase.
v4:
- Range 09400-097FF should be FORCEWAKE_ALL (Daniele)
- Use the BIT macro for forcewake domains (Daniele)
- Add a comment about the range ordering (Oscar)
- Updated commit message (Oscar)
v5: Rebased
v6: Use I915_MAX_VCS/VECS (Michal)
v7: translate FORCEWAKE_ALL to available domains
v8: rebase, add clarification on fallback ack in commit message.
v9: fix rebase issue, change check in fw_domains_init from IS_GEN11
to GEN >= 11
v10: Generate is_genX_shadowed with a macro (Daniele)
Include gen11_fw_ranges in the selftest (Michel)
---
drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_uncore.c | 155 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 27 ++++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 31 ++++-- 4 files changed, 193 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -8015,9 +8015,13 @@ enum {#define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7)#define FORCEWAKE_MT _MMIO(0xa188)/* multi-threaded */ #define FORCEWAKE_MEDIA_GEN9 _MMIO(0xa270) +#define FORCEWAKE_MEDIA_VDBOX_GEN11 (n) _MMIO(0xa540 + (n) * 4) +#define FORCEWAKE_MEDIA_VEBOX_GEN11 (n) _MMIO(0xa560 + (n) * 4)#define FORCEWAKE_RENDER_GEN9 _MMIO(0xa278)#define FORCEWAKE_BLITTER_GEN9 _MMIO(0xa188)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0x0D88) +#define FORCEWAKE_ACK_MEDIA_VDBOX_GEN11 (n) _MMIO(0x0D50 + (n) * 4) +#define FORCEWAKE_ACK_MEDIA_VEBOX_GEN11 (n) _MMIO(0x0D70 + (n) * 4)#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0x0D84)#define FORCEWAKE_ACK_BLITTER_GEN9 _MMIO(0x130044)#define FORCEWAKE_KERNEL BIT(0)
drivers/gpu/drm/i915/intel_uncore.c +146 -10
265 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.h +23 -4
@@ -37,17 +37,36 @@ enum forcewake_domain_id {FW_DOMAIN_ID_RENDER =0 ,FW_DOMAIN_ID_BLITTER ,FW_DOMAIN_ID_MEDIA , +FW_DOMAIN_ID_MEDIA_VDBOX0 , +FW_DOMAIN_ID_MEDIA_VDBOX1 , +FW_DOMAIN_ID_MEDIA_VDBOX2 , +FW_DOMAIN_ID_MEDIA_VDBOX3 , +FW_DOMAIN_ID_MEDIA_VEBOX0 , +FW_DOMAIN_ID_MEDIA_VEBOX1 ,FW_DOMAIN_ID_COUNT };enum forcewake_domains { -FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), -FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), -FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), +FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), +FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_MEDIA_VDBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX0 ), +FORCEWAKE_MEDIA_VDBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX1 ), +FORCEWAKE_MEDIA_VDBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX2 ), +FORCEWAKE_MEDIA_VDBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX3 ), +FORCEWAKE_MEDIA_VEBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX0 ), +FORCEWAKE_MEDIA_VEBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX1 ), +FORCEWAKE_ALL = (FORCEWAKE_RENDER |FORCEWAKE_BLITTER | -FORCEWAKE_MEDIA ) +FORCEWAKE_MEDIA | +FORCEWAKE_MEDIA_VDBOX0 | +FORCEWAKE_MEDIA_VDBOX1 | +FORCEWAKE_MEDIA_VDBOX2 | +FORCEWAKE_MEDIA_VDBOX3 | +FORCEWAKE_MEDIA_VEBOX0 | +FORCEWAKE_MEDIA_VEBOX1 ) }; struct intel_uncore_funcs {
drivers/gpu/drm/i915/selftests/intel_uncore.c +21 -10
@@ -61,20 +61,30 @@ static int intel_fw_table_check(const struct intel_forcewake_range *ranges,static int intel_shadow_table_check (void ) { -const i915_reg_t *reg = gen8_shadowed_regs; -unsigned int i; +struct { +const i915_reg_t *regs; +unsigned int size; + } reg_lists[] = { + { gen8_shadowed_regs,ARRAY_SIZE (gen8_shadowed_regs) }, + { gen11_shadowed_regs,ARRAY_SIZE (gen11_shadowed_regs) }, + }; +const i915_reg_t *reg; +unsigned int i, j;s32 prev; -for (i =0 , prev =-1 ; i <ARRAY_SIZE (gen8_shadowed_regs); i++, reg++) { -u32 offset =i915_mmio_reg_offset (*reg); +for (j =0 ; j <ARRAY_SIZE (reg_lists); ++j) { + reg = reg_lists[j].regs; +for (i =0 , prev =-1 ; i < reg_lists[j].size; i++, reg++) { +u32 offset =i915_mmio_reg_offset (*reg); -if (prev >= (s32 )offset) { -pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , - __func__, i, offset, prev); -return -EINVAL ; - } +if (prev >= (s32 )offset) { +pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , + __func__, i, offset, prev); +return -EINVAL ; + } - prev = offset; + prev = offset; + } }return 0 ;
@@ -90,6 +100,7 @@ int intel_uncore_mock_selftests(void) { __vlv_fw_ranges, ARRAY_SIZE(__vlv_fw_ranges), false }, { __chv_fw_ranges, ARRAY_SIZE(__chv_fw_ranges), false }, { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, + { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, };int err, i;
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v10] drm/i915/icl: Gen11 forcewake support
Quoted 79 lines · Michel Thierry
From: Daniele Ceraolo Spurio <[email protected]>
The main difference with previous GENs is that starting from Gen11 each VCS and VECS engine has its own power well, which only exist if the related engine exists in the HW.
The fallback forcewake request workaround is only needed on gen9 according to the HSDES WA entry (1604254524), so we can go back to using the simpler fw_domains_get/put functions.BSpec: 18331
v2: fix fwtable, use array to test shadow tables, create new
accessors to avoid check on every access (Tvrtko)
v3 (from Paulo): Rebase.
v4:
- Range 09400-097FF should beFORCEWAKE_ALL(Daniele)
- Use the BIT macro for forcewake domains (Daniele)
- Add a comment about the range ordering (Oscar)
- Updated commit message (Oscar)
v5: Rebased
v6: Use I915_MAX_VCS/VECS (Michal)
v7: translateFORCEWAKE_ALLto available domains
v8: rebase, add clarification on fallback ack in commit message.
v9: fix rebase issue, change check infw_domains_initfromIS_GEN11to GEN >= 11v10: Generate
is_genX_shadowedwith a macro (Daniele)
Includegen11_fw_rangesin the selftest (Michel)Cc Michal Wajdeczko <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Paulo Zanoni <[email protected]>Acked-by Michel Thierry <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Michel Thierry <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_uncore.c | 155 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 27 ++++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 31 ++++-- 4 files changed, 193 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -8015,9 +8015,13 @@ enum {#define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7)#define FORCEWAKE_MT _MMIO(0xa188)/* multi-threaded */ #define FORCEWAKE_MEDIA_GEN9 _MMIO(0xa270) +#define FORCEWAKE_MEDIA_VDBOX_GEN11 (n) _MMIO(0xa540 + (n) * 4) +#define FORCEWAKE_MEDIA_VEBOX_GEN11 (n) _MMIO(0xa560 + (n) * 4)#define FORCEWAKE_RENDER_GEN9 _MMIO(0xa278)#define FORCEWAKE_BLITTER_GEN9 _MMIO(0xa188)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0x0D88) +#define FORCEWAKE_ACK_MEDIA_VDBOX_GEN11 (n) _MMIO(0x0D50 + (n) * 4) +#define FORCEWAKE_ACK_MEDIA_VEBOX_GEN11 (n) _MMIO(0x0D70 + (n) * 4)#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0x0D84)#define FORCEWAKE_ACK_BLITTER_GEN9 _MMIO(0x130044)#define FORCEWAKE_KERNEL BIT(0)drivers/gpu/drm/i915/intel_uncore.c +6
-0@@ -37,6 +37,12 @@ static const char * const forcewake_domain_names[] = {"render" ,"blitter" ,"media" , +"vdbox0" , +"vdbox1" , +"vdbox2" , +"vdbox3" , +"vebox0" , + "vebox1", }; const char *
drivers/gpu/drm/i915/intel_uncore.c void assert_forcewakes_active(struct drm_i915_private *dev_priv, · line 783
Quoted 5 lines
drivers/gpu/drm/i915/intel_uncore.c +2
-0@@ -773,6 +779,8 @@ void assert_forcewakes_active(struct drm_i915_private *dev_priv,/* We give fast paths for the really cool registers */ #define NEEDS_FORCE_WAKE (reg) ((reg) < 0x40000) +#define GEN11_NEEDS_FORCE_WAKE (reg) \ + ((reg) < 0x40000 || ((reg) >= 0x1c0000 && (reg) < 0x1dc000))
Nitpick - I'd perhaps at least have a blank line between the two defines, or even moved the GEN11 lower in file, just before the first mention of GEN11 specific code starts appearing.
Quoted 295 lines
drivers/gpu/drm/i915/intel_uncore.c +138
-10#define __gen6_reg_read_fw_domains (offset) \ ({ \@@ -826,6 +834,14 @@ find_fw_domain(struct drm_i915_private *dev_priv, u32 offset)if (!entry)return 0 ; +/* +* The list of FW domains depends on the SKU in gen11+ so we +* can't determine it statically. We use FORCEWAKE_ALL and +* translate it here to the list of available domains. +*/ +if (entry->domains ==FORCEWAKE_ALL ) +return dev_priv->uncore.fw_domains; +WARN (entry->domains & ~dev_priv->uncore.fw_domains,"Uninitialized forcewake domain(s) 0x%x accessed at 0x%x\n" , entry->domains & ~dev_priv->uncore.fw_domains, offset);@@ -860,6 +876,14 @@ static const struct intel_forcewake_range __vlv_fw_ranges[] = { __fwd; \ }) +#define __gen11_fwtable_reg_read_fw_domains (offset) \ +({ \ + enum forcewake_domains __fwd = 0; \ + if (GEN11_NEEDS_FORCE_WAKE((offset))) \ + __fwd = find_fw_domain(dev_priv, offset); \ + __fwd; \ +}) +/* *Must* be sorted by offset! See intel_shadow_table_check(). */ static const i915_reg_t gen8_shadowed_regs[] = {RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ @@ -871,6 +895,20 @@ static const i915_reg_t gen8_shadowed_regs[] = {/* TODO: Other registers are not yet used */ }; +static const i915_reg_t gen11_shadowed_regs[] = { +RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ +GEN6_RPNSWREQ ,/* 0xA008 */ +GEN6_RC_VIDEO_FREQ ,/* 0xA00C */ +RING_TAIL (BLT_RING_BASE ),/* 0x22000 (base) */ +RING_TAIL (GEN11_BSD_RING_BASE ),/* 0x1C0000 (base) */ +RING_TAIL (GEN11_BSD2_RING_BASE ),/* 0x1C4000 (base) */ +RING_TAIL (GEN11_VEBOX_RING_BASE ),/* 0x1C8000 (base) */ +RING_TAIL (GEN11_BSD3_RING_BASE ),/* 0x1D0000 (base) */ +RING_TAIL (GEN11_BSD4_RING_BASE ),/* 0x1D4000 (base) */ +RING_TAIL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8000 (base) */ +/* TODO: Other registers are not yet used */ +}; +static int mmio_reg_cmp (u32 key,const i915_reg_t *reg) {u32 offset =i915_mmio_reg_offset (*reg);@@ -883,14 +921,17 @@ static int mmio_reg_cmp(u32 key, const i915_reg_t *reg)return 0 ; } -static bool is_gen8_shadowed (u32 offset) -{ -const i915_reg_t *regs = gen8_shadowed_regs; - -return BSEARCH (offset, regs,ARRAY_SIZE (gen8_shadowed_regs), - mmio_reg_cmp); +#define __is_genX_shadowed (x) \ +static bool is_gen##x##_shadowed(u32 offset) \ +{ \ + const i915_reg_t *regs = gen##x##_shadowed_regs; \ + return BSEARCH(offset, regs, ARRAY_SIZE(gen##x##_shadowed_regs), \ + mmio_reg_cmp); \ } +__is_genX_shadowed(8) +__is_genX_shadowed(11) +#define __gen8_reg_write_fw_domains (offset) \ ({ \ enum forcewake_domains __fwd; \@@ -929,6 +970,14 @@ static const struct intel_forcewake_range __chv_fw_ranges[] = { __fwd; \ }) +#define __gen11_fwtable_reg_write_fw_domains (offset) \ +({ \ + enum forcewake_domains __fwd = 0; \ + if (GEN11_NEEDS_FORCE_WAKE((offset)) && !is_gen11_shadowed(offset)) \ + __fwd = find_fw_domain(dev_priv, offset); \ + __fwd; \ +}) +/* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ static const struct intel_forcewake_range __gen9_fw_ranges[] = {GEN_FW_RANGE (0x0 ,0xaff ,FORCEWAKE_BLITTER ),@@ -965,6 +1014,40 @@ static const struct intel_forcewake_range __gen9_fw_ranges[] = { GEN_FW_RANGE(0x30000, 0x3ffff, FORCEWAKE_MEDIA), }; +/* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ +static const struct intel_forcewake_range __gen11_fw_ranges[] = { +GEN_FW_RANGE (0x0 ,0xaff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0xb00 ,0x1fff ,0 ),/* uncore range */ +GEN_FW_RANGE (0x2000 ,0x26ff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x2700 ,0x2fff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x3000 ,0x3fff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x4000 ,0x51ff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x5200 ,0x7fff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8000 ,0x813f ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x8140 ,0x815f ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8160 ,0x82ff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x8300 ,0x84ff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8500 ,0x8bff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x8c00 ,0x8cff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8d00 ,0x93ff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x9400 ,0x97ff ,FORCEWAKE_ALL ), +GEN_FW_RANGE (0x9800 ,0xafff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0xb000 ,0xb47f ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0xb480 ,0xdfff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0xe000 ,0xe8ff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0xe900 ,0x243ff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x24400 ,0x247ff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x24800 ,0x3ffff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x40000 ,0x1bffff ,0 ), +GEN_FW_RANGE (0x1c0000 ,0x1c3fff ,FORCEWAKE_MEDIA_VDBOX0 ), +GEN_FW_RANGE (0x1c4000 ,0x1c7fff ,FORCEWAKE_MEDIA_VDBOX1 ), +GEN_FW_RANGE (0x1c8000 ,0x1cbfff ,FORCEWAKE_MEDIA_VEBOX0 ), +GEN_FW_RANGE (0x1cc000 ,0x1cffff ,FORCEWAKE_BLITTER ), +GEN_FW_RANGE (0x1d0000 ,0x1d3fff ,FORCEWAKE_MEDIA_VDBOX2 ), +GEN_FW_RANGE (0x1d4000 ,0x1d7fff ,FORCEWAKE_MEDIA_VDBOX3 ), +GEN_FW_RANGE (0x1d8000 ,0x1dbfff ,FORCEWAKE_MEDIA_VEBOX1 ) +}; +static void ilk_dummy_write (struct drm_i915_private *dev_priv) {@@ -1095,7 +1178,12 @@ func##_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { }#define __gen6_read (x) __gen_read(gen6, x)#define __fwtable_read (x) __gen_read(fwtable, x) +#define __gen11_fwtable_read (x) __gen_read(gen11_fwtable, x) +__gen11_fwtable_read(8) +__gen11_fwtable_read(16) +__gen11_fwtable_read(32) +__gen11_fwtable_read(64) __fwtable_read(8) __fwtable_read(16)__fwtable_read (32 )@@ -1105,6 +1193,7 @@ __gen6_read(16) __gen6_read(32) __gen6_read(64) +#undef __gen11_fwtable_read#undef __fwtable_read#undef __gen6_read#undef GEN6_READ_FOOTER@@ -1181,7 +1270,11 @@ func##_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, boo }#define __gen8_write (x) __gen_write(gen8, x)#define __fwtable_write (x) __gen_write(fwtable, x) +#define __gen11_fwtable_write (x) __gen_write(gen11_fwtable, x) +__gen11_fwtable_write(8) +__gen11_fwtable_write(16) +__gen11_fwtable_write(32) __fwtable_write(8) __fwtable_write(16)__fwtable_write (32 )@@ -1192,6 +1285,7 @@ __gen6_write(8) __gen6_write(16) __gen6_write(32) +#undef __gen11_fwtable_write#undef __fwtable_write#undef __gen8_write#undef __gen6_write@@ -1240,6 +1334,13 @@ static void fw_domain_init(struct drm_i915_private *dev_priv,BUILD_BUG_ON (FORCEWAKE_RENDER != (1 <<FW_DOMAIN_ID_RENDER ));BUILD_BUG_ON (FORCEWAKE_BLITTER != (1 <<FW_DOMAIN_ID_BLITTER ));BUILD_BUG_ON (FORCEWAKE_MEDIA != (1 <<FW_DOMAIN_ID_MEDIA )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX0 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX0 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX1 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX1 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX2 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX2 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX3 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX3 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VEBOX0 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX0 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VEBOX1 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX1 )); + d->mask =BIT (domain_id);@@ -1267,7 +1368,34 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) dev_priv->uncore.fw_clear =_MASKED_BIT_DISABLE (FORCEWAKE_KERNEL ); } -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=11 ) { +int i; + + dev_priv->uncore.funcs.force_wake_get = fw_domains_get; + dev_priv->uncore.funcs.force_wake_put = fw_domains_put; +fw_domain_init (dev_priv,FW_DOMAIN_ID_RENDER , +FORCEWAKE_RENDER_GEN9 , +FORCEWAKE_ACK_RENDER_GEN9 ); +fw_domain_init (dev_priv,FW_DOMAIN_ID_BLITTER , +FORCEWAKE_BLITTER_GEN9 , +FORCEWAKE_ACK_BLITTER_GEN9 ); +for (i =0 ; i <I915_MAX_VCS ; i++) { +if (!HAS_ENGINE (dev_priv,_VCS (i))) +continue ; + +fw_domain_init (dev_priv,FW_DOMAIN_ID_MEDIA_VDBOX0 + i, +FORCEWAKE_MEDIA_VDBOX_GEN11 (i), +FORCEWAKE_ACK_MEDIA_VDBOX_GEN11 (i)); + } +for (i =0 ; i <I915_MAX_VECS ; i++) { +if (!HAS_ENGINE (dev_priv,_VECS (i))) +continue ; + +fw_domain_init (dev_priv,FW_DOMAIN_ID_MEDIA_VEBOX0 + i, +FORCEWAKE_MEDIA_VEBOX_GEN11 (i), +FORCEWAKE_ACK_MEDIA_VEBOX_GEN11 (i)); + } + }else if (IS_GEN9 (dev_priv) ||IS_GEN10 (dev_priv)) { dev_priv->uncore.funcs.force_wake_get = fw_domains_get_with_fallback; dev_priv->uncore.funcs.force_wake_put = fw_domains_put;@@ -1422,10 +1549,14 @@ void intel_uncore_init(struct drm_i915_private *dev_priv)ASSIGN_WRITE_MMIO_VFUNCS (dev_priv, gen8);ASSIGN_READ_MMIO_VFUNCS (dev_priv, gen6); } - }else { + }else if (IS_GEN (dev_priv,9 ,10 )) {ASSIGN_FW_DOMAINS_TABLE (__gen9_fw_ranges);ASSIGN_WRITE_MMIO_VFUNCS (dev_priv, fwtable);ASSIGN_READ_MMIO_VFUNCS (dev_priv, fwtable); + }else { +ASSIGN_FW_DOMAINS_TABLE (__gen11_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (dev_priv, gen11_fwtable); +ASSIGN_READ_MMIO_VFUNCS (dev_priv, gen11_fwtable); } iosf_mbi_register_pmic_bus_access_notifier(@@ -1985,7 +2116,9 @@ intel_uncore_forcewake_for_read(struct drm_i915_private *dev_priv,u32 offset =i915_mmio_reg_offset (reg);enum forcewake_domains fw_domains; -if (HAS_FWTABLE (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ) { + fw_domains =__gen11_fwtable_reg_read_fw_domains (offset); + }else if (HAS_FWTABLE (dev_priv)) { fw_domains =__fwtable_reg_read_fw_domains (offset); }else if (INTEL_GEN (dev_priv) >=6 ) { fw_domains =__gen6_reg_read_fw_domains (offset);@@ -2006,7 +2139,9 @@ intel_uncore_forcewake_for_write(struct drm_i915_private *dev_priv,u32 offset =i915_mmio_reg_offset (reg);enum forcewake_domains fw_domains; -if (HAS_FWTABLE (dev_priv) && !IS_VALLEYVIEW (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ) { + fw_domains =__gen11_fwtable_reg_write_fw_domains (offset); + }else if (HAS_FWTABLE (dev_priv) && !IS_VALLEYVIEW (dev_priv)) { fw_domains =__fwtable_reg_write_fw_domains (offset); }else if (IS_GEN8 (dev_priv)) { fw_domains =__gen8_reg_write_fw_domains (offset);drivers/gpu/drm/i915/intel_uncore.h +16
-3@@ -37,17 +37,36 @@ enum forcewake_domain_id {FW_DOMAIN_ID_RENDER =0 ,FW_DOMAIN_ID_BLITTER ,FW_DOMAIN_ID_MEDIA , +FW_DOMAIN_ID_MEDIA_VDBOX0 , +FW_DOMAIN_ID_MEDIA_VDBOX1 , +FW_DOMAIN_ID_MEDIA_VDBOX2 , +FW_DOMAIN_ID_MEDIA_VDBOX3 , +FW_DOMAIN_ID_MEDIA_VEBOX0 , +FW_DOMAIN_ID_MEDIA_VEBOX1 ,FW_DOMAIN_ID_COUNT };enum forcewake_domains { -FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), -FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), - FORCEWAKE_MEDIA = BIT(FW_DOMAIN_ID_MEDIA), +FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), +FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), +FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_MEDIA_VDBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX0 ), +FORCEWAKE_MEDIA_VDBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX1 ), +FORCEWAKE_MEDIA_VDBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX2 ), +FORCEWAKE_MEDIA_VDBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX3 ), +FORCEWAKE_MEDIA_VEBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX0 ), + FORCEWAKE_MEDIA_VEBOX1 = BIT(FW_DOMAIN_ID_MEDIA_VEBOX1), +
drivers/gpu/drm/i915/intel_uncore.h enum forcewake_domain_id { · line 69
Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.h +7
-1FORCEWAKE_ALL = (FORCEWAKE_RENDER |FORCEWAKE_BLITTER | -FORCEWAKE_MEDIA ) +FORCEWAKE_MEDIA | +FORCEWAKE_MEDIA_VDBOX0 | +FORCEWAKE_MEDIA_VDBOX1 | +FORCEWAKE_MEDIA_VDBOX2 | +FORCEWAKE_MEDIA_VDBOX3 | +FORCEWAKE_MEDIA_VEBOX0 | +FORCEWAKE_MEDIA_VEBOX1 )
If I am not confused, this this could be simplified as:
FORCEWAKE_ALL = BIT(FW_DOMAIN_ID_COUNT) - 1;
Quoted 50 lines
drivers/gpu/drm/i915/intel_uncore.h +0
-0};struct intel_uncore_funcs {drivers/gpu/drm/i915/selftests/intel_uncore.c +20
-10@@ -61,20 +61,30 @@ static int intel_fw_table_check(const struct intel_forcewake_range *ranges,static int intel_shadow_table_check (void ) { -const i915_reg_t *reg = gen8_shadowed_regs; -unsigned int i; +struct { +const i915_reg_t *regs; +unsigned int size; + } reg_lists[] = { + { gen8_shadowed_regs,ARRAY_SIZE (gen8_shadowed_regs) }, + { gen11_shadowed_regs,ARRAY_SIZE (gen11_shadowed_regs) }, + }; +const i915_reg_t *reg; +unsigned int i, j;s32 prev; -for (i =0 , prev =-1 ; i <ARRAY_SIZE (gen8_shadowed_regs); i++, reg++) { -u32 offset =i915_mmio_reg_offset (*reg); +for (j =0 ; j <ARRAY_SIZE (reg_lists); ++j) { + reg = reg_lists[j].regs; +for (i =0 , prev =-1 ; i < reg_lists[j].size; i++, reg++) { +u32 offset =i915_mmio_reg_offset (*reg); -if (prev >= (s32 )offset) { -pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , - __func__, i, offset, prev); -return -EINVAL ; - } +if (prev >= (s32 )offset) { +pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , + __func__, i, offset, prev); +return -EINVAL ; + } - prev = offset; + prev = offset; + } }return 0 ;
drivers/gpu/drm/i915/selftests/intel_uncore.c int intel_uncore_mock_selftests(void) · line 106
Quoted 7 lines
drivers/gpu/drm/i915/selftests/intel_uncore.c +1
-0@@ -90,6 +100,7 @@ int intel_uncore_mock_selftests(void) { __vlv_fw_ranges, ARRAY_SIZE(__vlv_fw_ranges), false }, { __chv_fw_ranges, ARRAY_SIZE(__chv_fw_ranges), false }, { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, + { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, };int err, i;
I haven't checked the ranges, but the code looks good. With or without the nitpicks:
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v10] drm/i915/icl: Gen11 forcewake support
Quoted 80 lines · Tvrtko Ursulin
Quoted 78 lines · Michel Thierry
From: Daniele Ceraolo Spurio <[email protected]>
The main difference with previous GENs is that starting from Gen11 each VCS and VECS engine has its own power well, which only exist if the related engine exists in the HW.
The fallback forcewake request workaround is only needed on gen9 according to the HSDES WA entry (1604254524), so we can go back to using the simpler fw_domains_get/put functions.BSpec: 18331
v2: fix fwtable, use array to test shadow tables, create new accessors to avoid check on every access (Tvrtko) v3 (from Paulo): Rebase.
v4:
- Range 09400-097FF should beFORCEWAKE_ALL(Daniele)
- Use the BIT macro for forcewake domains (Daniele)
- Add a comment about the range ordering (Oscar)
- Updated commit message (Oscar)
v5: Rebased
v6: Use I915_MAX_VCS/VECS (Michal)
v7: translateFORCEWAKE_ALLto available domains
v8: rebase, add clarification on fallback ack in commit message.
v9: fix rebase issue, change check infw_domains_initfromIS_GEN11to GEN >= 11
v10: Generateis_genX_shadowedwith a macro (Daniele) Includegen11_fw_rangesin the selftest (Michel)Cc Michal Wajdeczko <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Paulo Zanoni <[email protected]>Acked-by Michel Thierry <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Michel Thierry <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_uncore.c | 155
++++++++++++++++++++++++--
drivers/gpu/drm/i915/intel_uncore.h | 27 ++++-drivers/gpu/drm/i915/selftests/intel_uncore.c| 31 ++++--4 files changed, 193 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -8015,9 +8015,13 @@ enum { #define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7) #define FORCEWAKE_MT _MMIO(0xa188) /* multi-threaded */ #define FORCEWAKE_MEDIA_GEN9 _MMIO(0xa270) +#define FORCEWAKE_MEDIA_VDBOX_GEN11(n) _MMIO(0xa540 + (n) * 4) +#define FORCEWAKE_MEDIA_VEBOX_GEN11(n) _MMIO(0xa560 + (n) * 4) #define FORCEWAKE_RENDER_GEN9 _MMIO(0xa278) #define FORCEWAKE_BLITTER_GEN9 _MMIO(0xa188) #define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0x0D88) +#define FORCEWAKE_ACK_MEDIA_VDBOX_GEN11(n) _MMIO(0x0D50 + (n) * 4) +#define FORCEWAKE_ACK_MEDIA_VEBOX_GEN11(n) _MMIO(0x0D70 + (n) * 4) #define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0x0D84) #define FORCEWAKE_ACK_BLITTER_GEN9 _MMIO(0x130044) #define FORCEWAKE_KERNEL BIT(0)drivers/gpu/drm/i915/intel_uncore.c +6
-0@@ -37,6 +37,12 @@ static const char * const forcewake_domain_names[] = { "render", "blitter", "media", + "vdbox0", + "vdbox1", + "vdbox2", + "vdbox3", + "vebox0", + "vebox1", };const char *
Quoted 9 lines
drivers/gpu/drm/i915/intel_uncore.c void assert_forcewakes_active(struct · line 783
Quoted 6 lines
drivers/gpu/drm/i915/intel_uncore.c +2
-0@@ -773,6 +779,8 @@ void assert_forcewakes_active(structdrm_i915_private *dev_priv, /* We give fast paths for the really cool registers */ #define NEEDS_FORCE_WAKE(reg) ((reg) < 0x40000) +#define GEN11_NEEDS_FORCE_WAKE(reg) \ + ((reg) < 0x40000 || ((reg) >= 0x1c0000 && (reg) < 0x1dc000))Nitpick - I'd perhaps at least have a blank line between the two defines, or even moved the GEN11 lower in file, just before the first mention of GEN11 specific code starts appearing.
I'd go for a new blank line, it makes it obvious something changed between gens.
Quoted 307 lines
Quoted 298 lines
drivers/gpu/drm/i915/intel_uncore.c +16
-0#define __gen6_reg_read_fw_domains(offset) \ ({ \@@ -826,6 +834,14 @@ find_fw_domain(struct drm_i915_private *dev_priv, u32 offset) if (!entry) return 0; + /* + * The list of FW domains depends on the SKU in gen11+ so we + * can't determine it statically. We use FORCEWAKE_ALL and + * translate it here to the list of available domains. + */ + if (entry->domains == FORCEWAKE_ALL) + return dev_priv->uncore.fw_domains; + WARN(entry->domains & ~dev_priv->uncore.fw_domains, "Uninitialized forcewake domain(s) 0x%x accessed at 0x%x\n", entry->domains & ~dev_priv->uncore.fw_domains, offset);@@ -860,6 +876,14 @@ static const struct intel_forcewake_range __vlv_fw_ranges[] = { __fwd; \ }) +#define __gen11_fwtable_reg_read_fw_domains (offset) \ +({ \ + enum forcewake_domains __fwd = 0; \ + if (GEN11_NEEDS_FORCE_WAKE((offset))) \ + __fwd = find_fw_domain(dev_priv, offset); \ + __fwd; \ +}) + /* *Must* be sorted by offset! See intel_shadow_table_check(). */ static const i915_reg_t gen8_shadowed_regs[] = {RING_TAIL(RENDER_RING_BASE), /*
0x2000(base) */drivers/gpu/drm/i915/intel_uncore.c +31
-6@@ -871,6 +895,20 @@ static const i915_reg_t gen8_shadowed_regs[] = { /* TODO: Other registers are not yet used */ }; +static const i915_reg_t gen11_shadowed_regs[] = { + RING_TAIL(RENDER_RING_BASE), /* 0x2000 (base) */ + GEN6_RPNSWREQ, /* 0xA008 */ + GEN6_RC_VIDEO_FREQ, /* 0xA00C */ + RING_TAIL(BLT_RING_BASE), /* 0x22000 (base) */ + RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */ + RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */ + RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */ + RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */ + RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */ + RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */ + /* TODO: Other registers are not yet used */ +}; + static int mmio_reg_cmp(u32 key, const i915_reg_t *reg) { u32 offset = i915_mmio_reg_offset(*reg);@@ -883,14 +921,17 @@ static int mmio_reg_cmp(u32 key, const i915_reg_t *reg) return 0; } -static bool is_gen8_shadowed (u32 offset) -{ - const i915_reg_t *regs = gen8_shadowed_regs; - - return BSEARCH(offset, regs, ARRAY_SIZE(gen8_shadowed_regs), - mmio_reg_cmp); +#define __is_genX_shadowed (x) \ +static bool is_gen##x##_shadowed(u32 offset) \ +{ \ + const i915_reg_t *regs = gen##x##_shadowed_regs; \ + return BSEARCH(offset, regs, ARRAY_SIZE(gen##x##_shadowed_regs), \ + mmio_reg_cmp); \ } +__is_genX_shadowed(8) +__is_genX_shadowed(11) + #define __gen8_reg_write_fw_domains(offset) \ ({ \ enum forcewake_domains __fwd; \@@ -929,6 +970,14 @@ static const struct intel_forcewake_range __chv_fw_ranges[] = { __fwd; \ }) +#define __gen11_fwtable_reg_write_fw_domains (offset) \ +({ \ + enum forcewake_domains __fwd = 0; \ + if (GEN11_NEEDS_FORCE_WAKE((offset)) && !is_gen11_shadowed(offset)) \ + __fwd = find_fw_domain(dev_priv, offset); \ + __fwd; \ +}) + /* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ static const struct intel_forcewake_range __gen9_fw_ranges[] = {
GEN_FW_RANGE(0x0, 0xaff, FORCEWAKE_BLITTER),drivers/gpu/drm/i915/intel_uncore.c +34
-0@@ -965,6 +1014,40 @@ static const struct intel_forcewake_range __gen9_fw_ranges[] = { GEN_FW_RANGE(0x30000, 0x3ffff, FORCEWAKE_MEDIA), }; +/* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ +static const struct intel_forcewake_range __gen11_fw_ranges[] = { + GEN_FW_RANGE(0x0, 0xaff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0xb00, 0x1fff, 0), /* uncore range */ + GEN_FW_RANGE(0x2000, 0x26ff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x2700, 0x2fff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x3000, 0x3fff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x4000, 0x51ff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x5200, 0x7fff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x8000, 0x813f, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x8140, 0x815f, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x8160, 0x82ff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x8300, 0x84ff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x8500, 0x8bff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x8c00, 0x8cff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x8d00, 0x93ff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x9400, 0x97ff, FORCEWAKE_ALL), + GEN_FW_RANGE(0x9800, 0xafff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0xb000, 0xb47f, FORCEWAKE_RENDER), + GEN_FW_RANGE(0xb480, 0xdfff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0xe000, 0xe8ff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0xe900, 0x243ff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x24400, 0x247ff, FORCEWAKE_RENDER), + GEN_FW_RANGE(0x24800, 0x3ffff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x40000, 0x1bffff, 0), + GEN_FW_RANGE(0x1c0000, 0x1c3fff, FORCEWAKE_MEDIA_VDBOX0), + GEN_FW_RANGE(0x1c4000, 0x1c7fff, FORCEWAKE_MEDIA_VDBOX1), + GEN_FW_RANGE(0x1c8000, 0x1cbfff, FORCEWAKE_MEDIA_VEBOX0), + GEN_FW_RANGE(0x1cc000, 0x1cffff, FORCEWAKE_BLITTER), + GEN_FW_RANGE(0x1d0000, 0x1d3fff, FORCEWAKE_MEDIA_VDBOX2), + GEN_FW_RANGE(0x1d4000, 0x1d7fff, FORCEWAKE_MEDIA_VDBOX3), + GEN_FW_RANGE(0x1d8000, 0x1dbfff, FORCEWAKE_MEDIA_VEBOX1) +}; +static void
ilk_dummy_write(struct drm_i915_private *dev_priv){drivers/gpu/drm/i915/intel_uncore.c +14
-0@@ -1095,7 +1178,12 @@ func##_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { } #define __gen6_read(x) __gen_read(gen6, x) #define __fwtable_read(x) __gen_read(fwtable, x) +#define __gen11_fwtable_read (x) __gen_read(gen11_fwtable, x) +__gen11_fwtable_read(8) +__gen11_fwtable_read(16) +__gen11_fwtable_read(32) +__gen11_fwtable_read(64) __fwtable_read(8) __fwtable_read(16) __fwtable_read(32)@@ -1105,6 +1193,7 @@ __gen6_read(16) __gen6_read(32) __gen6_read(64) +#undef __gen11_fwtable_read #undef __fwtable_read #undef __gen6_read #undef GEN6_READ_FOOTER@@ -1181,7 +1270,11 @@ func##_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, boo } #define __gen8_write(x) __gen_write(gen8, x) #define __fwtable_write(x) __gen_write(fwtable, x) +#define __gen11_fwtable_write (x) __gen_write(gen11_fwtable, x) +__gen11_fwtable_write(8) +__gen11_fwtable_write(16) +__gen11_fwtable_write(32) __fwtable_write(8) __fwtable_write(16) __fwtable_write(32)@@ -1192,6 +1285,7 @@ __gen6_write(8) __gen6_write(16) __gen6_write(32) +#undef __gen11_fwtable_write #undef __fwtable_write #undef __gen8_write #undef __gen6_write@@ -1240,6 +1334,13 @@ static void fw_domain_init(structdrm_i915_private *dev_priv, BUILD_BUG_ON(FORCEWAKE_RENDER != (1 << FW_DOMAIN_ID_RENDER)); BUILD_BUG_ON(FORCEWAKE_BLITTER != (1 << FW_DOMAIN_ID_BLITTER)); BUILD_BUG_ON(FORCEWAKE_MEDIA != (1 << FW_DOMAIN_ID_MEDIA)); + BUILD_BUG_ON(FORCEWAKE_MEDIA_VDBOX0 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX0 )); + BUILD_BUG_ON(FORCEWAKE_MEDIA_VDBOX1 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX1 )); + BUILD_BUG_ON(FORCEWAKE_MEDIA_VDBOX2 != (1 <<
FW_DOMAIN_ID_MEDIA_VDBOX2));
+ BUILD_BUG_ON(FORCEWAKE_MEDIA_VDBOX3 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX3));
+ BUILD_BUG_ON(FORCEWAKE_MEDIA_VEBOX0 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX0));
+ BUILD_BUG_ON(FORCEWAKE_MEDIA_VEBOX1 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX1));
+
d->mask=BIT(domain_id);drivers/gpu/drm/i915/intel_uncore.c +28
-1@@ -1267,7 +1368,34 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) dev_priv->uncore.fw_clear = _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL); } - if (INTEL_GEN(dev_priv) >= 9) { + if (INTEL_GEN(dev_priv) >= 11) { + int i; + + dev_priv->uncore.funcs.force_wake_get = fw_domains_get; + dev_priv->uncore.funcs.force_wake_put = fw_domains_put; + fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER, + FORCEWAKE_RENDER_GEN9, + FORCEWAKE_ACK_RENDER_GEN9); + fw_domain_init(dev_priv, FW_DOMAIN_ID_BLITTER, + FORCEWAKE_BLITTER_GEN9, + FORCEWAKE_ACK_BLITTER_GEN9); + for (i = 0; i < I915_MAX_VCS; i++) { + if (!HAS_ENGINE(dev_priv, _VCS(i))) + continue; + + fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA_VDBOX0 + i, + FORCEWAKE_MEDIA_VDBOX_GEN11(i), + FORCEWAKE_ACK_MEDIA_VDBOX_GEN11(i)); + } + for (i = 0; i < I915_MAX_VECS; i++) { + if (!HAS_ENGINE(dev_priv, _VECS(i))) + continue; + + fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA_VEBOX0 + i, + FORCEWAKE_MEDIA_VEBOX_GEN11(i), + FORCEWAKE_ACK_MEDIA_VEBOX_GEN11(i)); + } + } else if (IS_GEN9(dev_priv) || IS_GEN10(dev_priv)) {
dev_priv->uncore.funcs.force_wake_get=fw_domains_get_with_fallback;dev_priv->uncore.funcs.force_wake_put=fw_domains_put;drivers/gpu/drm/i915/intel_uncore.c +5
-1@@ -1422,10 +1549,14 @@ void intel_uncore_init(struct drm_i915_private *dev_priv) ASSIGN_WRITE_MMIO_VFUNCS(dev_priv, gen8); ASSIGN_READ_MMIO_VFUNCS(dev_priv, gen6); } - } else { + } else if (IS_GEN(dev_priv, 9, 10)) { ASSIGN_FW_DOMAINS_TABLE(__gen9_fw_ranges); ASSIGN_WRITE_MMIO_VFUNCS(dev_priv, fwtable); ASSIGN_READ_MMIO_VFUNCS(dev_priv, fwtable); + } else { + ASSIGN_FW_DOMAINS_TABLE(__gen11_fw_ranges); + ASSIGN_WRITE_MMIO_VFUNCS(dev_priv, gen11_fwtable); + ASSIGN_READ_MMIO_VFUNCS(dev_priv, gen11_fwtable); }iosf_mbi_register_pmic_bus_access_notifier(
drivers/gpu/drm/i915/intel_uncore.c +6
-2@@ -1985,7 +2116,9 @@ intel_uncore_forcewake_for_read(structdrm_i915_private *dev_priv, u32 offset = i915_mmio_reg_offset(reg); enum forcewake_domains fw_domains; - if (HAS_FWTABLE(dev_priv)) { + if (INTEL_GEN(dev_priv) >= 11) { + fw_domains = __gen11_fwtable_reg_read_fw_domains(offset); + } else if (HAS_FWTABLE(dev_priv)) { fw_domains = __fwtable_reg_read_fw_domains(offset); } else if (INTEL_GEN(dev_priv) >= 6) { fw_domains = __gen6_reg_read_fw_domains(offset);@@ -2006,7 +2139,9 @@ intel_uncore_forcewake_for_write(structdrm_i915_private *dev_priv, u32 offset = i915_mmio_reg_offset(reg); enum forcewake_domains fw_domains; - if (HAS_FWTABLE(dev_priv) && !IS_VALLEYVIEW(dev_priv)) { + if (INTEL_GEN(dev_priv) >= 11) { + fw_domains = __gen11_fwtable_reg_write_fw_domains(offset); + } else if (HAS_FWTABLE(dev_priv) && !IS_VALLEYVIEW(dev_priv)) { fw_domains = __fwtable_reg_write_fw_domains(offset); } else if (IS_GEN8(dev_priv)) { fw_domains = __gen8_reg_write_fw_domains(offset);drivers/gpu/drm/i915/intel_uncore.h +6
-0@@ -37,17 +37,36 @@ enum forcewake_domain_id { FW_DOMAIN_ID_RENDER = 0, FW_DOMAIN_ID_BLITTER, FW_DOMAIN_ID_MEDIA, + FW_DOMAIN_ID_MEDIA_VDBOX0, + FW_DOMAIN_ID_MEDIA_VDBOX1, + FW_DOMAIN_ID_MEDIA_VDBOX2, + FW_DOMAIN_ID_MEDIA_VDBOX3, + FW_DOMAIN_ID_MEDIA_VEBOX0, + FW_DOMAIN_ID_MEDIA_VEBOX1,
FW_DOMAIN_ID_COUNT
};
enumforcewake_domains{
-FORCEWAKE_RENDER=BIT(FW_DOMAIN_ID_RENDER),
-FORCEWAKE_BLITTER=BIT(FW_DOMAIN_ID_BLITTER),
- FORCEWAKE_MEDIA =BIT(FW_DOMAIN_ID_MEDIA),
+ FORCEWAKE_RENDER =BIT(FW_DOMAIN_ID_RENDER),
+ FORCEWAKE_BLITTER =BIT(FW_DOMAIN_ID_BLITTER), + FORCEWAKE_MEDIA =BIT(FW_DOMAIN_ID_MEDIA), + FORCEWAKE_MEDIA_VDBOX0 =BIT(FW_DOMAIN_ID_MEDIA_VDBOX0), + FORCEWAKE_MEDIA_VDBOX1 =BIT(FW_DOMAIN_ID_MEDIA_VDBOX1), + FORCEWAKE_MEDIA_VDBOX2 =BIT(FW_DOMAIN_ID_MEDIA_VDBOX2), + FORCEWAKE_MEDIA_VDBOX3 =BIT(FW_DOMAIN_ID_MEDIA_VDBOX3), + FORCEWAKE_MEDIA_VEBOX0 =BIT(FW_DOMAIN_ID_MEDIA_VEBOX0), + FORCEWAKE_MEDIA_VEBOX1 =BIT(FW_DOMAIN_ID_MEDIA_VEBOX1), +
FORCEWAKE_ALL= (FORCEWAKE_RENDER|FORCEWAKE_BLITTER|
-FORCEWAKE_MEDIA)
+FORCEWAKE_MEDIA|Quoted 6 lines
+ FORCEWAKE_MEDIA_VDBOX0 | + FORCEWAKE_MEDIA_VDBOX1 | + FORCEWAKE_MEDIA_VDBOX2 | + FORCEWAKE_MEDIA_VDBOX3 | + FORCEWAKE_MEDIA_VEBOX0 |+
FORCEWAKE_MEDIA_VEBOX1)If I am not confused, this this could be simplified as:
Quoted 2 lines
FORCEWAKE_ALL=BIT(FW_DOMAIN_ID_COUNT)- 1;
Yes, that's the same (and looks much better).
Quoted 46 lines
Quoted 46 lines
};
structintel_uncore_funcs{drivers/gpu/drm/i915/selftests/intel_uncore.c +20
-10@@ -61,20 +61,30 @@ static int intel_fw_table_check(const structintel_forcewake_range *ranges, static int intel_shadow_table_check(void) { - const i915_reg_t *reg = gen8_shadowed_regs; - unsigned int i; + struct { + const i915_reg_t *regs; + unsigned int size; + } reg_lists[] = { + { gen8_shadowed_regs, ARRAY_SIZE(gen8_shadowed_regs) }, + { gen11_shadowed_regs, ARRAY_SIZE(gen11_shadowed_regs) }, + }; + const i915_reg_t *reg; + unsigned int i, j; s32 prev; - for (i = 0, prev = -1; i < ARRAY_SIZE(gen8_shadowed_regs); i++, reg++) { - u32 offset = i915_mmio_reg_offset(*reg); + for (j = 0; j < ARRAY_SIZE(reg_lists); ++j) { + reg = reg_lists[j].regs; + for (i = 0, prev = -1; i < reg_lists[j].size; i++, reg++) { + u32 offset = i915_mmio_reg_offset(*reg); - if (prev >= (s32)offset) { - pr_err("%s: entry[%d]:(%x) is before previous (%x)\n", - __func__, i, offset, prev); - return -EINVAL; - } + if (prev >= (s32)offset) { + pr_err("%s: entry[%d]:(%x) is before previous (%x)\n", + __func__, i, offset, prev); + return -EINVAL; + } - prev = offset; + prev = offset; + } } return 0;@@ -90,6 +100,7 @@ int intel_uncore_mock_selftests(void) { __vlv_fw_ranges, ARRAY_SIZE(__vlv_fw_ranges), false },
Quoted 9 lines
drivers/gpu/drm/i915/selftests/intel_uncore.c int intel_uncore_mock_selftests(void) · line 106
Quoted 6 lines
drivers/gpu/drm/i915/selftests/intel_uncore.c +1
-0{ __chv_fw_ranges, ARRAY_SIZE(__chv_fw_ranges), false }, { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, + { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, }; int err, i;I haven't checked the ranges, but the code looks good. With or without the nitpicks:
Both are fair improvements, I'll resend it with these changes.
Thanks!
Quoted 5 lines
Reviewed-by Tvrtko Ursulin <[email protected]>Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v11 1/1 drm/i915/icl: Gen11 forcewake support
In reply to Michel ThierryFrom: Daniele Ceraolo Spurio <[email protected]>
The main difference with previous GENs is that starting from Gen11 each VCS and VECS engine has its own power well, which only exist if the related engine exists in the HW.
The fallback forcewake request workaround is only needed on gen9 according to the HSDES WA entry (1604254524), so we can go back to using the simpler fw_domains_get/put functions.
BSpec: 18331
v2: fix fwtable, use array to test shadow tables, create new
accessors to avoid check on every access (Tvrtko)
v3 (from Paulo): Rebase.
v4:
- Range 09400-097FF should be FORCEWAKE_ALL (Daniele)
- Use the BIT macro for forcewake domains (Daniele)
- Add a comment about the range ordering (Oscar)
- Updated commit message (Oscar)
v5: Rebased
v6: Use I915_MAX_VCS/VECS (Michal)
v7: translate FORCEWAKE_ALL to available domains
v8: rebase, add clarification on fallback ack in commit message.
v9: fix rebase issue, change check in fw_domains_init from IS_GEN11
to GEN >= 11
v10: Generate is_genX_shadowed with a macro (Daniele)
Include gen11_fw_ranges in the selftest (Michel)
v11: Simplify FORCEWAKE_ALL, new line between NEEDS_FORCEWAKEs (Tvrtko)
--- drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_uncore.c | 157 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 23 +++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 31 +++-- 4 files changed, 189 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -8015,9 +8015,13 @@ enum {#define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7)#define FORCEWAKE_MT _MMIO(0xa188)/* multi-threaded */ #define FORCEWAKE_MEDIA_GEN9 _MMIO(0xa270) +#define FORCEWAKE_MEDIA_VDBOX_GEN11 (n) _MMIO(0xa540 + (n) * 4) +#define FORCEWAKE_MEDIA_VEBOX_GEN11 (n) _MMIO(0xa560 + (n) * 4)#define FORCEWAKE_RENDER_GEN9 _MMIO(0xa278)#define FORCEWAKE_BLITTER_GEN9 _MMIO(0xa188)#define FORCEWAKE_ACK_MEDIA_GEN9 _MMIO(0x0D88) +#define FORCEWAKE_ACK_MEDIA_VDBOX_GEN11 (n) _MMIO(0x0D50 + (n) * 4) +#define FORCEWAKE_ACK_MEDIA_VEBOX_GEN11 (n) _MMIO(0x0D70 + (n) * 4)#define FORCEWAKE_ACK_RENDER_GEN9 _MMIO(0x0D84)#define FORCEWAKE_ACK_BLITTER_GEN9 _MMIO(0x130044)#define FORCEWAKE_KERNEL BIT(0)
drivers/gpu/drm/i915/intel_uncore.c +147 -10
266 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.h +17 -6
@@ -37,17 +37,28 @@ enum forcewake_domain_id {FW_DOMAIN_ID_RENDER =0 ,FW_DOMAIN_ID_BLITTER ,FW_DOMAIN_ID_MEDIA , +FW_DOMAIN_ID_MEDIA_VDBOX0 , +FW_DOMAIN_ID_MEDIA_VDBOX1 , +FW_DOMAIN_ID_MEDIA_VDBOX2 , +FW_DOMAIN_ID_MEDIA_VDBOX3 , +FW_DOMAIN_ID_MEDIA_VEBOX0 , +FW_DOMAIN_ID_MEDIA_VEBOX1 ,FW_DOMAIN_ID_COUNT };enum forcewake_domains { -FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), -FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), -FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), -FORCEWAKE_ALL = (FORCEWAKE_RENDER | -FORCEWAKE_BLITTER | -FORCEWAKE_MEDIA ) +FORCEWAKE_RENDER =BIT (FW_DOMAIN_ID_RENDER ), +FORCEWAKE_BLITTER =BIT (FW_DOMAIN_ID_BLITTER ), +FORCEWAKE_MEDIA =BIT (FW_DOMAIN_ID_MEDIA ), +FORCEWAKE_MEDIA_VDBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX0 ), +FORCEWAKE_MEDIA_VDBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX1 ), +FORCEWAKE_MEDIA_VDBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX2 ), +FORCEWAKE_MEDIA_VDBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX3 ), +FORCEWAKE_MEDIA_VEBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX0 ), +FORCEWAKE_MEDIA_VEBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX1 ), + +FORCEWAKE_ALL =BIT (FW_DOMAIN_ID_COUNT ) -1 }; struct intel_uncore_funcs {
drivers/gpu/drm/i915/selftests/intel_uncore.c +21 -10
@@ -61,20 +61,30 @@ static int intel_fw_table_check(const struct intel_forcewake_range *ranges,static int intel_shadow_table_check (void ) { -const i915_reg_t *reg = gen8_shadowed_regs; -unsigned int i; +struct { +const i915_reg_t *regs; +unsigned int size; + } reg_lists[] = { + { gen8_shadowed_regs,ARRAY_SIZE (gen8_shadowed_regs) }, + { gen11_shadowed_regs,ARRAY_SIZE (gen11_shadowed_regs) }, + }; +const i915_reg_t *reg; +unsigned int i, j;s32 prev; -for (i =0 , prev =-1 ; i <ARRAY_SIZE (gen8_shadowed_regs); i++, reg++) { -u32 offset =i915_mmio_reg_offset (*reg); +for (j =0 ; j <ARRAY_SIZE (reg_lists); ++j) { + reg = reg_lists[j].regs; +for (i =0 , prev =-1 ; i < reg_lists[j].size; i++, reg++) { +u32 offset =i915_mmio_reg_offset (*reg); -if (prev >= (s32 )offset) { -pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , - __func__, i, offset, prev); -return -EINVAL ; - } +if (prev >= (s32 )offset) { +pr_err ("%s: entry[%d]:(%x) is before previous (%x)\n" , + __func__, i, offset, prev); +return -EINVAL ; + } - prev = offset; + prev = offset; + } }return 0 ;
@@ -90,6 +100,7 @@ int intel_uncore_mock_selftests(void) { __vlv_fw_ranges, ARRAY_SIZE(__vlv_fw_ranges), false }, { __chv_fw_ranges, ARRAY_SIZE(__chv_fw_ranges), false }, { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, + { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, };int err, i;
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH v10] drm/i915/icl: Gen11 forcewake support
In reply to Michel ThierryThank you for the patch! Yet something to improve:
Hi Daniele,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180202]
[cannot apply to v4.15]
[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/Michel-Thierry/drm-i915-icl-Gen11-forcewake-support/20180204-034751 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-randconfig-x019-201805 (attached as .config) compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025 reproduce: # save the attached .config to linux build tree make ARCH=i386
All error/warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/i915/i915_drv.h:56:0,
from drivers/gpu/drm/i915/intel_uncore.c:24:
>> drivers/gpu/drm/i915/intel_uncore.c:903:12: error: 'GEN11_BSD_RING_BASE' undeclared here (not in a function); did you mean 'GEN6_BSD_RING_BASE'?
RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */
^
drivers/gpu/drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
>> drivers/gpu/drm/i915/intel_uncore.c:903:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */
^~~~~~~~~
>> drivers/gpu/drm/i915/intel_uncore.c:904:12: error: 'GEN11_BSD2_RING_BASE' undeclared here (not in a function); did you mean 'GEN11_BSD_RING_BASE'?
RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */
^
drivers/gpu/drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu/drm/i915/intel_uncore.c:904:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */
^~~~~~~~~
>> drivers/gpu/drm/i915/intel_uncore.c:905:12: error: 'GEN11_VEBOX_RING_BASE' undeclared here (not in a function); did you mean 'GEN11_BSD_RING_BASE'?
RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */
^
drivers/gpu/drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu/drm/i915/intel_uncore.c:905:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */
^~~~~~~~~
>> drivers/gpu/drm/i915/intel_uncore.c:906:12: error: 'GEN11_BSD3_RING_BASE' undeclared here (not in a function); did you mean 'GEN11_BSD2_RING_BASE'?
RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */
^
drivers/gpu/drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu/drm/i915/intel_uncore.c:906:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */
^~~~~~~~~
>> drivers/gpu/drm/i915/intel_uncore.c:907:12: error: 'GEN11_BSD4_RING_BASE' undeclared here (not in a function); did you mean 'GEN11_BSD3_RING_BASE'?
RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */
^
drivers/gpu/drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu/drm/i915/intel_uncore.c:907:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */
^~~~~~~~~
>> drivers/gpu/drm/i915/intel_uncore.c:908:12: error: 'GEN11_VEBOX2_RING_BASE' undeclared here (not in a function); did you mean 'GEN11_VEBOX_RING_BASE'?
RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */
^
drivers/gpu/drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu/drm/i915/intel_uncore.c:908:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */
^~~~~~~~~
drivers/gpu/drm/i915/intel_uncore.c: In function 'intel_uncore_fw_domains_init':
>> drivers/gpu/drm/i915/intel_uncore.c:1382:19: error: 'I915_MAX_VCS' undeclared (first use in this function); did you mean 'I915_MAP_WC'?
for (i = 0; i < I915_MAX_VCS; i++) {
^~~~~~~~~~~~
I915_MAP_WC
drivers/gpu/drm/i915/intel_uncore.c:1382:19: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/gpu/drm/i915/intel_uncore.c:1382:17: warning: comparison between pointer and integer
for (i = 0; i < I915_MAX_VCS; i++) {
^
>> drivers/gpu/drm/i915/intel_uncore.c:1390:19: error: 'I915_MAX_VECS' undeclared (first use in this function); did you mean 'I915_MAX_VCS'?
for (i = 0; i < I915_MAX_VECS; i++) {
^~~~~~~~~~~~~
I915_MAX_VCS
drivers/gpu/drm/i915/intel_uncore.c:1390:17: warning: comparison between pointer and integer
for (i = 0; i < I915_MAX_VECS; i++) {
^
In file included from include/linux/kernel.h:11:0,
from include/asm-generic/bug.h:18,
from arch/x86/include/asm/bug.h:82,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/gfp.h:5,
from include/linux/slab.h:15,
from include/linux/io-mapping.h:22,
from drivers/gpu/drm/i915/i915_drv.h:36,
from drivers/gpu/drm/i915/intel_uncore.c:24:
>> drivers/gpu/drm/i915/intel_uncore.c:1391:30: error: implicit declaration of function '_VECS'; did you mean '_VCS'? [-Werror=implicit-function-declaration]
if (!HAS_ENGINE(dev_priv, _VECS(i)))
^
include/linux/bitops.h:7:28: note: in definition of macro 'BIT'
#define BIT(nr) (1UL << (nr))
^~
>> drivers/gpu/drm/i915/i915_drv.h:2723:35: note: in expansion of macro 'ENGINE_MASK'
(!!((dev_priv)->info.ring_mask & ENGINE_MASK(id)))
^~~~~~~~~~~
>> drivers/gpu/drm/i915/intel_uncore.c:1391:9: note: in expansion of macro 'HAS_ENGINE'
if (!HAS_ENGINE(dev_priv, _VECS(i)))
^~~~~~~~~~cc1: some warnings being treated as errors
vim +903 drivers/gpu/drm/i915/intel_uncore.c
897
898 static const i915_reg_t gen11_shadowed_regs[] = {
899 RING_TAIL(RENDER_RING_BASE), /* 0x2000 (base) */
900 GEN6_RPNSWREQ, /* 0xA008 */
901 GEN6_RC_VIDEO_FREQ, /* 0xA00C */
902 RING_TAIL(BLT_RING_BASE), /* 0x22000 (base) */
> 903 RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */ > 904 RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */ > 905 RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */ > 906 RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */ > 907 RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */ > 908 RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */
909 /* TODO: Other registers are not yet used */
910 };
911
---
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
kbuild test robot
build botRe: [PATCH v10] drm/i915/icl: Gen11 forcewake support
In reply to Michel ThierryThank you for the patch! Yet something to improve:
Hi Daniele,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20180202]
[cannot apply to v4.15]
[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/Michel-Thierry/drm-i915-icl-Gen11-forcewake-support/20180204-034751 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-u0-02040445 (attached as .config) compiler: gcc-5 (Debian 5.5.0-3) 5.4.1 20171010 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All errors (new ones prefixed by >>):
In file included from drivers/gpu//drm/i915/i915_drv.h:56:0,
from drivers/gpu//drm/i915/intel_uncore.c:24:
drivers/gpu//drm/i915/intel_uncore.c:903:12: error: 'GEN11_BSD_RING_BASE' undeclared here (not in a function)
RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */
^
drivers/gpu//drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu//drm/i915/intel_uncore.c:903:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */
^
>> drivers/gpu//drm/i915/intel_uncore.c:904:12: error: 'GEN11_BSD2_RING_BASE' undeclared here (not in a function)
RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */
^
drivers/gpu//drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu//drm/i915/intel_uncore.c:904:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */
^
>> drivers/gpu//drm/i915/intel_uncore.c:905:12: error: 'GEN11_VEBOX_RING_BASE' undeclared here (not in a function)
RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */
^
drivers/gpu//drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu//drm/i915/intel_uncore.c:905:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */
^
>> drivers/gpu//drm/i915/intel_uncore.c:906:12: error: 'GEN11_BSD3_RING_BASE' undeclared here (not in a function)
RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */
^
drivers/gpu//drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu//drm/i915/intel_uncore.c:906:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */
^
>> drivers/gpu//drm/i915/intel_uncore.c:907:12: error: 'GEN11_BSD4_RING_BASE' undeclared here (not in a function)
RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */
^
drivers/gpu//drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu//drm/i915/intel_uncore.c:907:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */
^
>> drivers/gpu//drm/i915/intel_uncore.c:908:12: error: 'GEN11_VEBOX2_RING_BASE' undeclared here (not in a function)
RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */
^
drivers/gpu//drm/i915/i915_reg.h:123:47: note: in definition of macro '_MMIO'
#define _MMIO(r) ((const i915_reg_t){ .reg = (r) })
^
drivers/gpu//drm/i915/intel_uncore.c:908:2: note: in expansion of macro 'RING_TAIL'
RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */
^
drivers/gpu//drm/i915/intel_uncore.c: In function 'intel_uncore_fw_domains_init':
>> drivers/gpu//drm/i915/intel_uncore.c:1382:19: error: 'I915_MAX_VCS' undeclared (first use in this function)
for (i = 0; i < I915_MAX_VCS; i++) {
^
drivers/gpu//drm/i915/intel_uncore.c:1382:19: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu//drm/i915/intel_uncore.c:1382:17: warning: comparison between pointer and integer
for (i = 0; i < I915_MAX_VCS; i++) {
^
>> drivers/gpu//drm/i915/intel_uncore.c:1390:19: error: 'I915_MAX_VECS' undeclared (first use in this function)
for (i = 0; i < I915_MAX_VECS; i++) {
^
drivers/gpu//drm/i915/intel_uncore.c:1390:17: warning: comparison between pointer and integer
for (i = 0; i < I915_MAX_VECS; i++) {
^
In file included from include/linux/kernel.h:11:0,
from include/asm-generic/bug.h:18,
from arch/x86/include/asm/bug.h:82,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/gfp.h:5,
from include/linux/slab.h:15,
from include/linux/io-mapping.h:22,
from drivers/gpu//drm/i915/i915_drv.h:36,
from drivers/gpu//drm/i915/intel_uncore.c:24:
drivers/gpu//drm/i915/intel_uncore.c:1391:30: error: implicit declaration of function '_VECS' [-Werror=implicit-function-declaration]
if (!HAS_ENGINE(dev_priv, _VECS(i)))
^
include/linux/bitops.h:7:28: note: in definition of macro 'BIT'
#define BIT(nr) (1UL << (nr))
^
drivers/gpu//drm/i915/i915_drv.h:2723:35: note: in expansion of macro 'ENGINE_MASK'
(!!((dev_priv)->info.ring_mask & ENGINE_MASK(id)))
^
drivers/gpu//drm/i915/intel_uncore.c:1391:9: note: in expansion of macro 'HAS_ENGINE'
if (!HAS_ENGINE(dev_priv, _VECS(i)))
^cc1: some warnings being treated as errors
vim +/GEN11_BSD2_RING_BASE +904 drivers/gpu//drm/i915/intel_uncore.c
897
898 static const i915_reg_t gen11_shadowed_regs[] = {
899 RING_TAIL(RENDER_RING_BASE), /* 0x2000 (base) */
900 GEN6_RPNSWREQ, /* 0xA008 */
901 GEN6_RC_VIDEO_FREQ, /* 0xA00C */
902 RING_TAIL(BLT_RING_BASE), /* 0x22000 (base) */
> 903 RING_TAIL(GEN11_BSD_RING_BASE), /* 0x1C0000 (base) */ > 904 RING_TAIL(GEN11_BSD2_RING_BASE), /* 0x1C4000 (base) */ > 905 RING_TAIL(GEN11_VEBOX_RING_BASE), /* 0x1C8000 (base) */ > 906 RING_TAIL(GEN11_BSD3_RING_BASE), /* 0x1D0000 (base) */ > 907 RING_TAIL(GEN11_BSD4_RING_BASE), /* 0x1D4000 (base) */ > 908 RING_TAIL(GEN11_VEBOX2_RING_BASE), /* 0x1D8000 (base) */
909 /* TODO: Other registers are not yet used */
910 };
911
---
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
PATCH 14/27 drm/i915/icl: Set graphics mode register for gen11
In reply to Paulo ZanoniFrom: kgardine <[email protected]>
This patch clears a single bit. The bit is 0 by default but expected not to be set. Explicitly clearing the bit in this patch is intended to indicate some thinking has occurred, and that we want this bit cleared and we are not just excepting the default value.
v2 (from Paulo): fix indentation.
v3 (from Paulo): rebase.
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -2597,6 +2597,8 @@ enum i915_power_well_id {#define GFX_FORWARD_VBLANK_ALWAYS (1<<5)#define GFX_FORWARD_VBLANK_COND (2<<5) +#define GEN11_GFX_DISABLE_LEGACY_MODE (1<<3) +#define VLV_DISPLAY_BASE 0x180000#define VLV_MIPI_BASE VLV_DISPLAY_BASE#define BXT_MIPI_BASE 0x60000
drivers/gpu/drm/i915/intel_lrc.c +8 -2
@@ -1500,8 +1500,14 @@ static void enable_execlists(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); + +if (IS_GEN11 (dev_priv)) +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_DISABLE (GEN11_GFX_DISABLE_LEGACY_MODE )); +else +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +I915_WRITE (RING_HWS_PGA (engine->mmio_base), engine->status_page.ggtt_offset);POSTING_READ (RING_HWS_PGA (engine->mmio_base));
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 14/27] drm/i915/icl: Set graphics mode register for gen11
Quoted 1 line · Paulo Zanoni
From: kgardine <[email protected]>
Please fix this to use Kelvin's full name when pushing. Both here and in the s-o-b line.
It may trigger this rule causing a rejection somewhere up the merge chain:
Quoted 56 lines
This patch clears a single bit. The bit is 0 by default but expected not to be set. Explicitly clearing the bit in this patch is intended to indicate some thinking has occurred, and that we want this bit cleared and we are not just excepting the default value.
v2 (from Paulo): fix indentation.
v3 (from Paulo): rebase.Signed-off-by kgardine <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -2597,6 +2597,8 @@ enum i915_power_well_id {#define GFX_FORWARD_VBLANK_ALWAYS (1<<5)#define GFX_FORWARD_VBLANK_COND (2<<5) +#define GEN11_GFX_DISABLE_LEGACY_MODE (1<<3) +#define VLV_DISPLAY_BASE 0x180000#define VLV_MIPI_BASE VLV_DISPLAY_BASE#define BXT_MIPI_BASE 0x60000drivers/gpu/drm/i915/intel_lrc.c +8
-2@@ -1500,8 +1500,14 @@ static void enable_execlists(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); + +if (IS_GEN11 (dev_priv)) +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_DISABLE (GEN11_GFX_DISABLE_LEGACY_MODE )); +else +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +I915_WRITE (RING_HWS_PGA (engine->mmio_base), engine->status_page.ggtt_offset);POSTING_READ (RING_HWS_PGA (engine->mmio_base));Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 14/27] drm/i915/icl: Set graphics mode register for gen11
In reply to Paulo ZanoniQuoted 35 lines · Paulo Zanoni
From: kgardine <[email protected]>
This patch clears a single bit. The bit is 0 by default but expected not to be set. Explicitly clearing the bit in this patch is intended to indicate some thinking has occurred, and that we want this bit cleared and we are not just excepting the default value.
v2 (from Paulo): fix indentation.
v3 (from Paulo): rebase.Signed-off-by kgardine <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -2597,6 +2597,8 @@ enum i915_power_well_id {#define GFX_FORWARD_VBLANK_ALWAYS (1<<5)#define GFX_FORWARD_VBLANK_COND (2<<5) +#define GEN11_GFX_DISABLE_LEGACY_MODE (1<<3) +#define VLV_DISPLAY_BASE 0x180000#define VLV_MIPI_BASE VLV_DISPLAY_BASE#define BXT_MIPI_BASE 0x60000drivers/gpu/drm/i915/intel_lrc.c +0
-0
drivers/gpu/drm/i915/intel_lrc.c static void enable_execlists(struct intel_engine_cs *engine) · line 1504
Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c +2
-2@@ -1500,8 +1500,14 @@ static void enable_execlists(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); + +if (IS_GEN11 (dev_priv))
INTEL_GEN >= 11? I'd expect this to be valid going forward instead of flipping back to the old value settings. Also we could use a comment, because the bit name is not very clear. Something like:
/*
* Make sure we're not enabling the new 12-deep CSB
* FIFO as that requires a slightly updated handling
* in the ctx switch irq. Since we're currently only
* using only 2 elements of the enhanced execlists the
* deeper FIFO it's not needed and it's not worth adding
* more statements to the irq handler to support it. */
Daniele
drivers/gpu/drm/i915/intel_lrc.c static void enable_execlists(struct intel_engine_cs *engine) · line 1513
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +6
-0+I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_DISABLE (GEN11_GFX_DISABLE_LEGACY_MODE )); + else +I915_WRITE (RING_MODE_GEN7 (engine ), +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +I915_WRITE (RING_HWS_PGA (engine->mmio_base), engine->status_page.ggtt_offset);POSTING_READ (RING_HWS_PGA (engine->mmio_base));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/icl: Set graphics mode register for gen11
In reply to Paulo ZanoniThis patch clears a single bit. The bit is 0 by default but expected not to be set. Explicitly clearing the bit in this patch is intended to indicate some thinking has occurred, and that we want this bit cleared and we are not just excepting the default value.
v2 (from Paulo): fix indentation.
v3: Changed GEN check to >= 11. Corrected author name.
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -2604,6 +2604,8 @@ enum i915_power_well_id {#define GFX_FORWARD_VBLANK_ALWAYS (1<<5)#define GFX_FORWARD_VBLANK_COND (2<<5) +#define GEN11_GFX_DISABLE_LEGACY_MODE (1<<3) +#define VLV_DISPLAY_BASE 0x180000#define VLV_MIPI_BASE VLV_DISPLAY_BASE#define BXT_MIPI_BASE 0x60000
drivers/gpu/drm/i915/intel_lrc.c +16 -2
@@ -1500,8 +1500,22 @@ static void enable_execlists(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); + +/* +* Make sure we're not enabling the new 12-deep CSB +* FIFO as that requires a slightly updated handling +* in the ctx switch irq. Since we're currently only +* using only 2 elements of the enhanced execlists the +* deeper FIFO it's not needed and it's not worth adding +* more statements to the irq handler to support it. +*/ +if (INTEL_GEN (dev_priv) >=11 ) +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_DISABLE (GEN11_GFX_DISABLE_LEGACY_MODE )); +else +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +I915_WRITE (RING_HWS_PGA (engine->mmio_base), engine->status_page.ggtt_offset);POSTING_READ (RING_HWS_PGA (engine->mmio_base));
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3] drm/i915/icl: Set graphics mode register for gen11
Quoted 5 lines · Kelvin Gardiner
This patch clears a single bit. The bit is 0 by default but expected not to be set. Explicitly clearing the bit in this patch is intended to indicate some thinking has occurred, and that we want this bit cleared and we are not just excepting the default value.
We also stop setting GFX_RUN_LIST_ENABLE, which is correct since that bit is gone. Code is self-explanatory but could still use a mention in the commit message IMHO.
Quoted 5 lines
v2 (from Paulo): fix indentation.
v3: Changed GEN check to >= 11. Corrected author name.Signed-off-by Kelvin Gardiner <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>
Thanks,
Daniele
Quoted 38 lines
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -2604,6 +2604,8 @@ enum i915_power_well_id {#define GFX_FORWARD_VBLANK_ALWAYS (1<<5)#define GFX_FORWARD_VBLANK_COND (2<<5) +#define GEN11_GFX_DISABLE_LEGACY_MODE (1<<3) +#define VLV_DISPLAY_BASE 0x180000#define VLV_MIPI_BASE VLV_DISPLAY_BASE#define BXT_MIPI_BASE 0x60000drivers/gpu/drm/i915/intel_lrc.c +9
-2@@ -1500,8 +1500,22 @@ static void enable_execlists(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); + +/* +* Make sure we're not enabling the new 12-deep CSB +* FIFO as that requires a slightly updated handling +* in the ctx switch irq. Since we're currently only +* using only 2 elements of the enhanced execlists the +* deeper FIFO it's not needed and it's not worth adding +* more statements to the irq handler to support it. +*/
drivers/gpu/drm/i915/intel_lrc.c static void enable_execlists(struct intel_engine_cs *engine) · line 1521
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +7
-0+if (INTEL_GEN (dev_priv) >=11 ) +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_DISABLE (GEN11_GFX_DISABLE_LEGACY_MODE )); +else +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +I915_WRITE (RING_HWS_PGA (engine->mmio_base), engine->status_page.ggtt_offset);POSTING_READ (RING_HWS_PGA (engine->mmio_base));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 15/27 drm/i915/icl: new context descriptor support
In reply to Paulo ZanoniFrom: "Ceraolo Spurio, Daniele" <[email protected]>
Starting from Gen11 the context descriptor format has been updated in the HW. The hw_id field has been considerably reduced in size and engine class and instance fields have been added.
There is a slight name clashing issue because the field that we call hw_id is actually called SW Context ID in the specs for Gen11+.
With the current size of the hw_id field we can have a maximum of 2k contexts at any time, but we could use the sw_counter field (which is sw defined) to increase that because the HW requirement is that engine_id + sw id + sw_counter is a unique number.
GuC uses a similar method to support more contexts but does its tracking at lrc level. To avoid doing an implementation that will need to be reworked once GuC support lands, defer it for now and mark it as TODO.
v2: rebased, add documentation, fix GEN11_ENGINE_INSTANCE_SHIFT
v3: rebased, bring back lost code from i915_gem_context.c
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_context.c | 11 +++++++++-- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_lrc.c | 31 ++++++++++++++++++++++++++++++- 4 files changed, 44 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2083,6 +2083,7 @@ struct drm_i915_private {*/ struct ida hw_ida;#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ } contexts;u32 fdi_rx_config;
drivers/gpu/drm/i915/i915_gem_context.c +9 -2
@@ -211,9 +211,15 @@ static void context_close(struct i915_gem_context *ctx)static int assign_hw_id (struct drm_i915_private *dev_priv,unsigned *out) {int ret; +unsigned int max; + +if (INTEL_GEN (dev_priv) >=11 ) + max =GEN11_MAX_CONTEXT_HW_ID ; +else + max =MAX_CONTEXT_HW_ID ; ret =ida_simple_get (&dev_priv->contexts.hw_ida, -0 ,MAX_CONTEXT_HW_ID ,GFP_KERNEL ); +0 , max,GFP_KERNEL );if (ret <0 ) {/* Contexts are only released when no longer active. * Flush any pending retires to hopefully release some
@@ -221,7 +227,7 @@ static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out)*/ i915_gem_retire_requests (dev_priv); ret =ida_simple_get (&dev_priv->contexts.hw_ida, -0 ,MAX_CONTEXT_HW_ID ,GFP_KERNEL ); +0 , max,GFP_KERNEL );if (ret <0 )return ret; }
@@ -462,6 +468,7 @@ int i915_gem_contexts_init(struct drm_i915_private *dev_priv)/* Using the simple ida interface, the max is limited by sizeof(int) */ BUILD_BUG_ON (MAX_CONTEXT_HW_ID >INT_MAX ); +BUILD_BUG_ON (GEN11_MAX_CONTEXT_HW_ID >INT_MAX );ida_init (&dev_priv->contexts.hw_ida);/* lowest priority; idle task */
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -3844,6 +3844,10 @@ enum {#define GEN8_CTX_ID_SHIFT 32#define GEN8_CTX_ID_WIDTH 21 +#define GEN11_SW_CTX_ID_SHIFT 37 +#define GEN11_SW_CTX_ID_WIDTH 11 +#define GEN11_ENGINE_CLASS_SHIFT 61 +#define GEN11_ENGINE_INSTANCE_SHIFT 48#define CHV_CLK_CTL1 _MMIO(0x101100)#define VLV_CLK_CTL2 _MMIO(0x101104)
drivers/gpu/drm/i915/intel_lrc.c +30 -1
@@ -237,6 +237,18 @@ static void execlists_init_reg_state(u32 *reg_state,* bits 32-52: ctx ID, a globally unique tag * bits 53-54: mbz, reserved for use by hardware * bits 55-63: group ID, currently unused and set to 0 +* +* Starting from Gen11, the upper dword of the descriptor has a new format: +* +* bits 32-36: reserved +* bits 37-47: SW context ID (ctx->hw_id) +* bits 48:53: engine instance +* bit 54: mbz, reserved for use by hardware +* bits 55-60: SW counter +* bits 61-63: engine class +* +* engine info, SW context ID and SW counter need to form a unique number +* (Context ID) per lrc. */ static void intel_lr_context_descriptor_update(struct i915_gem_context *ctx,
@@ -246,11 +258,28 @@ intel_lr_context_descriptor_update(struct i915_gem_context *ctx,u64 desc;BUILD_BUG_ON (MAX_CONTEXT_HW_ID > (1 <<GEN8_CTX_ID_WIDTH )); +BUILD_BUG_ON (GEN11_MAX_CONTEXT_HW_ID > (1 <<GEN11_SW_CTX_ID_WIDTH )); desc = ctx->desc_template;/* bits 0-11 */ desc |=i915_ggtt_offset (ce->state) +LRC_HEADER_PAGES *PAGE_SIZE ;/* bits 12-31 */ - desc |= (u64 )ctx->hw_id <<GEN8_CTX_ID_SHIFT ;/* bits 32-52 */ + +if (INTEL_GEN (ctx->i915) >=11 ) { + desc |= (u64 )engine->class <<GEN11_ENGINE_CLASS_SHIFT ; +/* bits 61-63 */ + +/* +* TODO: use SW counter (bits 60-55) to support more CTXs by +* combining it with the SW context ID field? +*/ + + desc |= (u64 )engine->instance <<GEN11_ENGINE_INSTANCE_SHIFT ; +/* bits 53-48 */ + desc |= (u64 )ctx->hw_id <<GEN11_SW_CTX_ID_SHIFT ; +/* bits 37-47 */ + }else { + desc |= (u64 )ctx->hw_id <<GEN8_CTX_ID_SHIFT ;/* bits 32-52 */ + } ce->lrc_desc = desc; }
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 16/27 drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
In Gen11, the Video Decode engines (aka VDBOX, aka VCS, aka BSD) and the Video Enhancement engines (aka VEBOX, aka VECS) could be fused off. Also, each VDBOX and VEBOX has its own power well, which only exist if the related engine exists in the HW.
Unfortunately, we have a Catch-22 situation going on: we need to read an MMIO register with the fuse info, but we cannot fully enable MMIO until we read it (since we need the real engines to initialize the forcewake domains). We workaround this problem by reading the fuse after the MMIO is partially ready, but before we initialize forcewake.
Bspec: 20680
v2: We were shifting incorrectly for vebox disable (Vinay)
v3: Assert mmio is ready and warn if we have attempted to initialize
forcewake for fused-off engines (Paulo)
v4:
- Use INTEL_GEN in new code (Tvrtko)
- Shorter local variable (Tvrtko, Michal)
- Keep "if (!...) continue" style (Tvrtko)
- No unnecessary BUG_ON (Tvrtko)
- WARN_ON and cleanup if wrong mask (Tvrtko, Michal)
- Use I915_READ_FW (Michal)
- Use I915_MAX_VCS/VECS macros (Michal)
v5: Rebased by Rodrigo fixing conflicts on top of:
commit 33def1ff7b0 ("drm/i915: Simplify intel_engines_init")v6: Fix v5. Remove info->num_rings. (by Oscar)
v7: Rebase (Rodrigo).
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 5 +++ drivers/gpu/drm/i915/intel_device_info.c | 53 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 +++ 5 files changed, 65 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1018,6 +1018,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)if (ret <0 ) goto err_bridge; +intel_device_info_fused_off_engines (dev_priv); +intel_uncore_init (dev_priv);intel_uc_init_mmio (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3418,6 +3418,7 @@ void i915_unreserve_fence(struct drm_i915_fence_reg *fence);void i915_gem_revoke_fences (struct drm_i915_private *dev_priv);void i915_gem_restore_fences (struct drm_i915_private *dev_priv); +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv);void i915_gem_detect_bit_6_swizzle (struct drm_i915_private *dev_priv);void i915_gem_object_do_bit_17_swizzle (struct drm_i915_gem_object *obj,struct sg_table *pages);
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -2804,6 +2804,11 @@ enum i915_power_well_id {#define GEN10_EU_DISABLE3 _MMIO(0x9140)#define GEN10_EU_DIS_SS_MASK 0xff +#define GEN11_GT_VEBOX_VDBOX_DISABLE _MMIO(0x9140) +#define GEN11_GT_VDBOX_DISABLE_MASK 0xff +#define GEN11_GT_VEBOX_DISABLE_SHIFT 16 +#define GEN11_GT_VEBOX_DISABLE_MASK (0xff << GEN11_GT_VEBOX_DISABLE_SHIFT) +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
drivers/gpu/drm/i915/intel_device_info.c +53 -0
56 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +4 -0
@@ -163,6 +163,10 @@ struct intel_device_info {u32 cs_timestamp_frequency_khz; +/* Fused-off engine info */ +u8 vdbox_disable; +u8 vebox_disable; +struct color_luts {u16 degamma_lut_size;u16 gamma_lut_size;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/27] drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
Quoting Paulo Zanoni (2018-01-09 23:28:24)
Quoted 55 lines
From: Oscar Mateo <[email protected]>
In Gen11, the Video Decode engines (aka VDBOX, aka VCS, aka BSD) and the Video Enhancement engines (aka VEBOX, aka VECS) could be fused off. Also, each VDBOX and VEBOX has its own power well, which only exist if the related engine exists in the HW.
Unfortunately, we have a Catch-22 situation going on: we need to read an MMIO register with the fuse info, but we cannot fully enable MMIO until we read it (since we need the real engines to initialize the forcewake domains). We workaround this problem by reading the fuse after the MMIO is partially ready, but before we initialize forcewake.
Bspec: 20680
v2: We were shifting incorrectly for vebox disable (Vinay)
v3: Assert mmio is ready and warn if we have attempted to initialize
forcewake for fused-off engines (Paulo)v4:
- UseINTEL_GENin new code (Tvrtko)
- Shorter local variable (Tvrtko, Michal)
- Keep "if (!...) continue" style (Tvrtko)
- No unnecessaryBUG_ON(Tvrtko)
-WARN_ONand cleanup if wrong mask (Tvrtko, Michal)
- UseI915_READ_FW(Michal)
- Use I915_MAX_VCS/VECS macros (Michal)v5: Rebased by Rodrigo fixing conflicts on top of:
commit 33def1ff7b0 ("drm/i915: Simplify intel_engines_init")v6: Fix v5. Remove
info->num_rings. (by Oscar)v7: Rebase (Rodrigo).
Cc Paulo Zanoni <[email protected]>Cc Vinay Belgaumkar <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 5 +++ drivers/gpu/drm/i915/intel_device_info.c | 53 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 +++ 5 files changed, 65 insertions(+)drivers/gpu/drm/i915/i915_drv.c +0
-0
drivers/gpu/drm/i915/i915_drv.c static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) · line 1021
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0@@ -1018,6 +1018,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)if (ret <0 ) goto err_bridge; +intel_device_info_fused_off_engines (dev_priv);
intel_device_info_init_mmio();
Quoted 54 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0+intel_uncore_init (dev_priv);intel_uc_init_mmio (dev_priv);drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -3418,6 +3418,7 @@ void i915_unreserve_fence(struct drm_i915_fence_reg *fence);void i915_gem_revoke_fences (struct drm_i915_private *dev_priv);void i915_gem_restore_fences (struct drm_i915_private *dev_priv); +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv);void i915_gem_detect_bit_6_swizzle (struct drm_i915_private *dev_priv);void i915_gem_object_do_bit_17_swizzle (struct drm_i915_gem_object *obj,struct sg_table *pages);drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -2804,6 +2804,11 @@ enum i915_power_well_id {#define GEN10_EU_DISABLE3 _MMIO(0x9140)#define GEN10_EU_DIS_SS_MASK 0xff +#define GEN11_GT_VEBOX_VDBOX_DISABLE _MMIO(0x9140) +#define GEN11_GT_VDBOX_DISABLE_MASK 0xff +#define GEN11_GT_VEBOX_DISABLE_SHIFT 16 +#define GEN11_GT_VEBOX_DISABLE_MASK (0xff << GEN11_GT_VEBOX_DISABLE_SHIFT) +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)drivers/gpu/drm/i915/intel_device_info.c +14
-0@@ -589,3 +589,56 @@ void intel_device_info_runtime_init(struct intel_device_info *info)/* Initialize command stream timestamp frequency */ info->cs_timestamp_frequency_khz =read_timestamp_frequency (dev_priv); } + +/* +* Determine which engines are fused off in our particular hardware. +* +* This function needs to be called after the MMIO has been setup (as we need +* to read registers) but before uncore init (because the powerwell for the +* fused off engines doesn't exist, so we cannot initialize forcewake for them) +*/ +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv) +{ +struct intel_device_info *info =mkwrite_device_info (dev_priv); +u32 media_fuse; +int i; +
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 615
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+if (INTEL_GEN (dev_priv) <11 ) +return ; + +GEM_BUG_ON (!dev_priv->regs); + + media_fuse =I915_READ_FW (GEN11_GT_VEBOX_VDBOX_DISABLE ); + + info->vdbox_disable = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; + info->vebox_disable = (media_fuse &GEN11_GT_VEBOX_DISABLE_MASK ) >> +GEN11_GT_VEBOX_DISABLE_SHIFT ;
We don't need to keep these (just locals will do), the permanent information is in info->ring_mask.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/27] drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
Quoted 120 lines · Chris Wilson
Quoting Paulo Zanoni (2018-01-09 23:28:24)
Quoted 55 lines
From: Oscar Mateo <[email protected]>
In Gen11, the Video Decode engines (aka VDBOX, aka VCS, aka BSD) and the Video Enhancement engines (aka VEBOX, aka VECS) could be fused off. Also, each VDBOX and VEBOX has its own power well, which only exist if the related engine exists in the HW.
Unfortunately, we have a Catch-22 situation going on: we need to read an MMIO register with the fuse info, but we cannot fully enable MMIO until we read it (since we need the real engines to initialize the forcewake domains). We workaround this problem by reading the fuse after the MMIO is partially ready, but before we initialize forcewake.
Bspec: 20680
v2: We were shifting incorrectly for vebox disable (Vinay)
v3: Assert mmio is ready and warn if we have attempted to initialize
forcewake for fused-off engines (Paulo)v4:
- UseINTEL_GENin new code (Tvrtko)
- Shorter local variable (Tvrtko, Michal)
- Keep "if (!...) continue" style (Tvrtko)
- No unnecessaryBUG_ON(Tvrtko)
-WARN_ONand cleanup if wrong mask (Tvrtko, Michal)
- UseI915_READ_FW(Michal)
- Use I915_MAX_VCS/VECS macros (Michal)v5: Rebased by Rodrigo fixing conflicts on top of:
commit 33def1ff7b0 ("drm/i915: Simplify intel_engines_init")v6: Fix v5. Remove
info->num_rings. (by Oscar)v7: Rebase (Rodrigo).
Cc Paulo Zanoni <[email protected]>Cc Vinay Belgaumkar <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 5 +++ drivers/gpu/drm/i915/intel_device_info.c | 53 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 4 +++ 5 files changed, 65 insertions(+)drivers/gpu/drm/i915/i915_drv.c +0
-0drivers/gpu/drm/i915/i915_drv.c static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) · line 1021
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0@@ -1018,6 +1018,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)if (ret <0 ) goto err_bridge; +intel_device_info_fused_off_engines (dev_priv);
intel_device_info_init_mmio();Quoted 58 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0+intel_uncore_init (dev_priv);intel_uc_init_mmio (dev_priv);drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -3418,6 +3418,7 @@ void i915_unreserve_fence(struct drm_i915_fence_reg *fence);void i915_gem_revoke_fences (struct drm_i915_private *dev_priv);void i915_gem_restore_fences (struct drm_i915_private *dev_priv); +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv);void i915_gem_detect_bit_6_swizzle (struct drm_i915_private *dev_priv);void i915_gem_object_do_bit_17_swizzle (struct drm_i915_gem_object *obj,struct sg_table *pages);drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -2804,6 +2804,11 @@ enum i915_power_well_id {#define GEN10_EU_DISABLE3 _MMIO(0x9140)#define GEN10_EU_DIS_SS_MASK 0xff +#define GEN11_GT_VEBOX_VDBOX_DISABLE _MMIO(0x9140) +#define GEN11_GT_VDBOX_DISABLE_MASK 0xff +#define GEN11_GT_VEBOX_DISABLE_SHIFT 16 +#define GEN11_GT_VEBOX_DISABLE_MASK (0xff << GEN11_GT_VEBOX_DISABLE_SHIFT) +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)drivers/gpu/drm/i915/intel_device_info.c +18
-0@@ -589,3 +589,56 @@ void intel_device_info_runtime_init(struct intel_device_info *info)/* Initialize command stream timestamp frequency */ info->cs_timestamp_frequency_khz =read_timestamp_frequency (dev_priv); } + +/* +* Determine which engines are fused off in our particular hardware. +* +* This function needs to be called after the MMIO has been setup (as we need +* to read registers) but before uncore init (because the powerwell for the +* fused off engines doesn't exist, so we cannot initialize forcewake for them) +*/ +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv) +{ +struct intel_device_info *info =mkwrite_device_info (dev_priv); +u32 media_fuse; +int i; + +if (INTEL_GEN (dev_priv) <11 ) +return ; + +GEM_BUG_ON (!dev_priv->regs);
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 615
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +6
-0+ + media_fuse =I915_READ_FW (GEN11_GT_VEBOX_VDBOX_DISABLE ); + + info->vdbox_disable = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; + info->vebox_disable = (media_fuse &GEN11_GT_VEBOX_DISABLE_MASK ) >> +GEN11_GT_VEBOX_DISABLE_SHIFT ;We don't need to keep these (just locals will do), the permanent information is in
info->ring_mask.
There are subsequent patches that pass this info to GuC, that's why I was keeping them. I could retrieve the information back from info->ring_mask, but it's a pity since we already have it in the right format here.
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/27] drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
Quoting Oscar Mateo (2018-01-10 19:25:39)
Quoted 29 lines · Chris Wilson
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_device_info.c +17
-0+/* +* Determine which engines are fused off in our particular hardware. +* +* This function needs to be called after the MMIO has been setup (as we need +* to read registers) but before uncore init (because the powerwell for the +* fused off engines doesn't exist, so we cannot initialize forcewake for them) +*/ +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv) +{ +struct intel_device_info *info =mkwrite_device_info (dev_priv); +u32 media_fuse; +int i; + +if (INTEL_GEN (dev_priv) <11 ) +return ; + +GEM_BUG_ON (!dev_priv->regs);Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 615
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +6
-0+ + media_fuse =I915_READ_FW (GEN11_GT_VEBOX_VDBOX_DISABLE ); + + info->vdbox_disable = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; + info->vebox_disable = (media_fuse &GEN11_GT_VEBOX_DISABLE_MASK ) >> +GEN11_GT_VEBOX_DISABLE_SHIFT ;We don't need to keep these (just locals will do), the permanent information is in
info->ring_mask.
Quoted 4 lines
There are subsequent patches that pass this info to GuC, that's why I was keeping them. I could retrieve the information back from
info->ring_mask, but it's a pity since we already have it in the right format here.
If there's a use, sure. You can always add it later along with the user if the patches are separated into a different series. Just nothing in this patch justified keeping them.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/27] drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
Quoting Chris Wilson (2018-01-10 19:32:09)
Quoted 30 lines
Quoting Oscar Mateo (2018-01-10 19:25:39)
Quoted 29 lines · Chris Wilson
Quoted 25 lines
Quoted 13 lines
drivers/gpu/drm/i915/intel_device_info.c +13
-0+/* +* Determine which engines are fused off in our particular hardware. +* +* This function needs to be called after the MMIO has been setup (as we need +* to read registers) but before uncore init (because the powerwell for the +* fused off engines doesn't exist, so we cannot initialize forcewake for them) +*/ +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv) +{ +struct intel_device_info *info =mkwrite_device_info (dev_priv); +u32 media_fuse; +int i; +drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 615
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +10
-0+if (INTEL_GEN (dev_priv) <11 ) +return ; + +GEM_BUG_ON (!dev_priv->regs); + + media_fuse =I915_READ_FW (GEN11_GT_VEBOX_VDBOX_DISABLE ); + + info->vdbox_disable = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; + info->vebox_disable = (media_fuse &GEN11_GT_VEBOX_DISABLE_MASK ) >> +GEN11_GT_VEBOX_DISABLE_SHIFT ;We don't need to keep these (just locals will do), the permanent information is in
info->ring_mask.
Quoted 8 lines
Quoted 4 lines
There are subsequent patches that pass this info to GuC, that's why I was keeping them. I could retrieve the information back from
info->ring_mask, but it's a pity since we already have it in the right format here.If there's a use, sure. You can always add it later along with the user if the patches are separated into a different series. Just nothing in this patch justified keeping them.
The counter argument is that if there is only a single use case, reading the registers again isn't an issue, especially if, as you say, the register contents are exactly what the guc wants to be told. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/27] drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
Quoted 33 lines · Chris Wilson
Quoting Chris Wilson (2018-01-10 19:32:09)
Quoted 32 lines
Quoting Oscar Mateo (2018-01-10 19:25:39)
Quoted 31 lines · Chris Wilson
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_device_info.c +17
-0+/* +* Determine which engines are fused off in our particular hardware. +* +* This function needs to be called after the MMIO has been setup (as we need +* to read registers) but before uncore init (because the powerwell for the +* fused off engines doesn't exist, so we cannot initialize forcewake for them) +*/ +void intel_device_info_fused_off_engines (struct drm_i915_private *dev_priv) +{ +struct intel_device_info *info =mkwrite_device_info (dev_priv); +u32 media_fuse; +int i; + +if (INTEL_GEN (dev_priv) <11 ) +return ; + +GEM_BUG_ON (!dev_priv->regs);Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 615
Quoted 6 lines
drivers/gpu/drm/i915/intel_device_info.c +6
-0+ + media_fuse =I915_READ_FW (GEN11_GT_VEBOX_VDBOX_DISABLE ); + + info->vdbox_disable = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; + info->vebox_disable = (media_fuse &GEN11_GT_VEBOX_DISABLE_MASK ) >> +GEN11_GT_VEBOX_DISABLE_SHIFT ;We don't need to keep these (just locals will do), the permanent information is in
info->ring_mask.There are subsequent patches that pass this info to GuC, that's why I was keeping them. I could retrieve the information back from
info->ring_mask, but it's a pity since we already have it in the right format here.
Quoted 7 lines
Quoted 3 lines
If there's a use, sure. You can always add it later along with the user if the patches are separated into a different series. Just nothing in this patch justified keeping them.
The counter argument is that if there is only a single use case, reading the registers again isn't an issue, especially if, as you say, the register contents are exactly what the guc wants to be told. -Chris
That's fair enough. I'll resend.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 1/1 drm/i915/icl: Check for fused-off VDBOX and VEBOX instances
In reply to Paulo ZanoniIn Gen11, the Video Decode engines (aka VDBOX, aka VCS, aka BSD) and the Video Enhancement engines (aka VEBOX, aka VECS) could be fused off. Also, each VDBOX and VEBOX has its own power well, which only exist if the related engine exists in the HW.
Unfortunately, we have a Catch-22 situation going on: we need to read an MMIO register with the fuse info, but we cannot fully enable MMIO until we read it (since we need the real engines to initialize the forcewake domains). We workaround this problem by reading the fuse after the MMIO is partially ready, but before we initialize forcewake.
Bspec: 20680
v2: We were shifting incorrectly for vebox disable (Vinay)
v3: Assert mmio is ready and warn if we have attempted to initialize
forcewake for fused-off engines (Paulo)
v4:
- Use INTEL_GEN in new code (Tvrtko)
- Shorter local variable (Tvrtko, Michal)
- Keep "if (!...) continue" style (Tvrtko)
- No unnecessary BUG_ON (Tvrtko)
- WARN_ON and cleanup if wrong mask (Tvrtko, Michal)
- Use I915_READ_FW (Michal)
- Use I915_MAX_VCS/VECS macros (Michal)
v5: Rebased by Rodrigo fixing conflicts on top of:
commit 33def1ff7b0 ("drm/i915: Simplify intel_engines_init")v6: Fix v5. Remove info->num_rings. (by Oscar)
v7: Rebase (Rodrigo).
v8:
- s/intel_device_info_fused_off_engines/intel_device_info_init_mmio (Chris)
- Make vdbox_disable & vebox_disable local variables (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 5 +++ drivers/gpu/drm/i915/intel_device_info.c | 54 ++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1018,6 +1018,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)if (ret <0 ) goto err_bridge; +intel_device_info_init_mmio (dev_priv); +intel_uncore_init (dev_priv);intel_uc_init_mmio (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3418,6 +3418,7 @@ struct drm_i915_fence_reg *void i915_gem_revoke_fences (struct drm_i915_private *dev_priv);void i915_gem_restore_fences (struct drm_i915_private *dev_priv); +void intel_device_info_init_mmio (struct drm_i915_private *dev_priv);void i915_gem_detect_bit_6_swizzle (struct drm_i915_private *dev_priv);void i915_gem_object_do_bit_17_swizzle (struct drm_i915_gem_object *obj,struct sg_table *pages);
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -2804,6 +2804,11 @@ enum i915_power_well_id {#define GEN10_EU_DISABLE3 _MMIO(0x9140)#define GEN10_EU_DIS_SS_MASK 0xff +#define GEN11_GT_VEBOX_VDBOX_DISABLE _MMIO(0x9140) +#define GEN11_GT_VDBOX_DISABLE_MASK 0xff +#define GEN11_GT_VEBOX_DISABLE_SHIFT 16 +#define GEN11_GT_VEBOX_DISABLE_MASK (0xff << GEN11_GT_VEBOX_DISABLE_SHIFT) +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
drivers/gpu/drm/i915/intel_device_info.c +54 -0
57 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 17/27 drm/i915/icl: Enable the extra video decode and enhancement boxes for Icelake 11
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
Icelake 11 has one vebox and two vdboxes (0 and 2).
Bspec: 21140
v2: Split out in two (Daniele)
--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -590,6 +590,7 @@ static const struct intel_device_info intel_icelake_11_info = { .platform = INTEL_ICELAKE, .is_alpha_support = 1, .has_resource_streamer = 0, + .ring_mask = RENDER_RING | BLT_RING | VEBOX_RING | BSD_RING | BSD3_RING, };/*
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 18/27 drm/i915/icl: Update subslice define for ICL 11
In reply to Paulo ZanoniFrom: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch updates the subslice max define to reflect this.
Bspec: 21139
--- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -1
@@ -82,7 +82,7 @@ hangcheck_action_to_str(const enum intel_engine_hangcheck_action a) }#define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8#define instdone_slice_mask (dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 18/27] drm/i915/icl: Update subslice define for ICL 11
Quoted 10 lines · Paulo Zanoni
From: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch updates the subslice max define to reflect this.
Bspec: 21139
Reviewed-by Oscar Mateo <[email protected]>Reviewed-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Kelvin Gardiner <[email protected]>
Hmmm... my r-b does not stand. This also needs a GEN11 update to all the fields in GEN8_MCR_SELECTOR (and a "Bspec: 21108" tag)
Quoted 9 lines
--- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_ringbuffer.h +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.h hangcheck_action_to_str(const enum intel_engine_hangcheck_action a) · line 88
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +1
-1@@ -82,7 +82,7 @@ hangcheck_action_to_str(const enum intel_engine_hangcheck_action a) }#define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8#define instdone_slice_mask (dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/icl: Update subslice define for ICL 11
In reply to Paulo ZanoniFrom: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch reflects this.
v2: GEN11 updates to MCR_SELECTOR (Oscar)
Bspec: 21139
BSpec: 21108
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_engine_cs.c | 22 ++++++++++++++++++---- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2444,6 +2444,10 @@ enum i915_power_well_id {#define GEN8_MCR_SLICE_MASK GEN8_MCR_SLICE(3)#define GEN8_MCR_SUBSLICE (subslice) (((subslice) & 3) << 24)#define GEN8_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(3) +#define GEN11_MCR_SLICE (slice) (((slice) & 0xf) << 27) +#define GEN11_MCR_SLICE_MASK GEN8_MCR_SLICE(0xf) +#define GEN11_MCR_SUBSLICE (subslice) (((subslice) & 0x7) << 24) +#define GEN11_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(0x7)#define RING_IPEIR (base) _MMIO((base)+0x64)#define RING_IPEHR (base) _MMIO((base)+0x68)/*
drivers/gpu/drm/i915/intel_engine_cs.c +18 -4
@@ -775,10 +775,24 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) read_subslice_reg(struct drm_i915_private *dev_priv, int slice, int subslice, i915_reg_t reg) { + uint32_t mcr_slice_subslice_mask; +uint32_t mcr_slice_subslice_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains; +if (INTEL_GEN (dev_priv) >=11 ) { + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; + mcr_slice_subslice_select =GEN11_MCR_SLICE (slice) | +GEN11_MCR_SUBSLICE (subslice); + }else { + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; + mcr_slice_subslice_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); + } + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
@@ -793,14 +807,14 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type)* The HW expects the slice and sublice selectors to be reset to 0 * after reading out the registers. */ -WARN_ON_ONCE (mcr & (GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK )); - mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); - mcr |=GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); +WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + mcr &= ~mcr_slice_subslice_mask; + mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr); ret =I915_READ_FW (reg); - mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); + mcr &= ~mcr_slice_subslice_mask;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -1
@@ -82,7 +82,7 @@ enum intel_engine_hangcheck_action { }#define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8#define instdone_slice_mask (dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/icl: Update subslice define for ICL 11
Quoted 24 lines · Oscar Mateo
From: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch reflects this.
v2: GEN11 updates to
MCR_SELECTOR(Oscar)Bspec: 21139
BSpec: 21108Reviewed-by Daniele Ceraolo Spurio <[email protected]> (v1)Signed-off-by Kelvin Gardiner <[email protected]>Signed-off-by Oscar Mateo <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_engine_cs.c | 22 ++++++++++++++++++---- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum i915_power_well_id { · line 2448
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -2444,6 +2444,10 @@ enum i915_power_well_id {#define GEN8_MCR_SLICE_MASK GEN8_MCR_SLICE(3)#define GEN8_MCR_SUBSLICE (subslice) (((subslice) & 3) << 24)#define GEN8_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(3) +#define GEN11_MCR_SLICE (slice) (((slice) & 0xf) << 27) +#define GEN11_MCR_SLICE_MASK GEN8_MCR_SLICE(0xf)
I think you got that line above wrong, should be GEN11_MCR_SLICE(0xf)
drivers/gpu/drm/i915/i915_reg.h enum i915_power_well_id { · line 2450
Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0+#define GEN11_MCR_SUBSLICE (subslice) (((subslice) & 0x7) << 24) +#define GEN11_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(0x7)
Same issue on the line above : GEN11_MCR_SUBSLICE(0x7)
Otherwise, looks good.
Quoted 56 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define RING_IPEIR (base) _MMIO((base)+0x64)#define RING_IPEHR (base) _MMIO((base)+0x68)/* drivers/gpu/drm/i915/intel_engine_cs.c +18
-4@@ -775,10 +775,24 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) read_subslice_reg(struct drm_i915_private *dev_priv, int slice, int subslice, i915_reg_t reg) { + uint32_t mcr_slice_subslice_mask; +uint32_t mcr_slice_subslice_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains; +if (INTEL_GEN (dev_priv) >=11 ) { + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; + mcr_slice_subslice_select =GEN11_MCR_SLICE (slice) | +GEN11_MCR_SUBSLICE (subslice); + }else { + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; + mcr_slice_subslice_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); + } + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,@@ -793,14 +807,14 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type)* The HW expects the slice and sublice selectors to be reset to 0 * after reading out the registers. */ -WARN_ON_ONCE (mcr & (GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK )); - mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); - mcr |=GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); +WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + mcr &= ~mcr_slice_subslice_mask; + mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr); ret =I915_READ_FW (reg); - mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); + mcr &= ~mcr_slice_subslice_mask;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);drivers/gpu/drm/i915/intel_ringbuffer.h +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.h enum intel_engine_hangcheck_action { · line 88
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +1
-1@@ -82,7 +82,7 @@ enum intel_engine_hangcheck_action { }#define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8#define instdone_slice_mask (dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/icl: Update subslice define for ICL 11
Quoted 31 lines · Lionel Landwerlin
Quoted 24 lines · Oscar Mateo
From: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch reflects this.
v2: GEN11 updates to
MCR_SELECTOR(Oscar)Bspec: 21139
BSpec: 21108Reviewed-by Daniele Ceraolo Spurio <[email protected]> (v1)Signed-off-by Kelvin Gardiner <[email protected]>Signed-off-by Oscar Mateo <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_engine_cs.c | 22 ++++++++++++++++++----drivers/gpu/drm/i915/intel_ringbuffer.h| 2 +-3 files changed, 23 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0drivers/gpu/drm/i915/i915_reg.h enum i915_power_well_id { · line 2448
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -2444,6 +2444,10 @@ enum i915_power_well_id { #define GEN8_MCR_SLICE_MASK GEN8_MCR_SLICE(3) #define GEN8_MCR_SUBSLICE(subslice) (((subslice) & 3) << 24) #define GEN8_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(3) +#define GEN11_MCR_SLICE(slice) (((slice) & 0xf) << 27) +#define GEN11_MCR_SLICE_MASK GEN8_MCR_SLICE(0xf)I think you got that line above wrong, should be
GEN11_MCR_SLICE(0xf)
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h enum i915_power_well_id { · line 2450
Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0+#define GEN11_MCR_SUBSLICE(subslice) (((subslice) & 0x7) << 24) +#define GEN11_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(0x7)Same issue on the line above :
GEN11_MCR_SUBSLICE(0x7)Otherwise, looks good.
Oops, thank you for spotting this. Do I have your r-b for the fixed version then?
Quoted 53 lines
Quoted 53 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define RING_IPEIR(base) _MMIO((base)+0x64) #define RING_IPEHR(base) _MMIO((base)+0x68) /*drivers/gpu/drm/i915/intel_engine_cs.c +13
-0@@ -775,10 +775,24 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) read_subslice_reg(struct drm_i915_private *dev_priv, int slice, int subslice, i915_reg_t reg) { + uint32_t mcr_slice_subslice_mask; + uint32_t mcr_slice_subslice_select; uint32_t mcr; uint32_t ret; enum forcewake_domains fw_domains; + if (INTEL_GEN(dev_priv) >= 11) { + mcr_slice_subslice_mask = GEN11_MCR_SLICE_MASK | + GEN11_MCR_SUBSLICE_MASK; + mcr_slice_subslice_select = GEN11_MCR_SLICE(slice) | + GEN11_MCR_SUBSLICE(subslice); + } else { + mcr_slice_subslice_mask = GEN8_MCR_SLICE_MASK | + GEN8_MCR_SUBSLICE_MASK; + mcr_slice_subslice_select = GEN8_MCR_SLICE(slice) | + GEN8_MCR_SUBSLICE(subslice); + } + fw_domains = intel_uncore_forcewake_for_reg(dev_priv, reg, FW_REG_READ);
fw_domains|= intel_uncore_forcewake_for_reg(dev_priv,drivers/gpu/drm/i915/intel_engine_cs.c +4
-3@@ -793,14 +807,14 @@ const char *i915_cache_level_str(structdrm_i915_private *i915, int type) * The HW expects the slice and sublice selectors to be reset to 0 * after reading out the registers. */ - WARN_ON_ONCE(mcr & (GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK)); - mcr &= ~(GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK); - mcr |= GEN8_MCR_SLICE(slice) | GEN8_MCR_SUBSLICE(subslice); + WARN_ON_ONCE(mcr & mcr_slice_subslice_mask); + mcr &= ~mcr_slice_subslice_mask; + mcr |= mcr_slice_subslice_select; I915_WRITE_FW(GEN8_MCR_SELECTOR, mcr); ret = I915_READ_FW(reg); - mcr &= ~(GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK); + mcr &= ~mcr_slice_subslice_mask; I915_WRITE_FW(GEN8_MCR_SELECTOR, mcr); intel_uncore_forcewake_put__locked(dev_priv, fw_domains);drivers/gpu/drm/i915/intel_ringbuffer.h +0
-1--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.h enum intel_engine_hangcheck_action { · line 86
Quoted 8 lines
+++
b/drivers/gpu/drm/i915/intel_ringbuffer.hdrivers/gpu/drm/i915/intel_ringbuffer.h +1
-1@@ -82,7 +82,7 @@ enum intel_engine_hangcheck_action { } #define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8 #define instdone_slice_mask(dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Lionel Landwerlin
Reviewed-byRe: [PATCH v2] drm/i915/icl: Update subslice define for ICL 11
Quoted 34 lines · Oscar Mateo
Quoted 31 lines · Lionel Landwerlin
Quoted 24 lines · Oscar Mateo
From: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch reflects this.
v2: GEN11 updates to
MCR_SELECTOR(Oscar)Bspec: 21139
BSpec: 21108Reviewed-by Daniele Ceraolo Spurio <[email protected]> (v1)Signed-off-by Kelvin Gardiner <[email protected]>Signed-off-by Oscar Mateo <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_engine_cs.c | 22 ++++++++++++++++++----drivers/gpu/drm/i915/intel_ringbuffer.h| 2 +-3 files changed, 23 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-0drivers/gpu/drm/i915/i915_reg.h enum i915_power_well_id { · line 2448
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -2444,6 +2444,10 @@ enum i915_power_well_id { #define GEN8_MCR_SLICE_MASK GEN8_MCR_SLICE(3) #define GEN8_MCR_SUBSLICE(subslice) (((subslice) & 3) << 24) #define GEN8_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(3) +#define GEN11_MCR_SLICE(slice) (((slice) & 0xf) << 27) +#define GEN11_MCR_SLICE_MASK GEN8_MCR_SLICE(0xf)I think you got that line above wrong, should be
GEN11_MCR_SLICE(0xf)
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_reg.h enum i915_power_well_id { · line 2450
Quoted 2 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0+#define GEN11_MCR_SUBSLICE(subslice) (((subslice) & 0x7) << 24) +#define GEN11_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(0x7)Same issue on the line above :
GEN11_MCR_SUBSLICE(0x7)Otherwise, looks good.
Oops, thank you for spotting this. Do I have your r-b for the fixed version then?
Sure, with the change, it's :
Quoted 57 lines
Quoted 57 lines
Quoted 57 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define RING_IPEIR(base) _MMIO((base)+0x64) #define RING_IPEHR(base) _MMIO((base)+0x68) /*drivers/gpu/drm/i915/intel_engine_cs.c +13
-0@@ -775,10 +775,24 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) read_subslice_reg(struct drm_i915_private *dev_priv, int slice, int subslice, i915_reg_t reg) { + uint32_t mcr_slice_subslice_mask; + uint32_t mcr_slice_subslice_select; uint32_t mcr; uint32_t ret; enum forcewake_domains fw_domains; + if (INTEL_GEN(dev_priv) >= 11) { + mcr_slice_subslice_mask = GEN11_MCR_SLICE_MASK | + GEN11_MCR_SUBSLICE_MASK; + mcr_slice_subslice_select = GEN11_MCR_SLICE(slice) | + GEN11_MCR_SUBSLICE(subslice); + } else { + mcr_slice_subslice_mask = GEN8_MCR_SLICE_MASK | + GEN8_MCR_SUBSLICE_MASK; + mcr_slice_subslice_select = GEN8_MCR_SLICE(slice) | + GEN8_MCR_SUBSLICE(subslice); + } + fw_domains = intel_uncore_forcewake_for_reg(dev_priv, reg, FW_REG_READ);
fw_domains|= intel_uncore_forcewake_for_reg(dev_priv,drivers/gpu/drm/i915/intel_engine_cs.c +4
-3@@ -793,14 +807,14 @@ const char *i915_cache_level_str(structdrm_i915_private *i915, int type) * The HW expects the slice and sublice selectors to be reset to 0 * after reading out the registers. */ - WARN_ON_ONCE(mcr & (GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK)); - mcr &= ~(GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK); - mcr |= GEN8_MCR_SLICE(slice) | GEN8_MCR_SUBSLICE(subslice); + WARN_ON_ONCE(mcr & mcr_slice_subslice_mask); + mcr &= ~mcr_slice_subslice_mask; + mcr |= mcr_slice_subslice_select; I915_WRITE_FW(GEN8_MCR_SELECTOR, mcr); ret = I915_READ_FW(reg); - mcr &= ~(GEN8_MCR_SLICE_MASK | GEN8_MCR_SUBSLICE_MASK); + mcr &= ~mcr_slice_subslice_mask; I915_WRITE_FW(GEN8_MCR_SELECTOR, mcr); intel_uncore_forcewake_put__locked(dev_priv, fw_domains);drivers/gpu/drm/i915/intel_ringbuffer.h +0
-0@@ -82,7 +82,7 @@ enum intel_engine_hangcheck_action {
Quoted 10 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.h enum intel_engine_hangcheck_action { · line 88
Quoted 6 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +1
-1} #define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8 #define instdone_slice_mask(dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/icl: Update subslice define for ICL 11
In reply to Oscar MateoFrom: Kelvin Gardiner <[email protected]>
ICL 11 has a greater number of maximum subslices. This patch reflects this.
v2: GEN11 updates to MCR_SELECTOR (Oscar)
v3: Copypasta error in the new defines (Lionel)
Bspec: 21139
BSpec: 21108
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_engine_cs.c | 22 ++++++++++++++++++---- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2437,6 +2437,10 @@ enum i915_power_well_id {#define GEN8_MCR_SLICE_MASK GEN8_MCR_SLICE(3)#define GEN8_MCR_SUBSLICE (subslice) (((subslice) & 3) << 24)#define GEN8_MCR_SUBSLICE_MASK GEN8_MCR_SUBSLICE(3) +#define GEN11_MCR_SLICE (slice) (((slice) & 0xf) << 27) +#define GEN11_MCR_SLICE_MASK GEN11_MCR_SLICE(0xf) +#define GEN11_MCR_SUBSLICE (subslice) (((subslice) & 0x7) << 24) +#define GEN11_MCR_SUBSLICE_MASK GEN11_MCR_SUBSLICE(0x7)#define RING_IPEIR (base) _MMIO((base)+0x64)#define RING_IPEHR (base) _MMIO((base)+0x68)/*
drivers/gpu/drm/i915/intel_engine_cs.c +18 -4
@@ -736,10 +736,24 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) read_subslice_reg(struct drm_i915_private *dev_priv, int slice, int subslice, i915_reg_t reg) { + uint32_t mcr_slice_subslice_mask; +uint32_t mcr_slice_subslice_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains; +if (INTEL_GEN (dev_priv) >=11 ) { + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; + mcr_slice_subslice_select =GEN11_MCR_SLICE (slice) | +GEN11_MCR_SUBSLICE (subslice); + }else { + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; + mcr_slice_subslice_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); + } + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
@@ -754,14 +768,14 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type)* The HW expects the slice and sublice selectors to be reset to 0 * after reading out the registers. */ -WARN_ON_ONCE (mcr & (GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK )); - mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); - mcr |=GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); +WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + mcr &= ~mcr_slice_subslice_mask; + mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr); ret =I915_READ_FW (reg); - mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); + mcr &= ~mcr_slice_subslice_mask;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -1
@@ -82,7 +82,7 @@ enum intel_engine_hangcheck_action { }#define I915_MAX_SLICES 3 -#define I915_MAX_SUBSLICES 3 +#define I915_MAX_SUBSLICES 8#define instdone_slice_mask (dev_priv__) \ (INTEL_GEN(dev_priv__) == 7 ? \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 19/27 drm/i915/icl: Added ICL 11 slice, subslice and EU fuse detection
In reply to Paulo ZanoniFrom: Kelvin Gardiner <[email protected]>
This patch adds support to detect ICL, slice, subslice and EU fuse settings.
Add addresses for ICL 11 slice, subslice and EU fuses registers. These register addresses are the same as previous platforms but the format and / or the meaning of the information is different. Therefore Gen11 defines for these registers are added.
Bspec: 9731
Bspec: 20643
Bspec: 20673
--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_device_info.c | 25 ++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -2809,6 +2809,15 @@ enum i915_power_well_id {#define GEN11_GT_VEBOX_DISABLE_SHIFT 16#define GEN11_GT_VEBOX_DISABLE_MASK (0xff << GEN11_GT_VEBOX_DISABLE_SHIFT) +#define GEN11_EU_DISABLE _MMIO(0x9134) +#define GEN11_EU_DIS_MASK 0xFF + +#define GEN11_GT_SLICE_ENABLE _MMIO(0x9138) +#define GEN11_GT_S_ENA_MASK 0xFF + +#define GEN11_GT_SUBSLICE_DISABLE _MMIO(0x913C) +#define GEN11_GT_SS_DIS_MASK 0xFF +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
drivers/gpu/drm/i915/intel_device_info.c +24 -1
@@ -120,6 +120,27 @@ void intel_device_info_dump(const struct intel_device_info *info,intel_device_info_dump_flags (info, p); } +static void gen11_sseu_info_init (struct drm_i915_private *dev_priv) +{ +struct sseu_dev_info *sseu = &mkwrite_device_info (dev_priv)->sseu; +int eu_max =8 ; +u32 eu_disable; + + sseu->slice_mask =I915_READ (GEN11_GT_SLICE_ENABLE ) & +GEN11_GT_S_ENA_MASK ; + sseu->subslice_mask = ~(I915_READ (GEN11_GT_SUBSLICE_DISABLE ) & +GEN11_GT_SS_DIS_MASK ); + eu_disable =I915_READ (GEN11_EU_DISABLE ) &GEN11_GT_S_ENA_MASK ; + + sseu->eu_per_subslice = eu_max -hweight32 (eu_disable); + sseu->eu_total = sseu->eu_per_subslice *hweight32 (sseu->subslice_mask); + +/* ICL has no power gating restrictions. */ + sseu->has_slice_pg =1 ; + sseu->has_subslice_pg =1 ; + sseu->has_eu_pg =1 ; +} +static void gen10_sseu_info_init (struct drm_i915_private *dev_priv) {struct sseu_dev_info *sseu = &mkwrite_device_info (dev_priv)->sseu;
@@ -583,8 +604,10 @@ void intel_device_info_runtime_init(struct intel_device_info *info)broadwell_sseu_info_init (dev_priv); else if (INTEL_GEN(dev_priv) == 9) gen9_sseu_info_init(dev_priv); - else if (INTEL_GEN(dev_priv) >= 10) + else if (INTEL_GEN(dev_priv) == 10) gen10_sseu_info_init(dev_priv); + else if (INTEL_INFO(dev_priv)->gen >= 11) + gen11_sseu_info_init(dev_priv);/* Initialize command stream timestamp frequency */ info->cs_timestamp_frequency_khz =read_timestamp_frequency (dev_priv);
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 19/27] drm/i915/icl: Added ICL 11 slice, subslice and EU fuse detection
Quoted 73 lines · Paulo Zanoni
From: Kelvin Gardiner <[email protected]>
This patch adds support to detect ICL, slice, subslice and EU fuse settings.
Add addresses for ICL 11 slice, subslice and EU fuses registers. These register addresses are the same as previous platforms but the format and / or the meaning of the information is different. Therefore Gen11 defines for these registers are added.
Bspec: 9731
Bspec: 20643
Bspec: 20673Signed-off-by Kelvin Gardiner <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 +++++++++ drivers/gpu/drm/i915/intel_device_info.c | 25 ++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -2809,6 +2809,15 @@ enum i915_power_well_id {#define GEN11_GT_VEBOX_DISABLE_SHIFT 16#define GEN11_GT_VEBOX_DISABLE_MASK (0xff << GEN11_GT_VEBOX_DISABLE_SHIFT) +#define GEN11_EU_DISABLE _MMIO(0x9134) +#define GEN11_EU_DIS_MASK 0xFF + +#define GEN11_GT_SLICE_ENABLE _MMIO(0x9138) +#define GEN11_GT_S_ENA_MASK 0xFF + +#define GEN11_GT_SUBSLICE_DISABLE _MMIO(0x913C) +#define GEN11_GT_SS_DIS_MASK 0xFF +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)drivers/gpu/drm/i915/intel_device_info.c +21
-0@@ -120,6 +120,27 @@ void intel_device_info_dump(const struct intel_device_info *info,intel_device_info_dump_flags (info, p); } +static void gen11_sseu_info_init (struct drm_i915_private *dev_priv) +{ +struct sseu_dev_info *sseu = &mkwrite_device_info (dev_priv)->sseu; +int eu_max =8 ; +u32 eu_disable; + + sseu->slice_mask =I915_READ (GEN11_GT_SLICE_ENABLE ) & +GEN11_GT_S_ENA_MASK ; + sseu->subslice_mask = ~(I915_READ (GEN11_GT_SUBSLICE_DISABLE ) & +GEN11_GT_SS_DIS_MASK ); + eu_disable =I915_READ (GEN11_EU_DISABLE ) &GEN11_GT_S_ENA_MASK ; + + sseu->eu_per_subslice = eu_max -hweight32 (eu_disable); + sseu->eu_total = sseu->eu_per_subslice *hweight32 (sseu->subslice_mask); + +/* ICL has no power gating restrictions. */ + sseu->has_slice_pg =1 ; + sseu->has_subslice_pg =1 ; + sseu->has_eu_pg =1 ; +} +static void gen10_sseu_info_init (struct drm_i915_private *dev_priv) {struct sseu_dev_info *sseu = &mkwrite_device_info (dev_priv)->sseu;
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 607
Quoted 5 lines
drivers/gpu/drm/i915/intel_device_info.c +1
-1@@ -583,8 +604,10 @@ void intel_device_info_runtime_init(struct intel_device_info *info)broadwell_sseu_info_init (dev_priv); else if (INTEL_GEN(dev_priv) == 9) gen9_sseu_info_init(dev_priv); - else if (INTEL_GEN(dev_priv) >= 10) + else if (INTEL_GEN(dev_priv) == 10)
We usually use IS_GEN10 and the == construct is very rare. I suggest to change in while touching the line.
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 609
Quoted 2 lines
drivers/gpu/drm/i915/intel_device_info.c +1
-0gen10_sseu_info_init (dev_priv); + else if (INTEL_INFO(dev_priv)->gen >= 11)
INTEL_GEN should be used in new code.
Regards,
Tvrtko
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 613
Quoted 5 lines
drivers/gpu/drm/i915/intel_device_info.c +1
-0+gen11_sseu_info_init (dev_priv);/* Initialize command stream timestamp frequency */ info->cs_timestamp_frequency_khz =read_timestamp_frequency (dev_priv);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 20/27 drm/i915/icl: Make use of the SW counter field in the new context descriptor
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
The new context descriptor format in Gen11 contains two assignable fields: the SW Context ID (technically 11 bits, but practically limited to 2032 entries due to some being reserved for future use by the GuC) and the SW Counter (6 bits).
We don't want to limit ourselves too much in the maximum number of concurrent contexts we want to allow, so ideally we want to employ every possible bit available. Unfortunately, a further limitation in the interface with the GuC means the combination of SW Context ID + SW Counter has to be unique within the same engine class (as we use the SW Context ID to index in the GuC stage descriptor pool, and the Engine Class + SW Counter to index in the 2-dimensional lrc array). This essentially means we need to somehow encode the engine instance.
Since the BSpec allows 6 bits for engine instance, we use the whole SW counter for this task. If the limitation of 2032 maximum simultaneous contexts is too restrictive, we can always squeeze things a bit more (3 extras bits for hw_id, 3 bits for instance) and things will still work (Gen11 does not instance more than 8 engines of any class).
Another alternative would be to generate the hw_id per HW context instead of per GEM context, but that has other problems (e.g. maximum number of user-created contexts would be variable, no relationship between a GuC principal descriptor and the proxy descriptor it uses, etc...).
Bspec: 12254
v2:
- Squashed with parts of "Interface changes for GuC fw 22.108" (Daniele)
- Do not apply the 16 reserved entries limitation to the non-GuC path (Joonas)
v3: Rebased by Rodrigo.
v4: Rebased (s/i915_modparams.enable_guc_submission/USES_GUC_SUBMISSION(dev_priv))
--- drivers/gpu/drm/i915/i915_drv.h | 11 ++++++++--- drivers/gpu/drm/i915/i915_gem_context.c | 9 ++++++--- drivers/gpu/drm/i915/i915_gem_context.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 15 ++++++++------- 5 files changed, 26 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +8 -3
@@ -2079,11 +2079,16 @@ struct drm_i915_private {/* The hw wants to have a stable context identifier for the * lifetime of the context (for OA, PASID, faults, etc). -* This is limited in execlists to 21 bits. +* This is limited in execlists to 21 bits. In enhanced execlist +* (GEN11+) this is limited to 11 bits (the SW Context ID field) +* but GuC limits it a bit further (11 bits - 16) due to some +* entries being reserved for future use (so the firmware only +* supports a GuC stage descriptor pool of 2032 entries). */ struct ida hw_ida; -#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ -#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID_WITH_GUC GEN11_MAX_CONTEXT_HW_ID - 16 } contexts;u32 fdi_rx_config;
drivers/gpu/drm/i915/i915_gem_context.c +6 -3
@@ -213,9 +213,12 @@ static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out)int ret;unsigned int max; -if (INTEL_GEN (dev_priv) >=11 ) - max =GEN11_MAX_CONTEXT_HW_ID ; -else +if (INTEL_GEN (dev_priv) >=11 ) { +if (USES_GUC_SUBMISSION (dev_priv)) + max =GEN11_MAX_CONTEXT_HW_ID_WITH_GUC ; +else + max =GEN11_MAX_CONTEXT_HW_ID ; + }else max =MAX_CONTEXT_HW_ID ; ret = ida_simple_get(&dev_priv->contexts.hw_ida,
drivers/gpu/drm/i915/i915_gem_context.h +2 -0
@@ -156,6 +156,8 @@ struct i915_gem_context {struct intel_ring *ring;u32 *lrc_reg_state;u64 lrc_desc; +u32 sw_context_id; +u32 sw_counter;int pin_count; } engine[I915_NUM_ENGINES ];
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -3860,6 +3860,8 @@ enum {#define GEN8_CTX_ID_WIDTH 21#define GEN11_SW_CTX_ID_SHIFT 37#define GEN11_SW_CTX_ID_WIDTH 11 +#define GEN11_SW_COUNTER_SHIFT 55 +#define GEN11_SW_COUNTER_WIDTH 6#define GEN11_ENGINE_CLASS_SHIFT 61#define GEN11_ENGINE_INSTANCE_SHIFT 48
drivers/gpu/drm/i915/intel_lrc.c +8 -7
@@ -267,15 +267,11 @@ intel_lr_context_descriptor_update(struct i915_gem_context *ctx,if (INTEL_GEN (ctx->i915) >=11 ) { desc |= (u64 )engine->class <<GEN11_ENGINE_CLASS_SHIFT ;/* bits 61-63 */ - -/* -* TODO: use SW counter (bits 60-55) to support more CTXs by -* combining it with the SW context ID field? -*/ - + desc |= (u64 )ce->sw_counter <<GEN11_SW_COUNTER_SHIFT ; +/* bits 55-60 */ desc |= (u64 )engine->instance <<GEN11_ENGINE_INSTANCE_SHIFT ;/* bits 53-48 */ - desc |= (u64 )ctx->hw_id <<GEN11_SW_CTX_ID_SHIFT ; + desc |= (u64 )ce->sw_context_id <<GEN11_SW_CTX_ID_SHIFT ;/* bits 37-47 */ }else { desc |= (u64 )ctx->hw_id <<GEN8_CTX_ID_SHIFT ;/* bits 32-52 */
@@ -2398,6 +2394,11 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, ce->ring = ring; ce->state = vma; +if (INTEL_GEN (ctx->i915) >=11 ) { + ce->sw_context_id = ctx->hw_id; + ce->sw_counter = engine->instance; + } +return 0 ; error_ring_free:
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 20/27] drm/i915/icl: Make use of the SW counter field in the new context descriptor
This could potentially be squashed with patch 15, as it doesn't make much sense to add a TODO there and solve it here. We might also want to update the comment above intel_lr_context_descriptor_update to remove the implication that SW context ID == ctx->hw_id (which is still technically true after this patch but we're preparing for it not to be anymore).
Thanks,
Daniele
Quoted 143 lines · Paulo Zanoni
From: Oscar Mateo <[email protected]>
The new context descriptor format in Gen11 contains two assignable fields: the SW Context ID (technically 11 bits, but practically limited to 2032 entries due to some being reserved for future use by the GuC) and the SW Counter (6 bits).
We don't want to limit ourselves too much in the maximum number of concurrent contexts we want to allow, so ideally we want to employ every possible bit available. Unfortunately, a further limitation in the interface with the GuC means the combination of SW Context ID + SW Counter has to be unique within the same engine class (as we use the SW Context ID to index in the GuC stage descriptor pool, and the Engine Class + SW Counter to index in the 2-dimensional lrc array). This essentially means we need to somehow encode the engine instance.
Since the BSpec allows 6 bits for engine instance, we use the whole SW counter for this task. If the limitation of 2032 maximum simultaneous contexts is too restrictive, we can always squeeze things a bit more (3 extras bits for
hw_id, 3 bits for instance) and things will still work (Gen11 does not instance more than 8 engines of any class).Another alternative would be to generate the
hw_idper HW context instead of per GEM context, but that has other problems (e.g. maximum number of user-created contexts would be variable, no relationship between a GuC principal descriptor and the proxy descriptor it uses, etc...).Bspec: 12254
v2:
- Squashed with parts of "Interface changes for GuC fw 22.108" (Daniele)
- Do not apply the 16 reserved entries limitation to the non-GuC path (Joonas)
v3: Rebased by Rodrigo.
v4: Rebased (s/i915_modparams.enable_guc_submission/USES_GUC_SUBMISSION(dev_priv))Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michel Thierry <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 11 ++++++++--- drivers/gpu/drm/i915/i915_gem_context.c | 9 ++++++--- drivers/gpu/drm/i915/i915_gem_context.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 15 ++++++++------- 5 files changed, 26 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/i915_drv.h +8
-3@@ -2079,11 +2079,16 @@ struct drm_i915_private {/* The hw wants to have a stable context identifier for the * lifetime of the context (for OA, PASID, faults, etc). -* This is limited in execlists to 21 bits. +* This is limited in execlists to 21 bits. In enhanced execlist +* (GEN11+) this is limited to 11 bits (the SW Context ID field) +* but GuC limits it a bit further (11 bits - 16) due to some +* entries being reserved for future use (so the firmware only +* supports a GuC stage descriptor pool of 2032 entries). */ struct ida hw_ida; -#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ -#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID_WITH_GUC GEN11_MAX_CONTEXT_HW_ID - 16 } contexts;u32 fdi_rx_config;drivers/gpu/drm/i915/i915_gem_context.c +6
-3@@ -213,9 +213,12 @@ static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out)int ret;unsigned int max; -if (INTEL_GEN (dev_priv) >=11 ) - max =GEN11_MAX_CONTEXT_HW_ID ; -else +if (INTEL_GEN (dev_priv) >=11 ) { +if (USES_GUC_SUBMISSION (dev_priv)) + max =GEN11_MAX_CONTEXT_HW_ID_WITH_GUC ; +else + max =GEN11_MAX_CONTEXT_HW_ID ; + }else max =MAX_CONTEXT_HW_ID ; ret = ida_simple_get(&dev_priv->contexts.hw_ida,drivers/gpu/drm/i915/i915_gem_context.h +2
-0@@ -156,6 +156,8 @@ struct i915_gem_context {struct intel_ring *ring;u32 *lrc_reg_state;u64 lrc_desc; +u32 sw_context_id; +u32 sw_counter;int pin_count; } engine[I915_NUM_ENGINES ];drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -3860,6 +3860,8 @@ enum {#define GEN8_CTX_ID_WIDTH 21#define GEN11_SW_CTX_ID_SHIFT 37#define GEN11_SW_CTX_ID_WIDTH 11 +#define GEN11_SW_COUNTER_SHIFT 55 +#define GEN11_SW_COUNTER_WIDTH 6#define GEN11_ENGINE_CLASS_SHIFT 61#define GEN11_ENGINE_INSTANCE_SHIFT 48drivers/gpu/drm/i915/intel_lrc.c +3
-7@@ -267,15 +267,11 @@ intel_lr_context_descriptor_update(struct i915_gem_context *ctx,if (INTEL_GEN (ctx->i915) >=11 ) { desc |= (u64 )engine->class <<GEN11_ENGINE_CLASS_SHIFT ;/* bits 61-63 */ - -/* -* TODO: use SW counter (bits 60-55) to support more CTXs by -* combining it with the SW context ID field? -*/ - + desc |= (u64 )ce->sw_counter <<GEN11_SW_COUNTER_SHIFT ; +/* bits 55-60 */ desc |= (u64 )engine->instance <<GEN11_ENGINE_INSTANCE_SHIFT ;/* bits 53-48 */ - desc |= (u64 )ctx->hw_id <<GEN11_SW_CTX_ID_SHIFT ; + desc |= (u64 )ce->sw_context_id <<GEN11_SW_CTX_ID_SHIFT ;/* bits 37-47 */ }else { desc |= (u64 )ctx->hw_id <<GEN8_CTX_ID_SHIFT ;/* bits 32-52 */ @@ -2398,6 +2394,11 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, ce->ring = ring;
drivers/gpu/drm/i915/intel_lrc.c static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, · line 2404
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +5
-0ce->state = vma; +if (INTEL_GEN (ctx->i915) >=11 ) { + ce->sw_context_id = ctx->hw_id; + ce->sw_counter = engine->instance; + } +return 0 ; error_ring_free:
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 20/27] drm/i915/icl: Make use of the SW counter field in the new context descriptor
Quoted 2 lines · Daniele Ceraolo Spurio
This could potentially be squashed with patch 15, as it doesn't make much sense to add a TODO there and solve it here. We might also want to update the comment above
intel_lr_context_descriptor_updateto remove the implication that SW context ID ==ctx->hw_id(which is still technically true after this patch but we're preparing for it not to be anymore).
I was actually thinking of a different fate for this patch: leave patch 15 as is (maybe make the TODO more open, like "TODO: decide what to do with sw_counter"), slap a "drm/i915/icl/guc" prefix on this one and consider it together with the rest of the GuC patches. At least in the meantime, while we decide how to go about sw_counter (CCing Tvrtko). What do you think?
Quoted 146 lines
Thanks,
DanieleQuoted 142 lines · Paulo Zanoni
From: Oscar Mateo <[email protected]>
The new context descriptor format in Gen11 contains two assignable fields: the SW Context ID (technically 11 bits, but practically limited to 2032 entries due to some being reserved for future use by the GuC) and the SW Counter (6 bits).
We don't want to limit ourselves too much in the maximum number of concurrent contexts we want to allow, so ideally we want to employ every possible bit available. Unfortunately, a further limitation in the interface with the GuC means the combination of SW Context ID + SW Counter has to be unique within the same engine class (as we use the SW Context ID to index in the GuC stage descriptor pool, and the Engine Class + SW Counter to index in the 2-dimensional lrc array). This essentially means we need to somehow encode the engine instance.
Since the BSpec allows 6 bits for engine instance, we use the whole SW counter for this task. If the limitation of 2032 maximum simultaneous contexts is too restrictive, we can always squeeze things a bit more (3 extras bits for
hw_id, 3 bits for instance) and things will still work (Gen11 does not instance more than 8 engines of any class).Another alternative would be to generate the
hw_idper HW context instead of per GEM context, but that has other problems (e.g. maximum number of user-created contexts would be variable, no relationship between a GuC principal descriptor and the proxy descriptor it uses, etc...).Bspec: 12254
v2:
- Squashed with parts of "Interface changes for GuC fw 22.108" (Daniele)
- Do not apply the 16 reserved entries limitation to the non-GuC path (Joonas)
v3: Rebased by Rodrigo.
v4: Rebased (s/i915_modparams.enable_guc_submission/USES_GUC_SUBMISSION(dev_priv))Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michel Thierry <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 11 ++++++++---drivers/gpu/drm/i915/i915_gem_context.c| 9 ++++++---drivers/gpu/drm/i915/i915_gem_context.h| 2 ++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 15 ++++++++-------5 files changed, 26 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -2079,11 +2079,16 @@ struct drm_i915_private { /* The hw wants to have a stable context identifier for the* lifetime of the context (for OA, PASID, faults, etc). -* This is limited in execlists to 21 bits. +* This is limited in execlists to 21 bits. In enhanced execlist
+ * (GEN11+) this is limited to 11 bits (the SW Context ID field)
+ * but GuC limits it a bit further (11 bits - 16) due to some + * entries being reserved for future use (so the firmware only + * supports a GuC stage descriptor pool of 2032 entries). */
struct idahw_ida;drivers/gpu/drm/i915/i915_drv.h +3
-2-#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ -#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID_WITH_GUC GEN11_MAX_CONTEXT_HW_ID - 16} contexts;
u32fdi_rx_config;drivers/gpu/drm/i915/i915_gem_context.c +6
-2@@ -213,9 +213,12 @@ static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out) int ret; unsigned int max; - if (INTEL_GEN(dev_priv) >= 11) - max = GEN11_MAX_CONTEXT_HW_ID; - else + if (INTEL_GEN(dev_priv) >= 11) { + if (USES_GUC_SUBMISSION(dev_priv)) + max = GEN11_MAX_CONTEXT_HW_ID_WITH_GUC; + else + max = GEN11_MAX_CONTEXT_HW_ID; + } else max = MAX_CONTEXT_HW_ID; ret = ida_simple_get(&dev_priv->contexts.hw_ida,drivers/gpu/drm/i915/i915_gem_context.h +2
-0@@ -156,6 +156,8 @@ struct i915_gem_context { struct intel_ring *ring; u32 *lrc_reg_state; u64 lrc_desc; + u32 sw_context_id; + u32 sw_counter; int pin_count; } engine[I915_NUM_ENGINES];diff --git
a/drivers/gpu/drm/i915/i915_reg.hb/drivers/gpu/drm/i915/i915_reg.hindexd8b537570b8e..6d5e2c651580100644drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -3860,6 +3860,8 @@ enum { #define GEN8_CTX_ID_WIDTH 21 #define GEN11_SW_CTX_ID_SHIFT 37 #define GEN11_SW_CTX_ID_WIDTH 11 +#define GEN11_SW_COUNTER_SHIFT 55 +#define GEN11_SW_COUNTER_WIDTH 6 #define GEN11_ENGINE_CLASS_SHIFT 61 #define GEN11_ENGINE_INSTANCE_SHIFT 48diff --git
a/drivers/gpu/drm/i915/intel_lrc.cb/drivers/gpu/drm/i915/intel_lrc.cindexd527a79c872c..edf050de8ffe100644drivers/gpu/drm/i915/intel_lrc.c +3
-7@@ -267,15 +267,11 @@ intel_lr_context_descriptor_update(struct i915_gem_context *ctx, if (INTEL_GEN(ctx->i915) >= 11) { desc |= (u64)engine->class << GEN11_ENGINE_CLASS_SHIFT; /* bits 61-63 */ - - /* - * TODO: use SW counter (bits 60-55) to support more CTXs by - * combining it with the SW context ID field? - */ - + desc |= (u64)ce->sw_counter << GEN11_SW_COUNTER_SHIFT; + /* bits 55-60 */ desc |= (u64)engine->instance << GEN11_ENGINE_INSTANCE_SHIFT; /* bits 53-48 */ - desc |= (u64)ctx->hw_id << GEN11_SW_CTX_ID_SHIFT; + desc |= (u64)ce->sw_context_id << GEN11_SW_CTX_ID_SHIFT; /* bits 37-47 */ } else {desc |= (u64)ctx->hw_id << GEN8_CTX_ID_SHIFT; /* bits 32-52 */
drivers/gpu/drm/i915/intel_lrc.c +0
-0@@ -2398,6 +2394,11 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, ce->ring = ring; ce->state = vma;
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c +4
-0+ if (INTEL_GEN(ctx->i915) >= 11) { + ce->sw_context_id = ctx->hw_id; + ce->sw_counter = engine->instance; + } + return 0;
error_ring_free:
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 20/27] drm/i915/icl: Make use of the SW counter field in the new context descriptor
Quoted 8 lines · Oscar Mateo
Quoted 2 lines · Daniele Ceraolo Spurio
This could potentially be squashed with patch 15, as it doesn't make much sense to add a TODO there and solve it here. We might also want to update the comment above
intel_lr_context_descriptor_updateto remove the implication that SW context ID ==ctx->hw_id(which is still technically true after this patch but we're preparing for it not to be anymore).I was actually thinking of a different fate for this patch: leave patch 15 as is (maybe make the TODO more open, like "TODO: decide what to do with
sw_counter"), slap a "drm/i915/icl/guc" prefix on this one and consider it together with the rest of the GuC patches. At least in the meantime, while we decide how to go aboutsw_counter(CCing Tvrtko). What do you think?
Sounds good to me, this patch doesn't really impact the !GuC path anyway since the number of IDs stays the same. I'll wait to see if there is any more feedback and if no one complains I'll send a new revision of patch 15.
Quoted 146 lines
Quoted 146 lines
Thanks,
DanieleQuoted 142 lines · Paulo Zanoni
From: Oscar Mateo <[email protected]>
The new context descriptor format in Gen11 contains two assignable fields: the SW Context ID (technically 11 bits, but practically limited to 2032 entries due to some being reserved for future use by the GuC) and the SW Counter (6 bits).
We don't want to limit ourselves too much in the maximum number of concurrent contexts we want to allow, so ideally we want to employ every possible bit available. Unfortunately, a further limitation in the interface with the GuC means the combination of SW Context ID + SW Counter has to be unique within the same engine class (as we use the SW Context ID to index in the GuC stage descriptor pool, and the Engine Class + SW Counter to index in the 2-dimensional lrc array). This essentially means we need to somehow encode the engine instance.
Since the BSpec allows 6 bits for engine instance, we use the whole SW counter for this task. If the limitation of 2032 maximum simultaneous contexts is too restrictive, we can always squeeze things a bit more (3 extras bits for
hw_id, 3 bits for instance) and things will still work (Gen11 does not instance more than 8 engines of any class).Another alternative would be to generate the
hw_idper HW context instead of per GEM context, but that has other problems (e.g. maximum number of user-created contexts would be variable, no relationship between a GuC principal descriptor and the proxy descriptor it uses, etc...).Bspec: 12254
v2:
- Squashed with parts of "Interface changes for GuC fw 22.108" (Daniele)
- Do not apply the 16 reserved entries limitation to the non-GuC path (Joonas)
v3: Rebased by Rodrigo.
v4: Rebased (s/i915_modparams.enable_guc_submission/USES_GUC_SUBMISSION(dev_priv))Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michel Thierry <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 11 ++++++++---drivers/gpu/drm/i915/i915_gem_context.c| 9 ++++++---drivers/gpu/drm/i915/i915_gem_context.h| 2 ++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 15 ++++++++-------5 files changed, 26 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -2079,11 +2079,16 @@ struct drm_i915_private { /* The hw wants to have a stable context identifier for the* lifetime of the context (for OA, PASID, faults, etc). -* This is limited in execlists to 21 bits. +* This is limited in execlists to 21 bits. In enhanced execlist
+ * (GEN11+) this is limited to 11 bits (the SW Context ID field)
+ * but GuC limits it a bit further (11 bits - 16) due to some + * entries being reserved for future use (so the firmware only + * supports a GuC stage descriptor pool of 2032 entries). */
struct idahw_ida;drivers/gpu/drm/i915/i915_drv.h +3
-2-#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ -#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define MAX_CONTEXT_HW_ID (1<<21)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID (1<<11)/* exclusive */ +#define GEN11_MAX_CONTEXT_HW_ID_WITH_GUC GEN11_MAX_CONTEXT_HW_ID - 16} contexts;
u32fdi_rx_config;drivers/gpu/drm/i915/i915_gem_context.c +6
-2@@ -213,9 +213,12 @@ static int assign_hw_id(struct drm_i915_private *dev_priv, unsigned *out) int ret; unsigned int max; - if (INTEL_GEN(dev_priv) >= 11) - max = GEN11_MAX_CONTEXT_HW_ID; - else + if (INTEL_GEN(dev_priv) >= 11) { + if (USES_GUC_SUBMISSION(dev_priv)) + max = GEN11_MAX_CONTEXT_HW_ID_WITH_GUC; + else + max = GEN11_MAX_CONTEXT_HW_ID; + } else max = MAX_CONTEXT_HW_ID; ret = ida_simple_get(&dev_priv->contexts.hw_ida,drivers/gpu/drm/i915/i915_gem_context.h +2
-0@@ -156,6 +156,8 @@ struct i915_gem_context { struct intel_ring *ring; u32 *lrc_reg_state; u64 lrc_desc; + u32 sw_context_id; + u32 sw_counter; int pin_count; } engine[I915_NUM_ENGINES];diff --git
a/drivers/gpu/drm/i915/i915_reg.hb/drivers/gpu/drm/i915/i915_reg.hindexd8b537570b8e..6d5e2c651580100644drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -3860,6 +3860,8 @@ enum { #define GEN8_CTX_ID_WIDTH 21 #define GEN11_SW_CTX_ID_SHIFT 37 #define GEN11_SW_CTX_ID_WIDTH 11 +#define GEN11_SW_COUNTER_SHIFT 55 +#define GEN11_SW_COUNTER_WIDTH 6 #define GEN11_ENGINE_CLASS_SHIFT 61 #define GEN11_ENGINE_INSTANCE_SHIFT 48diff --git
a/drivers/gpu/drm/i915/intel_lrc.cb/drivers/gpu/drm/i915/intel_lrc.cindexd527a79c872c..edf050de8ffe100644drivers/gpu/drm/i915/intel_lrc.c +3
-7@@ -267,15 +267,11 @@ intel_lr_context_descriptor_update(struct i915_gem_context *ctx, if (INTEL_GEN(ctx->i915) >= 11) { desc |= (u64)engine->class << GEN11_ENGINE_CLASS_SHIFT; /* bits 61-63 */ - - /* - * TODO: use SW counter (bits 60-55) to support more CTXs by - * combining it with the SW context ID field? - */ - + desc |= (u64)ce->sw_counter << GEN11_SW_COUNTER_SHIFT; + /* bits 55-60 */ desc |= (u64)engine->instance << GEN11_ENGINE_INSTANCE_SHIFT; /* bits 53-48 */ - desc |= (u64)ctx->hw_id << GEN11_SW_CTX_ID_SHIFT; + desc |= (u64)ce->sw_context_id << GEN11_SW_CTX_ID_SHIFT; /* bits 37-47 */ } else {desc |= (u64)ctx->hw_id << GEN8_CTX_ID_SHIFT; /* bits 32-52 */
drivers/gpu/drm/i915/intel_lrc.c +0
-0@@ -2398,6 +2394,11 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx, ce->ring = ring; ce->state = vma;
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c +4
-0+ if (INTEL_GEN(ctx->i915) >= 11) { + ce->sw_context_id = ctx->hw_id; + ce->sw_counter = engine->instance; + } + return 0;
error_ring_free:
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 21/27 drm/i915/icl: Add reset control register changes
In reply to Paulo ZanoniFrom: Michel Thierry <[email protected]>
The bits used to reset the different engines/domains have changed in GEN11, this patch maps the reset engine mask bits with the new bits in the reset control register.
v2: Use shift-left instead of BIT macro to match the file style (Paulo).
v3: Reuse gen8_reset_engines (Daniele).
v4: Do not call intel_uncore_forcewake_reset after reset, we may be using the forcewake to read protected registers elsewhere and those results may be clobbered by the concurrent dropping of forcewake.
bspec: 19212
--- drivers/gpu/drm/i915/i915_reg.h | 11 ++++++++ drivers/gpu/drm/i915/intel_uncore.c | 53 +++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +11 -0
@@ -304,6 +304,17 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN6_GRDOM_VECS (1 << 4)#define GEN9_GRDOM_GUC (1 << 5)#define GEN8_GRDOM_MEDIA2 (1 << 7) +/* GEN11 changed all bit defs except for FULL & RENDER */ +#define GEN11_GRDOM_FULL GEN6_GRDOM_FULL +#define GEN11_GRDOM_RENDER GEN6_GRDOM_RENDER +#define GEN11_GRDOM_BLT (1 << 2) +#define GEN11_GRDOM_GUC (1 << 3) +#define GEN11_GRDOM_MEDIA (1 << 5) +#define GEN11_GRDOM_MEDIA2 (1 << 6) +#define GEN11_GRDOM_MEDIA3 (1 << 7) +#define GEN11_GRDOM_MEDIA4 (1 << 8) +#define GEN11_GRDOM_VECS (1 << 13) +#define GEN11_GRDOM_VECS2 (1 << 14)#define RING_PP_DIR_BASE (engine) _MMIO((engine)->mmio_base+0x228)#define RING_PP_DIR_BASE_READ (engine) _MMIO((engine)->mmio_base+0x518)
drivers/gpu/drm/i915/intel_uncore.c +51 -2
76 lines not on this page · raw message
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 22/27 drm/i915/icl: Add configuring MOCS in new Icelake engines
In reply to Paulo ZanoniFrom: Tomasz Lis <[email protected]>
In Icelake, there are more engines on which Memory Object Control States need to be configured. Besides adding Icelake under Skylake config, the patch makes sure MOCS register addresses for the new engines are properly defined.
Additional patch might be need later, in case the specification will propose different MOCS config values for Icelake than in previous gens.
v2: Restricted comments to gen11, updated description, renamed defines.
v3: Used proper engine indexes for gen11.
v4: Removed engines which are not part of gen11.0
v5: Style fixes (proposed by mwajdeczko)
BSpec: 19405
BSpec: 21140
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_mocs.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -9678,6 +9678,8 @@ enum skl_power_gate {#define GEN9_MFX1_MOCS (i) _MMIO(0xca00 + (i) * 4)/* Media 1 MOCS registers */ #define GEN9_VEBOX_MOCS (i) _MMIO(0xcb00 + (i) * 4)/* Video MOCS registers */ #define GEN9_BLT_MOCS (i) _MMIO(0xcc00 + (i) * 4)/* Blitter MOCS registers */ +/* Media decoder 2 MOCS registers */ +#define GEN11_MFX2_MOCS (i) _MMIO(0x10000 + (i) * 4)/* gamt regs */ #define GEN8_L3_LRA_1_GPGPU _MMIO(0x4dd4)
drivers/gpu/drm/i915/intel_mocs.c +4 -1
@@ -178,7 +178,8 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv, {bool result = false; -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv) || +IS_ICELAKE (dev_priv)) { table->size =ARRAY_SIZE (skylake_mocs_table); table->table = skylake_mocs_table; result = true;
@@ -217,6 +218,8 @@ static i915_reg_t mocs_register(enum intel_engine_id engine_id, int index)return GEN9_VEBOX_MOCS (index);case VCS2 :return GEN9_MFX1_MOCS (index); +case VCS3 : +return GEN11_MFX2_MOCS (index);default :MISSING_CASE (engine_id);return INVALID_MMIO_REG ;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 23/27 drm/i915/icl: Split out the servicing of the Selector and Shared IIR registers
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
Both for clarity and so that we can reuse it later on.
v2:
- local_clock returns a u64 (Tvrtko)
- Use the funky BIT(bit) version (Tvrtko)
- wait_start not required (Tvrtko)
- Use time_after64 (Oscar)
--- drivers/gpu/drm/i915/i915_irq.c | 58 +++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +35 -23
@@ -243,6 +243,37 @@ void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,spin_unlock_irq (&dev_priv->irq_lock); } +static u16 gen11_service_shared_iir (struct drm_i915_private *dev_priv, +unsigned int bank, +unsigned int bit) +{ +u64 wait_end; +u16 irq; +u32 ident; + +I915_WRITE_FW (GEN11_IIR_REG_SELECTOR (bank),BIT (bit)); +/* +* NB: Specs do not specify how long to spin wait. +* Taking 100us as an educated guess +*/ + wait_end = (local_clock () >>10 ) +100 ; +do { + ident =I915_READ_FW (GEN11_INTR_IDENTITY_REG (bank)); + }while (!(ident &GEN11_INTR_DATA_VALID ) && + !time_after64 (local_clock () >>10 , wait_end)); + +if (!(ident &GEN11_INTR_DATA_VALID )) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u timed out!\n" , bank, bit); + + irq = ident &GEN11_INTR_ENGINE_MASK ; +if (!irq) +DRM_ERROR ("INTR_IDENTITY_REG%u:%u blank!\n" , bank, bit); + +I915_WRITE_FW (GEN11_INTR_IDENTITY_REG (bank), ident); + +return irq; +} +/** * ilk_update_display_irq - update DEIMR * @dev_priv: driver private
@@ -2768,10 +2799,9 @@ gen11_gt_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) {irqreturn_t ret =IRQ_NONE ;u16 irq[2 ][32 ]; -u32 dw, ident; +u32 dw;unsigned long tmp;unsigned int bank, bit, engine; -unsigned long wait_start, wait_end;memset (irq,0 ,sizeof (irq));
@@ -2781,27 +2811,9 @@ gen11_gt_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)if (!dw)DRM_ERROR ("GT_INTR_DW%u blank!\n" , bank); tmp = dw; -for_each_set_bit (bit, &tmp,32 ) { -I915_WRITE_FW (GEN11_IIR_REG_SELECTOR (bank),1 << bit); - wait_start =local_clock () >>10 ; -/* NB: Specs do not specify how long to spin wait. -* Taking 100us as an educated guess */ - wait_end = wait_start +100 ; -do { - ident =I915_READ_FW (GEN11_INTR_IDENTITY_REG (bank)); - }while (!(ident &GEN11_INTR_DATA_VALID ) && - !time_after ((unsigned long )local_clock () >>10 , wait_end)); - -if (!(ident &GEN11_INTR_DATA_VALID )) -DRM_ERROR ("INTR_IDENTITY_REG%u:%u timed out!\n" , - bank, bit); - - irq[bank][bit] = ident &GEN11_INTR_ENGINE_MASK ; -if (!irq[bank][bit]) -DRM_ERROR ("INTR_IDENTITY_REG%u:%u blank!\n" , - bank, bit); -I915_WRITE_FW (GEN11_INTR_IDENTITY_REG (bank), ident); - } +for_each_set_bit (bit, &tmp,32 ) + irq[bank][bit] = +gen11_service_shared_iir (dev_priv, bank, bit);I915_WRITE_FW (GEN11_GT_INTR_DW (bank), dw); } }
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 24/27 drm/i915/icl: Handle RPS interrupts correctly for Gen11
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
Using the new hierarchical interrupt infrastructure.
--- drivers/gpu/drm/i915/i915_irq.c | 68 +++++++++++++++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 6 ++-- 3 files changed, 60 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +56 -12
@@ -339,17 +339,29 @@ void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask)static i915_reg_t gen6_pm_iir (struct drm_i915_private *dev_priv) { +WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 ); +return INTEL_GEN (dev_priv) >=8 ?GEN8_GT_IIR (2 ) :GEN6_PMIIR ; }static i915_reg_t gen6_pm_imr (struct drm_i915_private *dev_priv) { -return INTEL_GEN (dev_priv) >=8 ?GEN8_GT_IMR (2 ) :GEN6_PMIMR ; +if (INTEL_GEN (dev_priv) >=11 ) +return GEN11_GPM_WGBOXPERF_INTR_MASK ; +else if (INTEL_GEN (dev_priv) >=8 ) +return GEN8_GT_IMR (2 ); +else +return GEN6_PMIMR ; }static i915_reg_t gen6_pm_ier (struct drm_i915_private *dev_priv) { -return INTEL_GEN (dev_priv) >=8 ?GEN8_GT_IER (2 ) :GEN6_PMIER ; +if (INTEL_GEN (dev_priv) >=11 ) +return GEN11_GPM_WGBOXPERF_INTR_ENABLE ; +else if (INTEL_GEN (dev_priv) >=8 ) +return GEN8_GT_IER (2 ); +else +return GEN6_PMIER ; }/**
@@ -431,6 +443,28 @@ static void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, u32 disable_m/* though a barrier is missing here, but don't really need a one */ } +void gen11_reset_rps_interrupts (struct drm_i915_private *dev_priv) +{ +u32 dw; + +spin_lock_irq (&dev_priv->irq_lock); + +/* +* According to the BSpec, DW_IIR bits cannot be cleared without +* first servicing the Selector & Shared IIR registers. +*/ + dw =I915_READ_FW (GEN11_GT_INTR_DW0 ); +while (dw &BIT (GEN11_GTPM )) { +gen11_service_shared_iir (dev_priv,0 ,GEN11_GTPM ); +I915_WRITE_FW (GEN11_GT_INTR_DW0 ,BIT (GEN11_GTPM )); + dw =I915_READ_FW (GEN11_GT_INTR_DW0 ); + } + + dev_priv->gt_pm.rps.pm_iir =0 ; + +spin_unlock_irq (&dev_priv->irq_lock); +} +void gen6_reset_rps_interrupts (struct drm_i915_private *dev_priv) {spin_lock_irq (&dev_priv->irq_lock);
@@ -446,12 +480,12 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)if (READ_ONCE (rps->interrupts_enabled))return ; -if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) -return ; -spin_lock_irq (&dev_priv->irq_lock);WARN_ON_ONCE (rps->pm_iir); -WARN_ON_ONCE (I915_READ (gen6_pm_iir (dev_priv)) & dev_priv->pm_rps_events); +if (INTEL_GEN (dev_priv) >=11 ) +WARN_ON_ONCE (I915_READ_FW (GEN11_GT_INTR_DW0 ) &BIT (GEN11_GTPM )); +else +WARN_ON_ONCE (I915_READ (gen6_pm_iir (dev_priv)) & dev_priv->pm_rps_events); rps->interrupts_enabled = true;gen6_enable_pm_irq (dev_priv, dev_priv->pm_rps_events);
@@ -465,9 +499,6 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)if (!READ_ONCE (rps->interrupts_enabled))return ; -if (WARN_ON_ONCE (IS_GEN11 (dev_priv))) -return ; -spin_lock_irq (&dev_priv->irq_lock); rps->interrupts_enabled = false;
@@ -484,7 +515,10 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)* state of the worker can be discarded. */ cancel_work_sync (&rps->work); -gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) >=11 ) +gen11_reset_rps_interrupts (dev_priv); +else +gen6_reset_rps_interrupts (dev_priv); }void gen9_reset_guc_interrupts (struct drm_i915_private *dev_priv)
@@ -2847,8 +2881,8 @@ gen11_gt_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) }if (irq[0 ][GEN11_GTPM ] & dev_priv->pm_rps_events) { +gen6_rps_irq_handler (dev_priv, (u32 )irq[0 ][GEN11_GTPM ]); ret =IRQ_HANDLED ; -gen6_rps_irq_handler (dev_priv, tmp); }return ret;
@@ -3319,6 +3353,9 @@ static void gen11_gt_irq_reset(struct drm_i915_private *dev_priv)I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~0 );I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~0 );I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~0 ); + +I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 ); +I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 ); }static void gen11_irq_reset (struct drm_device *dev)
@@ -3854,7 +3891,14 @@ static void gen11_gt_irq_postinstall(struct drm_i915_private *dev_priv)I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~(irqs | irqs <<16 ));I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~(irqs | irqs <<16 )); - dev_priv->pm_imr =0xffffffff ;/* TODO */ +/* +* RPS interrupts will get enabled/disabled on demand when RPS itself +* is enabled/disabled. +*/ + dev_priv->pm_ier =0x0 ; + dev_priv->pm_imr = ~dev_priv->pm_ier; +I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 ); +I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 ); }static int gen11_irq_postinstall (struct drm_device *dev)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1315,6 +1315,7 @@ void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask);void gen5_disable_gt_irq (struct drm_i915_private *dev_priv,uint32_t mask);void gen6_mask_pm_irq (struct drm_i915_private *dev_priv,u32 mask);void gen6_unmask_pm_irq (struct drm_i915_private *dev_priv,u32 mask); +void gen11_reset_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_reset_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_enable_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_disable_rps_interrupts (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -7957,10 +7957,10 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) dev_priv->gt_pm.rc6.enabled = true;/* force RC6 disabling */ intel_disable_gt_powersave (dev_priv); -if (INTEL_GEN (dev_priv) <11 ) -gen6_reset_rps_interrupts (dev_priv); +if (INTEL_GEN (dev_priv) >=11 ) +gen11_reset_rps_interrupts (dev_priv);else -WARN_ON_ONCE (1 ); +gen6_reset_rps_interrupts (dev_priv); }static inline void intel_disable_llc_pstate (struct drm_i915_private *i915)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 25/27 drm/i915/icl: Enable RC6 and RPS in Gen11
In reply to Paulo ZanoniFrom: Oscar Mateo <[email protected]>
AFAICT, once the new interrupt is in place, the rest should behave the same as Gen10.
v2: Update ring frequencies (Sagar)
--- drivers/gpu/drm/i915/i915_debugfs.c | 10 +++++----- drivers/gpu/drm/i915/intel_pm.c | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +5 -5
@@ -1243,20 +1243,20 @@ static int i915_frequency_info(struct seq_file *m, void *unused) max_freq = (IS_GEN9_LP (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ; max_freq *= (IS_GEN9_BC (dev_priv) || -IS_CANNONLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ); +INTEL_GEN (dev_priv) >=10 ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (rp_state_cap &0xff00 ) >>8 ; max_freq *= (IS_GEN9_BC (dev_priv) || -IS_CANNONLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ); +INTEL_GEN (dev_priv) >=10 ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Nominal (RP1) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (IS_GEN9_LP (dev_priv) ? rp_state_cap >>16 : rp_state_cap >>0 ) &0xff ; max_freq *= (IS_GEN9_BC (dev_priv) || -IS_CANNONLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ); +INTEL_GEN (dev_priv) >=10 ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); seq_printf(m, "Max overclocked frequency: %dMHz\n",
@@ -1844,7 +1844,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = rps->min_freq_softlimit /GEN9_FREQ_SCALER ; max_gpu_freq = rps->max_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1863,7 +1863,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" ,intel_gpu_freq (dev_priv, (gpu_freq * (IS_GEN9_BC (dev_priv) || -IS_CANNONLAKE (dev_priv) ? +INTEL_GEN (dev_priv) >=10 ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );
drivers/gpu/drm/i915/intel_pm.c +4 -6
@@ -6523,7 +6523,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) rps->efficient_freq = rps->rp1_freq;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv) || -IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +IS_GEN9_BC (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) {u32 ddcc_status =0 ; if (sandybridge_pcode_read(dev_priv,
@@ -6536,7 +6536,7 @@ static void gen6_init_rps_frequencies(struct drm_i915_private *dev_priv) rps->max_freq); } -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) {/* Store the frequency values in 16.66 MHZ units, which is * the natural hardware unit for SKL */
@@ -6849,7 +6849,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)/* convert DDR frequency from units of 266.6MHz to bandwidth */ min_ring_freq =mult_frac (min_ring_freq,8 ,3 ); -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = rps->min_freq /GEN9_FREQ_SCALER ; max_gpu_freq = rps->max_freq /GEN9_FREQ_SCALER ;
@@ -6867,7 +6867,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)int diff = max_gpu_freq - gpu_freq;unsigned int ia_freq =0 , ring_freq =0 ; -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) { +if (IS_GEN9_BC (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) {/* * ring_freq = 2 * GT. ring_freq is in 100MHz units * No floor required for ring frequency on SKL.
@@ -8073,8 +8073,6 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rps (dev_priv); - }else if (WARN_ON_ONCE (INTEL_GEN (dev_priv) >=11 )) { -/* TODO */ }else if (INTEL_GEN (dev_priv) >=9 ) {gen9_enable_rps (dev_priv); }else if (IS_BROADWELL (dev_priv)) {
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 26/27 drm/i915/icl: allow the reg_read ioctl to read the RCS TIMESTAMP register
In reply to Paulo ZanoniThis enables the Mesa driver to advertise support for ARB_timer_query, and thus an OpenGL version higher than 3.2.
Based on the CNL patch by Nanley Chery.
v2: Rebase.
--- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_uncore.c +1 -1
@@ -1588,7 +1588,7 @@ static const struct reg_whitelist { } reg_read_whitelist[] = { { .offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE), .offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE), - .gen_mask = INTEL_GEN_MASK(4, 10), + .gen_mask = INTEL_GEN_MASK(4, 11), .size =8 } };
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 26/27] drm/i915/icl: allow the reg_read ioctl to read the RCS TIMESTAMP register
Quoted 22 lines · Paulo Zanoni
This enables the Mesa driver to advertise support for
ARB_timer_query, and thus an OpenGL version higher than 3.2.Based on the CNL patch by Nanley Chery.
v2: Rebase.
Cc Anuj Phogat <[email protected]>Cc Nanley Chery <[email protected]>Cc Rodrigo Vivi <[email protected]>Requested-by Anuj Phogat <[email protected]>Tested-by Anuj Phogat <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_uncore.c +0
-0
drivers/gpu/drm/i915/intel_uncore.c static const struct reg_whitelist { · line 1591
Quoted 5 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -1588,7 +1588,7 @@ static const struct reg_whitelist { } reg_read_whitelist[] = { { .offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE), .offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE), - .gen_mask = INTEL_GEN_MASK(4, 10), + .gen_mask = INTEL_GEN_MASK(4, 11),
I don't like this mask, but I don't have better solutions and I'm glad we didn't forget to this gen.
Quoted 6 lines
drivers/gpu/drm/i915/intel_uncore.c +0
-0.size = 8 } };Signature · 1 line
2.14.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 27/27 drm/i915/gen11: add support for reading the timestamp frequency
In reply to Paulo ZanoniThe only thing that differs here is that the crystal clock freq now has four possible values.
This patch gets rid of the "Unknown gen, unable to compute..." message at boot for gen11.
--- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.c | 71 +++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -1138,6 +1138,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK (1 << GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT)#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ 0#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ 1 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT 3 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK (0x7 << GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT) +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ 0 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ 1 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ 2 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ 3#define GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT 1#define GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK (0x3 << GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT)
drivers/gpu/drm/i915/intel_device_info.c +55 -16
91 lines not on this page · raw message
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 27/27] drm/i915/gen11: add support for reading the timestamp frequency
Quoted 7 lines · Paulo Zanoni
The only thing that differs here is that the crystal clock freq now has four possible values.
This patch gets rid of the "Unknown gen, unable to compute..." message at boot for gen11.
Reviewed-by Lionel Landwerlin <[email protected]>
Still
Quoted 111 lines
Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.c | 71 +++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -1138,6 +1138,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK (1 << GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT)#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ 0#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ 1 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT 3 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK (0x7 << GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT) +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ 0 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ 1 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ 2 +#define GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ 3#define GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT 1#define GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK (0x3 << GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT)drivers/gpu/drm/i915/intel_device_info.c +48
-16@@ -395,6 +395,52 @@ static u32 read_reference_ts_freq(struct drm_i915_private *dev_priv)return base_freq + frac_freq; } +static u32 gen10_get_crystal_clock_freq (struct drm_i915_private *dev_priv, +u32 rpm_config_reg) +{ +u32 f19_2_mhz =19200 ; +u32 f24_mhz =24000 ; +u32 crystal_clock = (rpm_config_reg & +GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK ) >> +GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT ; + +switch (crystal_clock) { +case GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ : +return f19_2_mhz; +case GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ : +return f24_mhz; +default : +MISSING_CASE (crystal_clock); +return 0 ; + } +} + +static u32 gen11_get_crystal_clock_freq (struct drm_i915_private *dev_priv, +u32 rpm_config_reg) +{ +u32 f19_2_mhz =19200 ; +u32 f24_mhz =24000 ; +u32 f25_mhz =25000 ; +u32 f38_4_mhz =38400 ; +u32 crystal_clock = (rpm_config_reg & +GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK ) >> +GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT ; + +switch (crystal_clock) { +case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ : +return f24_mhz; +case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ : +return f19_2_mhz; +case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_38_4_MHZ : +return f38_4_mhz; +case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ : +return f25_mhz; +default : +MISSING_CASE (crystal_clock); +return 0 ; + } +} +static u32 read_timestamp_frequency (struct drm_i915_private *dev_priv) {u32 f12_5_mhz =12500 ;@@ -435,10 +481,9 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv) }return freq; - }else if (INTEL_GEN (dev_priv) <=10 ) { + }else if (INTEL_GEN (dev_priv) <=11 ) {u32 ctc_reg =I915_READ (CTC_MODE );u32 freq =0 ; -u32 rpm_config_reg =0 ;/* First figure out the reference frequency. There are 2 ways * we can compute the frequency, either through the @@ -448,20 +493,14 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv)if ((ctc_reg &CTC_SOURCE_PARAMETER_MASK ) ==CTC_SOURCE_DIVIDE_LOGIC ) { freq =read_reference_ts_freq (dev_priv); }else { -u32 crystal_clock; - - rpm_config_reg =I915_READ (RPM_CONFIG0 ); - crystal_clock = (rpm_config_reg & -GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK ) >> -GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT ; -switch (crystal_clock) { -case GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_19_2_MHZ : - freq = f19_2_mhz; -break ; -case GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ : - freq = f24_mhz; -break ; - } +u32 rpm_config_reg =I915_READ (RPM_CONFIG0 );
drivers/gpu/drm/i915/intel_device_info.c static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv) · line 506
Quoted 10 lines
drivers/gpu/drm/i915/intel_device_info.c +7
-0+ +if (INTEL_GEN (dev_priv) <=10 ) + freq =gen10_get_crystal_clock_freq (dev_priv, + rpm_config_reg); +else + freq =gen11_get_crystal_clock_freq (dev_priv, + rpm_config_reg);/* Now figure out how the command stream's timestamp * register increments from this frequency (it might
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/27] drm/i915/icl: Enhanced execution list support
In reply to Paulo ZanoniQuoting Paulo Zanoni (2018-01-09 23:28:18)
Quoted 20 lines
From: Thomas Daniel <[email protected]>
Supports two-element submission using the new enhanced execlist mechanism
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 21 ++++++++++++++++++++- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_lrc.c +0
-0
drivers/gpu/drm/i915/intel_lrc.c static inline void elsp_write(u64 desc, u32 __iomem *elsp) · line 436
Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c +3
-0@@ -430,9 +430,18 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port; +u32 __iomem *elsq = + engine->i915->regs +i915_mmio_reg_offset (RING_ELSQ (engine));
Overwrite engine->execlists.elsp with the alternate address.
Quoted 12 lines
drivers/gpu/drm/i915/intel_lrc.c +6
-0unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;
drivers/gpu/drm/i915/intel_lrc.c static void execlists_submit_ports(struct intel_engine_cs *engine) · line 473
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +6
-1@@ -456,8 +465,18 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (engine->i915) >=11 ) { +writel (lower_32_bits (desc), elsq + n *2 ); +writel (upper_32_bits (desc), elsq + n *2 +1 ); + }else { +elsp_write (desc, engine->execlists.elsp); + }
Missed the other consumer of elsp_write, preemption. So add the offset to elsp_write() and do the magic there. It may even be worth a vfunc. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/27] drm/i915/icl: Enhanced execution list support
In reply to Paulo ZanoniQuoted 4 lines · Paulo Zanoni
From: Thomas Daniel <[email protected]>
Supports two-element submission using the new enhanced execlist mechanism
This could use a few lines to describe enhanced execlist. Something like:
"Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements"
Quoted 16 lines
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 21 ++++++++++++++++++++- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_lrc.c +0
-0
drivers/gpu/drm/i915/intel_lrc.c static inline void elsp_write(u64 desc, u32 __iomem *elsp) · line 436
Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c +3
-0@@ -430,9 +430,18 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port; +u32 __iomem *elsq = + engine->i915->regs +i915_mmio_reg_offset (RING_ELSQ (engine));
Should we cache this, like we do for execlists.elsp?
Quoted 36 lines
drivers/gpu/drm/i915/intel_lrc.c +17
-1unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;@@ -456,8 +465,18 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (engine->i915) >=11 ) { +writel (lower_32_bits (desc), elsq + n *2 ); +writel (upper_32_bits (desc), elsq + n *2 +1 ); + }else { +elsp_write (desc, engine->execlists.elsp); + } } + +/* for gen11+ we need to manually load the submit queue */ +if (INTEL_GEN (engine->i915) >=11 ) +I915_WRITE_FW (RING_ELCR (engine),ELCR_LOAD ); +execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }drivers/gpu/drm/i915/intel_lrc.h +0
-0
drivers/gpu/drm/i915/intel_lrc.h line 42
Quoted 5 lines
drivers/gpu/drm/i915/intel_lrc.h +2
-0@@ -38,6 +38,9 @@#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0)#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF_BASE (engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_ELSQ (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_ELCR (engine) _MMIO((engine)->mmio_base + 0x550)
Do we need to add the new regs to the forcewake domain identification in logical_ring_setup? They should be in the same well as ELSP so maybe just that one is enough.
drivers/gpu/drm/i915/intel_lrc.h line 43
Quoted 1 line
drivers/gpu/drm/i915/intel_lrc.h +1
-0+#define ELCR_LOAD (1 << 0) > #define RING_CONTEXT_STATUS_BUF_LO(engine, i)
_MMIO((engine)->mmio_base + 0x370 + (i) * 8)
drivers/gpu/drm/i915/intel_lrc.h
Quoted 3 lines
drivers/gpu/drm/i915/intel_lrc.h +0
-0#define RING_CONTEXT_STATUS_BUF_HI (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4)#define RING_CONTEXT_STATUS_PTR (engine) _MMIO((engine)->mmio_base + 0x3a0)
Side note, we do have pre-emption enabled in the features but this patch does not update inject_preempt_context to use the new way to submit to the HW, so I guess that's probably break.
Daniele
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/27] drm/i915/icl: Enhanced execution list support
The review from Chris had ended up in my spam folder and I missed it, apologies for duplicating some of the comments.
Daniele
Quoted 90 lines · Daniele Ceraolo Spurio
Quoted 4 lines · Paulo Zanoni
From: Thomas Daniel <[email protected]>
Supports two-element submission using the new enhanced execlist mechanism
This could use a few lines to describe enhanced execlist. Something like:
"Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements"
Quoted 16 lines
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>---
drivers/gpu/drm/i915/intel_lrc.c| 21 ++++++++++++++++++++-drivers/gpu/drm/i915/intel_lrc.h| 3 +++2 files changed, 23 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_lrc.c +0
-0drivers/gpu/drm/i915/intel_lrc.c static inline void elsp_write(u64 desc, u32 · line 436
Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c +3
-0@@ -430,9 +430,18 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp) static void execlists_submit_ports(struct intel_engine_cs *engine) { + struct drm_i915_private *dev_priv = engine->i915; struct execlist_port *port = engine->execlists.port; + u32 __iomem *elsq = + engine->i915->regs + i915_mmio_reg_offset(RING_ELSQ(engine));Should we cache this, like we do for execlists.elsp?
Quoted 37 lines
drivers/gpu/drm/i915/intel_lrc.c +2
-0unsigned int n; + /* +* Gen11+ note: the submit queue is not cleared after being submitted
+ * to the HW so we need to make sure we always clean it up. This is + * currently ensured by the fact that we always write the same number
+ * of elsq entries, keep this in mind before changing the loop below.
+ */
for (n =execlists_num_ports(&engine->execlists); n--; ) { structdrm_i915_gem_request*rq;
unsigned int count;drivers/gpu/drm/i915/intel_lrc.c +11
-1@@ -456,8 +465,18 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc = 0; } - elsp_write(desc, engine->execlists.elsp); + if (INTEL_GEN(engine->i915) >= 11) { + writel(lower_32_bits(desc), elsq + n * 2); + writel(upper_32_bits(desc), elsq + n * 2 + 1); + } else { + elsp_write(desc, engine->execlists.elsp); + } } + + /* for gen11+ we need to manually load the submit queue */ + if (INTEL_GEN(engine->i915) >= 11) + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD); + execlists_clear_active(&engine->execlists, EXECLISTS_ACTIVE_HWACK); }drivers/gpu/drm/i915/intel_lrc.h +0
-0drivers/gpu/drm/i915/intel_lrc.h line 42
Quoted 5 lines
drivers/gpu/drm/i915/intel_lrc.h +2
-0@@ -38,6 +38,9 @@ #define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0) #define CTX_CTRL_RS_CTX_ENABLE (1 << 1) #define RING_CONTEXT_STATUS_BUF_BASE(engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_ELSQ (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_ELCR (engine) _MMIO((engine)->mmio_base + 0x550)Do we need to add the new regs to the forcewake domain identification in
logical_ring_setup? They should be in the same well as ELSP so maybe just that one is enough.drivers/gpu/drm/i915/intel_lrc.h line 44
Quoted 2 lines
drivers/gpu/drm/i915/intel_lrc.h +1
-0+#define ELCR_LOAD (1 << 0) > #defineRING_CONTEXT_STATUS_BUF_LO (engine, i)
_MMIO((engine)->mmio_base + 0x370 + (i) * 8)drivers/gpu/drm/i915/intel_lrc.h line 46
Quoted 3 lines
drivers/gpu/drm/i915/intel_lrc.h +0
-0#define RING_CONTEXT_STATUS_BUF_HI(engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4) #define RING_CONTEXT_STATUS_PTR(engine) _MMIO((engine)->mmio_base + 0x3a0)
Quoted 7 lines
Side note, we do have pre-emption enabled in the features but this patch does not update
inject_preempt_contextto use the new way to submit to the HW, so I guess that's probably break.Daniele
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/1 drm/i915/icl: Enhanced execution list support
In reply to Paulo ZanoniFrom: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn off
preemption (Daniele), reuse engine->execlists.elsp (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 5 ++++- drivers/gpu/drm/i915/intel_lrc.c | 35 ++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.h | 6 ++++-- 4 files changed, 41 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -1
@@ -2738,8 +2738,11 @@ static inline unsigned int i915_sg_segment_size(void)#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) \ ((dev_priv)->info.has_logical_ring_contexts) + +/* XXX: Preemption disabled for Gen11+ until support for new flow lands */ #define HAS_LOGICAL_RING_PREEMPTION (dev_priv) \ - ((dev_priv)->info.has_logical_ring_preemption) + ((dev_priv)->info.has_logical_ring_preemption && \ + INTEL_GEN(dev_priv) < 11)#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)
drivers/gpu/drm/i915/intel_lrc.c +30 -5
@@ -428,11 +428,24 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)writel (lower_32_bits (desc), elsp); } +static inline void elsqc_write (u64 desc,u32 __iomem *elsqc,u32 port) +{ +writel (lower_32_bits (desc), elsqc + port *2 ); +writel (upper_32_bits (desc), elsqc + port *2 +1 ); +} +static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port;unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;
@@ -456,8 +469,16 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (dev_priv) >=11 ) +elsqc_write (desc, engine->execlists.els, n); +else +elsp_write (desc, engine->execlists.els); } + +/* for gen11+ we need to manually load the submit queue */ +if (INTEL_GEN (dev_priv) >=11 ) +I915_WRITE_FW (RING_EXECLIST_CONTROL (engine),EL_CTRL_LOAD ); +execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }
@@ -506,9 +527,9 @@ static void inject_preempt_context(struct intel_engine_cs *engine)GEM_TRACE ("%s\n" , engine->name);for (n =execlists_num_ports (&engine->execlists); --n; ) -elsp_write (0 , engine->execlists.elsp); +elsp_write (0 , engine->execlists.els); -elsp_write (ce->lrc_desc, engine->execlists.elsp); +elsp_write (ce->lrc_desc, engine->execlists.els);execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }
@@ -2016,8 +2037,12 @@ static int logical_ring_init(struct intel_engine_cs *engine)if (ret) goto error; - engine->execlists.elsp = - engine->i915->regs +i915_mmio_reg_offset (RING_ELSP (engine)); +if (INTEL_GEN (engine->i915) >=11 ) + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (engine)); +else + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_ELSP (engine));return 0 ;
drivers/gpu/drm/i915/intel_lrc.h +3 -0
@@ -38,6 +38,9 @@#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0)#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF_BASE (engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_EXECLIST_SQ_CONTENTS (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_EXECLIST_CONTROL (engine) _MMIO((engine)->mmio_base + 0x550) +#define EL_CTRL_LOAD (1 << 0)#define RING_CONTEXT_STATUS_BUF_LO (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8)#define RING_CONTEXT_STATUS_BUF_HI (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4)#define RING_CONTEXT_STATUS_PTR (engine) _MMIO((engine)->mmio_base + 0x3a0)
drivers/gpu/drm/i915/intel_ringbuffer.h +4 -2
@@ -200,9 +200,11 @@ struct intel_engine_execlists {bool no_priolist;/** -* @elsp: the ExecList Submission Port register +* @els: gen-specific execlist submission register +* set to the ExecList Submission Port (elsp) register pre-Gen11 and to +* the ExecList Submission Queue Contents register array for Gen11+ */ -u32 __iomem *elsp; +u32 __iomem *els;/** * @port: execlist port states
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn off
Quoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>
Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
+static inline void write_port(struct intel_engine_execlists * const execlists,
+ unsigned int n,
+ u64 desc)
+{
+ if (execlists->elsq)
+ gen11_elsq_write(desc, n, execlists->elsq);
+ else
+ gen8_elsp_write(desc, execlists->elsp);
+}
+
+static inline void submit_ports(struct intel_engine_execlists * const execlists) +{
+ /* for gen11+ we need to manually load the submit queue */
+ if (execlists->elsq) {
+ struct intel_engine_cs *engine =
+ container_of(execlists,
+ struct intel_engine_cs,
+ execlists);
+ struct drm_i915_private *dev_priv = engine->i915;
+
+ I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD);
+ }
+}
+
...
-Mika
Quoted 137 lines
--- drivers/gpu/drm/i915/i915_drv.h | 5 ++++- drivers/gpu/drm/i915/intel_lrc.c | 35 ++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.h | 6 ++++-- 4 files changed, 41 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_drv.h +4
-1@@ -2738,8 +2738,11 @@ static inline unsigned int i915_sg_segment_size(void)#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) \ ((dev_priv)->info.has_logical_ring_contexts) + +/* XXX: Preemption disabled for Gen11+ until support for new flow lands */ #define HAS_LOGICAL_RING_PREEMPTION (dev_priv) \ - ((dev_priv)->info.has_logical_ring_preemption) + ((dev_priv)->info.has_logical_ring_preemption && \ + INTEL_GEN(dev_priv) < 11)#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)drivers/gpu/drm/i915/intel_lrc.c +30
-5@@ -428,11 +428,24 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)writel (lower_32_bits (desc), elsp); } +static inline void elsqc_write (u64 desc,u32 __iomem *elsqc,u32 port) +{ +writel (lower_32_bits (desc), elsqc + port *2 ); +writel (upper_32_bits (desc), elsqc + port *2 +1 ); +} +static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port;unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;@@ -456,8 +469,16 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (dev_priv) >=11 ) +elsqc_write (desc, engine->execlists.els, n); +else +elsp_write (desc, engine->execlists.els); } + +/* for gen11+ we need to manually load the submit queue */ +if (INTEL_GEN (dev_priv) >=11 ) +I915_WRITE_FW (RING_EXECLIST_CONTROL (engine),EL_CTRL_LOAD ); +execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }@@ -506,9 +527,9 @@ static void inject_preempt_context(struct intel_engine_cs *engine)GEM_TRACE ("%s\n" , engine->name);for (n =execlists_num_ports (&engine->execlists); --n; ) -elsp_write (0 , engine->execlists.elsp); +elsp_write (0 , engine->execlists.els); -elsp_write (ce->lrc_desc, engine->execlists.elsp); +elsp_write (ce->lrc_desc, engine->execlists.els);execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }@@ -2016,8 +2037,12 @@ static int logical_ring_init(struct intel_engine_cs *engine)if (ret) goto error; - engine->execlists.elsp = - engine->i915->regs +i915_mmio_reg_offset (RING_ELSP (engine)); +if (INTEL_GEN (engine->i915) >=11 ) + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (engine)); +else + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_ELSP (engine));return 0 ;drivers/gpu/drm/i915/intel_lrc.h +3
-0@@ -38,6 +38,9 @@#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0)#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF_BASE (engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_EXECLIST_SQ_CONTENTS (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_EXECLIST_CONTROL (engine) _MMIO((engine)->mmio_base + 0x550) +#define EL_CTRL_LOAD (1 << 0)#define RING_CONTEXT_STATUS_BUF_LO (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8)#define RING_CONTEXT_STATUS_BUF_HI (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4)#define RING_CONTEXT_STATUS_PTR (engine) _MMIO((engine)->mmio_base + 0x3a0)drivers/gpu/drm/i915/intel_ringbuffer.h +4
-2@@ -200,9 +200,11 @@ struct intel_engine_execlists {bool no_priolist;/** -* @elsp: the ExecList Submission Port register +* @els: gen-specific execlist submission register +* set to the ExecList Submission Port (elsp) register pre-Gen11 and to +* the ExecList Submission Queue Contents register array for Gen11+ */ -u32 __iomem *elsp; +u32 __iomem *els;/** * @port: execlist port states Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoted 49 lines · Mika Kuoppala
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn offQuoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
(quoted diff) +14
-0+static inline void write_port(struct intel_engine_execlists * const execlists, + unsigned int n, + u64 desc) +{ + if (execlists->elsq) + gen11_elsq_write(desc, n, execlists->elsq); + else + gen8_elsp_write(desc, execlists->elsp); +} + +static inline void submit_ports(struct intel_engine_execlists * const execlists) +{ + /* for gen11+ we need to manually load the submit queue */ + if (execlists->elsq) {
Review
Quoted 10 lines
(quoted diff) +10
-0+ struct intel_engine_cs *engine = + container_of(execlists, + struct intel_engine_cs, + execlists); + struct drm_i915_private *dev_priv = engine->i915; + + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD); + } +} +
I was undecided about hiding the code in sub-functions because of the pre-emption path. There is no need in gen11 to inject a context to preempt to idle, so the inject_preempt function will be pre-gen11 only and therefore I'd prefer to keep a direct call to elsp_write there. IMHO it'd be cleaner to have similar code in both places, hence the open-coding. This said, I'd be happy to change it like you proposed if there is a general preference to abstract things a bit in the shared path even if the pre-emption path stays different.
Regarding using execlists->elsq as a toggle, I was thinking that we could have a device info flag instead, so we could use it even before setting execlists->elsq. Any preference on this?
Thanks,
Daniele
P.S. If you want to take over feel free to send an updated patch ;)
Quoted 136 lines
...
-MikaQuoted 133 lines
--- drivers/gpu/drm/i915/i915_drv.h | 5 ++++- drivers/gpu/drm/i915/intel_lrc.c | 35 ++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.h | 6 ++++-- 4 files changed, 41 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_drv.h +4
-1@@ -2738,8 +2738,11 @@ static inline unsigned int i915_sg_segment_size(void)#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) \ ((dev_priv)->info.has_logical_ring_contexts) + +/* XXX: Preemption disabled for Gen11+ until support for new flow lands */ #define HAS_LOGICAL_RING_PREEMPTION (dev_priv) \ - ((dev_priv)->info.has_logical_ring_preemption) + ((dev_priv)->info.has_logical_ring_preemption && \ + INTEL_GEN(dev_priv) < 11)#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)drivers/gpu/drm/i915/intel_lrc.c +30
-5@@ -428,11 +428,24 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)writel (lower_32_bits (desc), elsp); } +static inline void elsqc_write (u64 desc,u32 __iomem *elsqc,u32 port) +{ +writel (lower_32_bits (desc), elsqc + port *2 ); +writel (upper_32_bits (desc), elsqc + port *2 +1 ); +} +static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port;unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;@@ -456,8 +469,16 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (dev_priv) >=11 ) +elsqc_write (desc, engine->execlists.els, n); +else +elsp_write (desc, engine->execlists.els); } + +/* for gen11+ we need to manually load the submit queue */ +if (INTEL_GEN (dev_priv) >=11 ) +I915_WRITE_FW (RING_EXECLIST_CONTROL (engine),EL_CTRL_LOAD ); +execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }@@ -506,9 +527,9 @@ static void inject_preempt_context(struct intel_engine_cs *engine)GEM_TRACE ("%s\n" , engine->name);for (n =execlists_num_ports (&engine->execlists); --n; ) -elsp_write (0 , engine->execlists.elsp); +elsp_write (0 , engine->execlists.els); -elsp_write (ce->lrc_desc, engine->execlists.elsp); +elsp_write (ce->lrc_desc, engine->execlists.els);execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }@@ -2016,8 +2037,12 @@ static int logical_ring_init(struct intel_engine_cs *engine)if (ret) goto error; - engine->execlists.elsp = - engine->i915->regs +i915_mmio_reg_offset (RING_ELSP (engine)); +if (INTEL_GEN (engine->i915) >=11 ) + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (engine)); +else + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_ELSP (engine));return 0 ;drivers/gpu/drm/i915/intel_lrc.h +3
-0@@ -38,6 +38,9 @@#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0)#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF_BASE (engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_EXECLIST_SQ_CONTENTS (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_EXECLIST_CONTROL (engine) _MMIO((engine)->mmio_base + 0x550) +#define EL_CTRL_LOAD (1 << 0)#define RING_CONTEXT_STATUS_BUF_LO (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8)#define RING_CONTEXT_STATUS_BUF_HI (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4)#define RING_CONTEXT_STATUS_PTR (engine) _MMIO((engine)->mmio_base + 0x3a0)drivers/gpu/drm/i915/intel_ringbuffer.h +4
-2@@ -200,9 +200,11 @@ struct intel_engine_execlists {bool no_priolist;/** -* @elsp: the ExecList Submission Port register +* @els: gen-specific execlist submission register +* set to the ExecList Submission Port (elsp) register pre-Gen11 and to +* the ExecList Submission Queue Contents register array for Gen11+ */ -u32 __iomem *elsp; +u32 __iomem *els;/** * @port: execlist port states Signature · 1 line
1.9.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoted 61 lines · Daniele Ceraolo Spurio
Quoted 49 lines · Mika Kuoppala
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn offQuoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
(quoted diff) +14
-0+static inline void write_port(struct intel_engine_execlists * const execlists, + unsigned int n, + u64 desc) +{ + if (execlists->elsq) + gen11_elsq_write(desc, n, execlists->elsq); + else + gen8_elsp_write(desc, execlists->elsp); +} + +static inline void submit_ports(struct intel_engine_execlists * const execlists) +{ + /* for gen11+ we need to manually load the submit queue */ + if (execlists->elsq) {Review
Quoted 10 lines
(quoted diff) +10
-0+ struct intel_engine_cs *engine = + container_of(execlists, + struct intel_engine_cs, + execlists); + struct drm_i915_private *dev_priv = engine->i915; + + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD); + } +} +
Quoted 9 lines
I was undecided about hiding the code in sub-functions because of the pre-emption path. There is no need in gen11 to inject a context to preempt to idle, so the
inject_preemptfunction will be pre-gen11 only and therefore I'd prefer to keep a direct call toelsp_writethere. IMHO it'd be cleaner to have similar code in both places, hence the open-coding. This said, I'd be happy to change it like you proposed if there is a general preference to abstract things a bit in the shared path even if the pre-emption path stays different.
Please don't change. I did the more abstract version before learning that gen11 don't need the special preempt switch.
Quoted 3 lines
Regarding using
execlists->elsqas a toggle, I was thinking that we could have a device info flag instead, so we could use it even before settingexeclists->elsq. Any preference on this?
has_logical_ring_elsq? Doesn't taste bad.
Quoted 5 lines
Thanks,
Daniele
P.S. If you want to take over feel free to send an updated patch ;)
No need to take over, I thought it was orphaned patch :)
-Mika
Quoted 136 lines
Quoted 136 lines
...
-MikaQuoted 133 lines
--- drivers/gpu/drm/i915/i915_drv.h | 5 ++++- drivers/gpu/drm/i915/intel_lrc.c | 35 ++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_lrc.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.h | 6 ++++-- 4 files changed, 41 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_drv.h +4
-1@@ -2738,8 +2738,11 @@ static inline unsigned int i915_sg_segment_size(void)#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) \ ((dev_priv)->info.has_logical_ring_contexts) + +/* XXX: Preemption disabled for Gen11+ until support for new flow lands */ #define HAS_LOGICAL_RING_PREEMPTION (dev_priv) \ - ((dev_priv)->info.has_logical_ring_preemption) + ((dev_priv)->info.has_logical_ring_preemption && \ + INTEL_GEN(dev_priv) < 11)#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)drivers/gpu/drm/i915/intel_lrc.c +30
-5@@ -428,11 +428,24 @@ static inline void elsp_write(u64 desc, u32 __iomem *elsp)writel (lower_32_bits (desc), elsp); } +static inline void elsqc_write (u64 desc,u32 __iomem *elsqc,u32 port) +{ +writel (lower_32_bits (desc), elsqc + port *2 ); +writel (upper_32_bits (desc), elsqc + port *2 +1 ); +} +static void execlists_submit_ports (struct intel_engine_cs *engine) { +struct drm_i915_private *dev_priv = engine->i915;struct execlist_port *port = engine->execlists.port;unsigned int n; +/* +* Gen11+ note: the submit queue is not cleared after being submitted +* to the HW so we need to make sure we always clean it up. This is +* currently ensured by the fact that we always write the same number +* of elsq entries, keep this in mind before changing the loop below. +*/ for (n =execlists_num_ports (&engine->execlists); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;@@ -456,8 +469,16 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) desc =0 ; } -elsp_write (desc, engine->execlists.elsp); +if (INTEL_GEN (dev_priv) >=11 ) +elsqc_write (desc, engine->execlists.els, n); +else +elsp_write (desc, engine->execlists.els); } + +/* for gen11+ we need to manually load the submit queue */ +if (INTEL_GEN (dev_priv) >=11 ) +I915_WRITE_FW (RING_EXECLIST_CONTROL (engine),EL_CTRL_LOAD ); +execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }@@ -506,9 +527,9 @@ static void inject_preempt_context(struct intel_engine_cs *engine)GEM_TRACE ("%s\n" , engine->name);for (n =execlists_num_ports (&engine->execlists); --n; ) -elsp_write (0 , engine->execlists.elsp); +elsp_write (0 , engine->execlists.els); -elsp_write (ce->lrc_desc, engine->execlists.elsp); +elsp_write (ce->lrc_desc, engine->execlists.els);execlists_clear_active (&engine->execlists,EXECLISTS_ACTIVE_HWACK ); }@@ -2016,8 +2037,12 @@ static int logical_ring_init(struct intel_engine_cs *engine)if (ret) goto error; - engine->execlists.elsp = - engine->i915->regs +i915_mmio_reg_offset (RING_ELSP (engine)); +if (INTEL_GEN (engine->i915) >=11 ) + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (engine)); +else + engine->execlists.els = engine->i915->regs + +i915_mmio_reg_offset (RING_ELSP (engine));return 0 ;drivers/gpu/drm/i915/intel_lrc.h +3
-0@@ -38,6 +38,9 @@#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0)#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF_BASE (engine) _MMIO((engine)->mmio_base + 0x370) +#define RING_EXECLIST_SQ_CONTENTS (engine) _MMIO((engine)->mmio_base + 0x510) +#define RING_EXECLIST_CONTROL (engine) _MMIO((engine)->mmio_base + 0x550) +#define EL_CTRL_LOAD (1 << 0)#define RING_CONTEXT_STATUS_BUF_LO (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8)#define RING_CONTEXT_STATUS_BUF_HI (engine, i) _MMIO((engine)->mmio_base + 0x370 + (i) * 8 + 4)#define RING_CONTEXT_STATUS_PTR (engine) _MMIO((engine)->mmio_base + 0x3a0)drivers/gpu/drm/i915/intel_ringbuffer.h +4
-2@@ -200,9 +200,11 @@ struct intel_engine_execlists {bool no_priolist;/** -* @elsp: the ExecList Submission Port register +* @els: gen-specific execlist submission register +* set to the ExecList Submission Port (elsp) register pre-Gen11 and to +* the ExecList Submission Queue Contents register array for Gen11+ */ -u32 __iomem *elsp; +u32 __iomem *els;/** * @port: execlist port states Signature · 1 line
1.9.1
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoting Mika Kuoppala (2018-01-22 15:08:16)
Quoted 58 lines
Quoted 56 lines · Daniele Ceraolo Spurio
Quoted 55 lines · Mika Kuoppala
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn offQuoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
(quoted diff) +21
-0+static inline void write_port(struct intel_engine_execlists * const execlists, + unsigned int n, + u64 desc) +{ + if (execlists->elsq) + gen11_elsq_write(desc, n, execlists->elsq); + else + gen8_elsp_write(desc, execlists->elsp); +} + +static inline void submit_ports(struct intel_engine_execlists * const execlists) +{ + /* for gen11+ we need to manually load the submit queue */ + if (execlists->elsq) { + struct intel_engine_cs *engine = + container_of(execlists, + struct intel_engine_cs, + execlists); + struct drm_i915_private *dev_priv = engine->i915; + + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c static inline void elsp_write(u64 desc, u32 __iomem *elsp) · line 436
Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +3
-0+ } +} +I was undecided about hiding the code in sub-functions because of the pre-emption path. There is no need in gen11 to inject a context to preempt to idle,
Really? The preempt-to-idle is so that we can sync the bookkeeping with the pending CS interrupts. The HW doesn't require it currently either, it's the SW that does. If you have a way to avoid that, that should be applicable to the current code as well?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoted 68 lines · Chris Wilson
Quoting Mika Kuoppala (2018-01-22 15:08:16)
Quoted 58 lines
Quoted 56 lines · Daniele Ceraolo Spurio
Quoted 55 lines · Mika Kuoppala
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn offQuoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
(quoted diff) +21
-0+static inline void write_port(struct intel_engine_execlists * const execlists, + unsigned int n, + u64 desc) +{ + if (execlists->elsq) + gen11_elsq_write(desc, n, execlists->elsq); + else + gen8_elsp_write(desc, execlists->elsp); +} + +static inline void submit_ports(struct intel_engine_execlists * const execlists) +{ + /* for gen11+ we need to manually load the submit queue */ + if (execlists->elsq) { + struct intel_engine_cs *engine = + container_of(execlists, + struct intel_engine_cs, + execlists); + struct drm_i915_private *dev_priv = engine->i915; + + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD);Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c static inline void elsp_write(u64 desc, u32 __iomem *elsp) · line 436
Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +3
-0+ } +} +I was undecided about hiding the code in sub-functions because of the pre-emption path. There is no need in gen11 to inject a context to preempt to idle,
Quoted 6 lines
Really? The preempt-to-idle is so that we can sync the bookkeeping with the pending CS interrupts. The HW doesn't require it currently either, it's the SW that does. If you have a way to avoid that, that should be applicable to the current code as well?
-Chris
We can't avoid preempt-to-idle, we can do it in a simpler way. There is a bit in RING_EXECLIST_CONTROL that triggers a preemp-to-idle, without the need to do a ctx injection. We'll need to move preemption completion detection to the CSB value instead of the HWSP write, not sure about the impact of that on our bookkeeping.
Daniele
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoting Daniele Ceraolo Spurio (2018-01-22 16:09:28)
Quoted 78 lines · Chris Wilson
Quoted 68 lines
Quoting Mika Kuoppala (2018-01-22 15:08:16)
Quoted 58 lines
Quoted 56 lines · Daniele Ceraolo Spurio
Quoted 55 lines · Mika Kuoppala
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn offQuoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
(quoted diff) +21
-0+static inline void write_port(struct intel_engine_execlists * const execlists, + unsigned int n, + u64 desc) +{ + if (execlists->elsq) + gen11_elsq_write(desc, n, execlists->elsq); + else + gen8_elsp_write(desc, execlists->elsp); +} + +static inline void submit_ports(struct intel_engine_execlists * const execlists) +{ + /* for gen11+ we need to manually load the submit queue */ + if (execlists->elsq) { + struct intel_engine_cs *engine = + container_of(execlists, + struct intel_engine_cs, + execlists); + struct drm_i915_private *dev_priv = engine->i915; + + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD);Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c static inline void elsp_write(u64 desc, u32 __iomem *elsp) · line 436
Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +3
-0+ } +} +I was undecided about hiding the code in sub-functions because of the pre-emption path. There is no need in gen11 to inject a context to preempt to idle,
Quoted 6 lines
Really? The preempt-to-idle is so that we can sync the bookkeeping with the pending CS interrupts. The HW doesn't require it currently either, it's the SW that does. If you have a way to avoid that, that should be applicable to the current code as well?
-Chris
Quoted 5 lines
We can't avoid preempt-to-idle, we can do it in a simpler way. There is a bit in
RING_EXECLIST_CONTROLthat triggers a preemp-to-idle, without the need to do a ctx injection. We'll need to move preemption completion detection to the CSB value instead of the HWSP write, not sure about the impact of that on our bookkeeping.
Ah, shucks :( I was hoping there's a simple way to avoid idling.
I have to ask, is it worth it? If we still have to do a CS interrupt round trip, what's the difference? Hmm. I wonder if assume that the preemption is nearly instantaneous (say 10us), we could short-circuit the interrupt and poll. Falling back to interrupt if longer, and/or resetting the GPU to guarantee latencies.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5] drm/i915/icl: Enhanced execution list support
Quoted 85 lines · Chris Wilson
Quoting Daniele Ceraolo Spurio (2018-01-22 16:09:28)
Quoted 78 lines · Chris Wilson
Quoted 68 lines
Quoting Mika Kuoppala (2018-01-22 15:08:16)
Quoted 58 lines
Quoted 56 lines · Daniele Ceraolo Spurio
Quoted 55 lines · Mika Kuoppala
Quoted 19 lines · Daniele Ceraolo Spurio
From: Thomas Daniel <[email protected]>
Enhanced Execlists is an upgraded version of execlists which supports up to 8 ports. The lrcs to be submitted are written to a submit queue, which is then loaded on the HW. When writing to the ELSP register, the lrcs are written cyclically in the queue from position 0 to position 7. Alternatively, it is possible to write directly in the individual positions of the queue using the ELSQ registers. To be able to re-use all the existing code we're using the latter method and we're currently limiting ourself to only using 2 elements.
The preemption flow is sligthly different with enhanced execlists, so this patch turns preemption off temporarily for Gen11+ while we wait for the new mechanism to land.
v2: Rebase.
v3: Switch from !IS_GEN11 to GEN < 11 (Daniele Ceraolo Spurio).
v4: Use the elsq registers instead of elsp. (Daniele Ceraolo Spurio)
v5: Reword commit, rename regs to be closer to specs, turn offQuoted 6 lines
preemption (Daniele), reuse engine->execlists.elsp (Chris)Cc Chris Wilson <[email protected]>Signed-off-by Thomas Daniel <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Was going to adopt this patch from Rodrigo but you were faster.
I choose to stash the elsq and use it as a gen11 vs rest toggle:
Relevant bits:
(quoted diff) +21
-0+static inline void write_port(struct intel_engine_execlists * const execlists, + unsigned int n, + u64 desc) +{ + if (execlists->elsq) + gen11_elsq_write(desc, n, execlists->elsq); + else + gen8_elsp_write(desc, execlists->elsp); +} + +static inline void submit_ports(struct intel_engine_execlists * const execlists) +{ + /* for gen11+ we need to manually load the submit queue */ + if (execlists->elsq) { + struct intel_engine_cs *engine = + container_of(execlists, + struct intel_engine_cs, + execlists); + struct drm_i915_private *dev_priv = engine->i915; + + I915_WRITE_FW(RING_ELCR(engine), ELCR_LOAD);Quoted 8 lines
Quoted 8 lines
Review
Quoted 4 lines
(quoted diff) +3
-0+ } +} +I was undecided about hiding the code in sub-functions because of the pre-emption path. There is no need in gen11 to inject a context to preempt to idle,
Quoted 6 lines
Really? The preempt-to-idle is so that we can sync the bookkeeping with the pending CS interrupts. The HW doesn't require it currently either, it's the SW that does. If you have a way to avoid that, that should be applicable to the current code as well?
-ChrisQuoted 5 lines
We can't avoid preempt-to-idle, we can do it in a simpler way. There is a bit in
RING_EXECLIST_CONTROLthat triggers a preemp-to-idle, without the need to do a ctx injection. We'll need to move preemption completion detection to the CSB value instead of the HWSP write, not sure about the impact of that on our bookkeeping.
Quoted 9 lines
Ah, shucks :( I was hoping there's a simple way to avoid idling.
I have to ask, is it worth it? If we still have to do a CS interrupt round trip, what's the difference? Hmm. I wonder if assume that the preemption is nearly instantaneous (say 10us), we could short-circuit the interrupt and poll. Falling back to interrupt if longer, and/or resetting the GPU to guarantee latencies.
-Chris
The SW cost shouldn't be too bad, so having 1 less ctx switch should give us some some benefits. Trying a poll with a fall-back sounds nice, but we'll probably have to wait until we have timing info to see if the polling makes sense at all.
Daniele
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 13 lines · Paulo Zanoni
Hello
This is the first series of patches for the Icelake platform. Unlike the other series that introduced new platforms, this one is very small and only contains patches for very basic enabling, interrupts and some GEM code. No patches for display or other subsystems yet and GEM is not complete either. I'm hoping that by splitting Icelake enabling into many small series progress will be better tracked and people only interested in one area of the code will be able to ignore everything else more easily. In addition, except for the first very few patches of this series, many of the sub-series that will follow are independent from each other and can be merged in any order. And on top of everything, tracking down any possible issues identified by the CI system will be easier if the problem is in a series with 20 patches instead of 160 patches.
good idea.
Quoted 12 lines
Another point worth mentioning is that some patches already have Reviewed-by tags. It is important to remind everybody that those tags were often given to some early versions of those patches, and rebasing happened since then due to the fast development pacing of our driver. Reworks may have landed on the upstream driver that we missed while rebasing, so it is likely that some reworks need to be applied to these patches now. I considered just removing the R-B tags before submitting the patches here, but I think it's probably better if we give credit to people who already spent time trying to check for problems in earlier versions of the patches. So, those patches that already have R-B tags need to be re-reviewed now, and special consideration should be given to any rebasing problems. I'd love to see some "R-b tag still stands" emails.
I'm glad you didn't removed the rv-b tags. The review process that happened so far was very productive. Let's keep the right credits in place and take extra care when merging to dinq. Let's only merge what we are confident that review is still valid or ask for re-reviews and extra acks.
One idea that I heard this morning was to use on internal some custom tag like "Internally-Reviewed-by:" but I don't like this idea of adding custom tags and I trust our commiters to differentiate between valid internal reviews and risky ones. Agree?
Thoughts?
Quoted 75 lines
Display-related patches and other series should arrive soon.
Thanks,
PauloCeraolo Spurio, Daniele (1):
drm/i915/icl: new context descriptor supportDaniele Ceraolo Spurio (1):
drm/i915/icl: Gen11 forcewake supportKelvin Gardiner (2):
drm/i915/icl: Update subslice define for ICL 11 drm/i915/icl: Added ICL 11 slice, subslice and EU fuse detectionMichel Thierry (2):
drm/i915/icl: Add Indirect Context Offset for Gen11 drm/i915/icl: Add reset control register changesOscar Mateo (7):
drm/i915/icl: Correctly initialize the Gen11 engines drm/i915/icl: Check for fused-off VDBOX and VEBOX instances drm/i915/icl: Enable the extra video decode and enhancement boxes for
Icelake 11
drm/i915/icl: Make use of the SW counter field in the new context
descriptor
drm/i915/icl: Split out the servicing of the Selector and Shared IIR
registers
drm/i915/icl: Handle RPS interrupts correctly for Gen11 drm/i915/icl: Enable RC6 and RPS in Gen11Paulo Zanoni (4):
drm/i915/icl: Add the ICL PCI IDs
drm/i915/icl: addicelake_init_clock_gating()drm/i915/icl: allow thereg_readioctl to read the RCS TIMESTAMP
register
drm/i915/gen11: add support for reading the timestamp frequencyRodrigo Vivi (1):
drm/i915/icl: Add initial Icelake definitions.Thomas Daniel (1):
drm/i915/icl: Enhanced execution list supportTomasz Lis (1):
drm/i915/icl: Add configuring MOCS in new Icelake enginesTvrtko Ursulin (6):
drm/i915/icl: Icelake interrupt register addresses and bits drm/i915/icl: Show interrupt registers in debugfs drm/i915/icl: Prepare for more rings drm/i915/icl: Interrupt handling
drm/i915/icl: Ringbuffer interrupt handling drm/i915/icl: Gen11 render context sizekgardine (1):
drm/i915/icl: Set graphics mode register for gen11drivers/gpu/drm/i915/i915_debugfs.c | 92 ++++++++- drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 16 +- drivers/gpu/drm/i915/i915_gem.h | 2 +- drivers/gpu/drm/i915/i915_gem_context.c | 14 +- drivers/gpu/drm/i915/i915_gem_context.h | 2 + drivers/gpu/drm/i915/i915_irq.c | 274 +++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_pci.c | 15 ++ drivers/gpu/drm/i915/i915_reg.h | 119 ++++++++++- drivers/gpu/drm/i915/intel_breadcrumbs.c | 20 +- drivers/gpu/drm/i915/intel_device_info.c | 153 ++++++++++++-- drivers/gpu/drm/i915/intel_device_info.h | 10 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 46 ++++- drivers/gpu/drm/i915/intel_lrc.c | 79 +++++++- drivers/gpu/drm/i915/intel_lrc.h | 3 +
Quoted 16 lines
drivers/gpu/drm/i915/intel_mocs.c | 5 +- drivers/gpu/drm/i915/intel_pm.c | 22 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 16 +- drivers/gpu/drm/i915/intel_uncore.c | 203 ++++++++++++++++++- drivers/gpu/drm/i915/intel_uncore.h | 27 ++- drivers/gpu/drm/i915/selftests/intel_uncore.c | 30 ++- include/drm/i915_pciids.h | 11 ++ 23 files changed, 1083 insertions(+), 79 deletions(-)Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainer+ Jani
Quoted 35 lines · Rodrigo Vivi
Quoted 13 lines · Paulo Zanoni
Hello
This is the first series of patches for the Icelake platform. Unlike the other series that introduced new platforms, this one is very small and only contains patches for very basic enabling, interrupts and some GEM code. No patches for display or other subsystems yet and GEM is not complete either. I'm hoping that by splitting Icelake enabling into many small series progress will be better tracked and people only interested in one area of the code will be able to ignore everything else more easily. In addition, except for the first very few patches of this series, many of the sub-series that will follow are independent from each other and can be merged in any order. And on top of everything, tracking down any possible issues identified by the CI system will be easier if the problem is in a series with 20 patches instead of 160 patches.
good idea.
Quoted 12 lines
Another point worth mentioning is that some patches already have Reviewed-by tags. It is important to remind everybody that those tags were often given to some early versions of those patches, and rebasing happened since then due to the fast development pacing of our driver. Reworks may have landed on the upstream driver that we missed while rebasing, so it is likely that some reworks need to be applied to these patches now. I considered just removing the R-B tags before submitting the patches here, but I think it's probably better if we give credit to people who already spent time trying to check for problems in earlier versions of the patches. So, those patches that already have R-B tags need to be re-reviewed now, and special consideration should be given to any rebasing problems. I'd love to see some "R-b tag still stands" emails.
I'm glad you didn't removed the rv-b tags. The review process that happened so far was very productive. Let's keep the right credits in place and take extra care when merging to dinq. Let's only merge what we are confident that review is still valid or ask for re-reviews and extra acks.
Quoted 6 lines
One idea that I heard this morning was to use on internal some custom tag like "Internally-Reviewed-by:" but I don't like this idea of adding custom tags and I trust our commiters to differentiate between valid internal reviews and risky ones. Agree?
Thoughts?
I've been all favour of converting R-b's to Cc:s and embedding any meaningful changelog entries into the commit text. Because it'll be the first revision sent to public, you can't trace any of the previous review comments back by searching mailing lists. It'll only add confusion.
I don't see the value added by leaving just the changelog entries to the commit messages. Quite contrary, they are a potentialcause of confusion when somebody tries to track down non-existent review history in public.
And sending pre-reviewed patches to community mailing lists also doesn't feel quite right. Even for IRC review the BKM is to respond to the mailing list and note that the patch received a R-b in IRC, for documentation purposes.
And when you add the fact that there is high chance of not invalidating the reviews when they should be (due to the urgency and amount of patches there's related to new product development), I see it more as a problem maker than a solver.
It has little to give but the trade has much to lose.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 61 lines · Joonas Lahtinen
+ Jani
Quoted 35 lines · Rodrigo Vivi
Quoted 13 lines · Paulo Zanoni
Hello
This is the first series of patches for the Icelake platform. Unlike the other series that introduced new platforms, this one is very small and only contains patches for very basic enabling, interrupts and some GEM code. No patches for display or other subsystems yet and GEM is not complete either. I'm hoping that by splitting Icelake enabling into many small series progress will be better tracked and people only interested in one area of the code will be able to ignore everything else more easily. In addition, except for the first very few patches of this series, many of the sub-series that will follow are independent from each other and can be merged in any order. And on top of everything, tracking down any possible issues identified by the CI system will be easier if the problem is in a series with 20 patches instead of 160 patches.
good idea.
Quoted 12 lines
Another point worth mentioning is that some patches already have Reviewed-by tags. It is important to remind everybody that those tags were often given to some early versions of those patches, and rebasing happened since then due to the fast development pacing of our driver. Reworks may have landed on the upstream driver that we missed while rebasing, so it is likely that some reworks need to be applied to these patches now. I considered just removing the R-B tags before submitting the patches here, but I think it's probably better if we give credit to people who already spent time trying to check for problems in earlier versions of the patches. So, those patches that already have R-B tags need to be re-reviewed now, and special consideration should be given to any rebasing problems. I'd love to see some "R-b tag still stands" emails.
I'm glad you didn't removed the rv-b tags. The review process that happened so far was very productive. Let's keep the right credits in place and take extra care when merging to dinq. Let's only merge what we are confident that review is still valid or ask for re-reviews and extra acks.
Quoted 6 lines
One idea that I heard this morning was to use on internal some custom tag like "Internally-Reviewed-by:" but I don't like this idea of adding custom tags and I trust our commiters to differentiate between valid internal reviews and risky ones. Agree?
Thoughts?
I've been all favour of converting R-b's to Cc:s and embedding any meaningful changelog entries into the commit text. Because it'll be the first revision sent to public, you can't trace any of the previous review comments back by searching mailing lists. It'll only add confusion.
I don't see the value added by leaving just the changelog entries to the commit messages. Quite contrary, they are a potentialcause of confusion when somebody tries to track down non-existent review history in public.
And sending pre-reviewed patches to community mailing lists also doesn't feel quite right. Even for IRC review the BKM is to respond to the mailing list and note that the patch received a R-b in IRC, for documentation purposes.
Quoted 6 lines
And when you add the fact that there is high chance of not invalidating the reviews when they should be (due to the urgency and amount of patches there's related to new product development), I see it more as a problem maker than a solver.
It has little to give but the trade has much to lose.
I agree with some points but also think it is not desirable to just lose any record of potentially significant review effort that went in before first public posting.
The only idea I can think of at the moment, if we don't want to use a separate tag, is to, as you say, squash meaningful change log entries into the commit, convert the r-b to r-b # internal (similar to r-b # v1 notation), and add the reviewer as cc explicitly:
drm/i915: Some patch title
Some commit text.
Signed-of-by: A
Reviewed-by: B # internal
Cc: B
B then follows up with upgrading the r-b.
?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Mika Kuoppala
Reviewed-by B # internal v3Quoted 78 lines · Tvrtko Ursulin
Quoted 61 lines · Joonas Lahtinen
+ Jani
Quoted 35 lines · Rodrigo Vivi
Quoted 13 lines · Paulo Zanoni
Hello
This is the first series of patches for the Icelake platform. Unlike the other series that introduced new platforms, this one is very small and only contains patches for very basic enabling, interrupts and some GEM code. No patches for display or other subsystems yet and GEM is not complete either. I'm hoping that by splitting Icelake enabling into many small series progress will be better tracked and people only interested in one area of the code will be able to ignore everything else more easily. In addition, except for the first very few patches of this series, many of the sub-series that will follow are independent from each other and can be merged in any order. And on top of everything, tracking down any possible issues identified by the CI system will be easier if the problem is in a series with 20 patches instead of 160 patches.
good idea.
Quoted 12 lines
Another point worth mentioning is that some patches already have Reviewed-by tags. It is important to remind everybody that those tags were often given to some early versions of those patches, and rebasing happened since then due to the fast development pacing of our driver. Reworks may have landed on the upstream driver that we missed while rebasing, so it is likely that some reworks need to be applied to these patches now. I considered just removing the R-B tags before submitting the patches here, but I think it's probably better if we give credit to people who already spent time trying to check for problems in earlier versions of the patches. So, those patches that already have R-B tags need to be re-reviewed now, and special consideration should be given to any rebasing problems. I'd love to see some "R-b tag still stands" emails.
I'm glad you didn't removed the rv-b tags. The review process that happened so far was very productive. Let's keep the right credits in place and take extra care when merging to dinq. Let's only merge what we are confident that review is still valid or ask for re-reviews and extra acks.
Quoted 6 lines
One idea that I heard this morning was to use on internal some custom tag like "Internally-Reviewed-by:" but I don't like this idea of adding custom tags and I trust our commiters to differentiate between valid internal reviews and risky ones. Agree?
Thoughts?
I've been all favour of converting R-b's to Cc:s and embedding any meaningful changelog entries into the commit text. Because it'll be the first revision sent to public, you can't trace any of the previous review comments back by searching mailing lists. It'll only add confusion.
I don't see the value added by leaving just the changelog entries to the commit messages. Quite contrary, they are a potentialcause of confusion when somebody tries to track down non-existent review history in public.
And sending pre-reviewed patches to community mailing lists also doesn't feel quite right. Even for IRC review the BKM is to respond to the mailing list and note that the patch received a R-b in IRC, for documentation purposes.
Quoted 6 lines
And when you add the fact that there is high chance of not invalidating the reviews when they should be (due to the urgency and amount of patches there's related to new product development), I see it more as a problem maker than a solver.
It has little to give but the trade has much to lose.
I agree with some points but also think it is not desirable to just lose any record of potentially significant review effort that went in before first public posting.
The only idea I can think of at the moment, if we don't want to use a separate tag, is to, as you say, squash meaningful change log entries into the commit, convert the r-b to r-b # internal (similar to r-b # v1 notation), and add the reviewer as cc explicitly:
Quoted 6 lines
drm/i915: Some patch title
Some commit text.
Signed-of-by: A
Reviewed-by: B # internal
or optionally
-Mika
Quoted 6 lines
Cc BB then follows up with upgrading the r-b.
?
Quoted 7 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 61 lines · Joonas Lahtinen
+ Jani
Quoted 35 lines · Rodrigo Vivi
Quoted 13 lines · Paulo Zanoni
Hello
This is the first series of patches for the Icelake platform. Unlike the other series that introduced new platforms, this one is very small and only contains patches for very basic enabling, interrupts and some GEM code. No patches for display or other subsystems yet and GEM is not complete either. I'm hoping that by splitting Icelake enabling into many small series progress will be better tracked and people only interested in one area of the code will be able to ignore everything else more easily. In addition, except for the first very few patches of this series, many of the sub-series that will follow are independent from each other and can be merged in any order. And on top of everything, tracking down any possible issues identified by the CI system will be easier if the problem is in a series with 20 patches instead of 160 patches.
good idea.
Quoted 12 lines
Another point worth mentioning is that some patches already have Reviewed-by tags. It is important to remind everybody that those tags were often given to some early versions of those patches, and rebasing happened since then due to the fast development pacing of our driver. Reworks may have landed on the upstream driver that we missed while rebasing, so it is likely that some reworks need to be applied to these patches now. I considered just removing the R-B tags before submitting the patches here, but I think it's probably better if we give credit to people who already spent time trying to check for problems in earlier versions of the patches. So, those patches that already have R-B tags need to be re-reviewed now, and special consideration should be given to any rebasing problems. I'd love to see some "R-b tag still stands" emails.
I'm glad you didn't removed the rv-b tags. The review process that happened so far was very productive. Let's keep the right credits in place and take extra care when merging to dinq. Let's only merge what we are confident that review is still valid or ask for re-reviews and extra acks.
Quoted 6 lines
One idea that I heard this morning was to use on internal some custom tag like "Internally-Reviewed-by:" but I don't like this idea of adding custom tags and I trust our commiters to differentiate between valid internal reviews and risky ones. Agree?
Thoughts?
I've been all favour of converting R-b's to Cc:s and embedding any meaningful changelog entries into the commit text. Because it'll be the first revision sent to public, you can't trace any of the previous review comments back by searching mailing lists. It'll only add confusion.
I don't see the value added by leaving just the changelog entries to the commit messages. Quite contrary, they are a potentialcause of confusion when somebody tries to track down non-existent review history in public.
And sending pre-reviewed patches to community mailing lists also doesn't feel quite right. Even for IRC review the BKM is to respond to the mailing list and note that the patch received a R-b in IRC, for documentation purposes.
Quoted 6 lines
And when you add the fact that there is high chance of not invalidating the reviews when they should be (due to the urgency and amount of patches there's related to new product development), I see it more as a problem maker than a solver.
It has little to give but the trade has much to lose.
I don't want to devalue internal review, it's good stuff for the most part. However, there are a few issues. Most patches have seen a bunch of rebases and fixups since the review. Sometimes the review means, good enough for merging internally. And finally, I don't want us to give the impression of internal rubber stamp review. Basically I want every internal Reviewed-by confirmed on the public list. I think this pretty much aligns with what Paulo said in the cover letter.
It's a matter of taste whether you require the confirmation of reviews or change them to Cc's and ask for the same.
For the changelogs, I agree we should start scrubbing them for v1 posted on the public list.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for ICL basic enabling + GEM (rev24)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: ICL basic enabling + GEM (rev24)
URL : https://patchwork.freedesktop.org/series/36230/
State : failure
== Summary ==
Applying: drm/i915/icl: Add initial Icelake definitions.
Applying: drm/i915/icl: Add the ICL PCI IDs
Applying: drm/i915/icl: add icelake_init_clock_gating()
Applying: drm/i915/icl: Icelake interrupt register addresses and bits
Applying: drm/i915/icl: Show interrupt registers in debugfs
Applying: drm/i915/icl: Prepare for more rings
Applying: drm/i915/icl: Interrupt handling
Applying: drm/i915/icl: Ringbuffer interrupt handling
Applying: drm/i915/icl: Correctly initialize the Gen11 engines
Applying: drm/i915/icl: Gen11 render context size
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/intel_engine_cs.c).
error: could not build fake ancestor
Patch failed at 0010 drm/i915/icl: Gen11 render context size
The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for ICL basic enabling + GEM (rev25)
In reply to Paulo Zanoni== Series Details ==
== Series Details ==
Series: ICL basic enabling + GEM (rev25)
URL : https://patchwork.freedesktop.org/series/36230/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CC init/version.o
AR init/built-in.o
CC arch/x86/kernel/early-quirks.o
AR arch/x86/kernel/built-in.o
AR arch/x86/built-in.o
CC kernel/sys.o
CC kernel/trace/trace.o
AR kernel/trace/built-in.o
CC kernel/module.o
AR kernel/built-in.o
GZIP kernel/config_data.gz
CHK kernel/config_data.h
UPD kernel/config_data.h
CC [M] kernel/configs.o
CC drivers/base/firmware_class.o
AR drivers/base/built-in.o
CC [M] drivers/gpu/drm/i915/gvt/mmio_context.o
drivers/gpu/drm/i915/gvt/mmio_context.c: In function ‘load_render_mocs’:
drivers/gpu/drm/i915/gvt/mmio_context.c:171:20: error: iteration 7 invokes undefined behavior [-Werror=aggressive-loop-optimizations]
offset.reg = regs[ring_id];
~~~~^~~~~~~~~drivers/gpu/drm/i915/gvt/mmio_context.c:170:2: note: within this loop
for (ring_id = 0; ring_id < I915_NUM_ENGINES; ring_id++) {
^~~
cc1: all warnings being treated as errorsscripts/Makefile.build:310: recipe for target 'drivers/gpu/drm/i915/gvt/mmio_context.o' failed make[4]: *** [drivers/gpu/drm/i915/gvt/mmio_context.o] Error 1 scripts/Makefile.build:569: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:569: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:569: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1018: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx