On Thu, Sep 28, 2017 at 07:38:58PM +0000, Chris Wilson wrote:
> I recently tried to update the gen9 feature matrix and to my unpleasant
> surprise found that Kabylake still acted like Broadwell and didn't
> enable the feature. This is because kbl/cfl are inheriting their
> defaults from Broadwell and not Skylake.
Oh, if this is blocking all this series here we can move with this
and I do the re-org on top of this later since that one depends on
that has_ipc discussion...
only 1 nip-tick below..
>
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Cc: Rodrigo Vivi <rodrigo.v...@intel.com>
> Cc: Paulo Zanoni <paulo.r.zan...@intel.com>
> Cc: Mika Kuoppala <mika.kuopp...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_pci.c | 21 +++++----------------
> 1 file changed, 5 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index da60866b6628..01d4b569b2cc 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -495,13 +495,9 @@ static const struct intel_device_info
> intel_geminilake_info __initconst = {
> };
>
> #define KBL_PLATFORM \
> - BDW_FEATURES, \
> - .gen = 9, \
> + SKL_PLATFORM, \
> .platform = INTEL_KABYLAKE, \
> - .has_csr = 1, \
> - .has_guc = 1, \
> - .has_ipc = 1, \
> - .ddb_size = 896
> + .has_ipc = 1
>
> static const struct intel_device_info intel_kabylake_gt1_info __initconst = {
> KBL_PLATFORM,
> @@ -520,13 +516,8 @@ static const struct intel_device_info
> intel_kabylake_gt3_info __initconst = {
> };
>
> #define CFL_PLATFORM \
> - BDW_FEATURES, \
> - .gen = 9, \
> - .platform = INTEL_COFFEELAKE, \
> - .has_csr = 1, \
> - .has_guc = 1, \
> - .has_ipc = 1, \
> - .ddb_size = 896
> + KBL_PLATFORM, \
> + .platform = INTEL_COFFEELAKE
>
> static const struct intel_device_info intel_coffeelake_gt1_info __initconst
> = {
> CFL_PLATFORM,
> @@ -545,14 +536,12 @@ static const struct intel_device_info
> intel_coffeelake_gt3_info __initconst = {
> };
>
> static const struct intel_device_info intel_cannonlake_gt2_info __initconst
> = {
> - BDW_FEATURES,
> + SKL_PLATFORM,
KBL_PLATFORM or we end up removing has_ipc from cnl...
(CFL_PLATFORM also works)
> .is_alpha_support = 1,
> .platform = INTEL_CANNONLAKE,
> .gen = 10,
> .gt = 2,
> .ddb_size = 1024,
> - .has_csr = 1,
> - .has_ipc = 1,
> .color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
> };
>
> --
> 2.14.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
