| Message ID | 20190625175437.14840-5-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Initial support for Tiger Lake | expand |
>-----Original Message----- >From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >Lucas De Marchi >Sent: Tuesday, June 25, 2019 10:54 AM >To: intel-gfx@lists.freedesktop.org >Cc: De Marchi, Lucas <lucas.demarchi@intel.com> >Subject: [Intel-gfx] [PATCH 04/28] drm/i915/tgl: add initial Tiger Lake definitions > >From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > >Tiger Lake is a Intel® Processor containing Intel® HD Graphics. > >This is just an initial Tiger Lake definition. PCI IDs, generic support and new >features coming in following patches. > >Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> >Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> >Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Looks good. Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >--- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/i915_pci.c | 30 ++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_device_info.c | 1 + >drivers/gpu/drm/i915/intel_device_info.h | 2 ++ > 4 files changed, 34 insertions(+) > >diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >index 7e981b03face..8d0106b89f24 100644 >--- a/drivers/gpu/drm/i915/i915_drv.h >+++ b/drivers/gpu/drm/i915/i915_drv.h >@@ -2091,6 +2091,7 @@ IS_SUBPLATFORM(const struct drm_i915_private >*i915, > #define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, >INTEL_CANNONLAKE) > #define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE) > #define IS_ELKHARTLAKE(dev_priv) IS_PLATFORM(dev_priv, >INTEL_ELKHARTLAKE) >+#define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, >INTEL_TIGERLAKE) > #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ > (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) >#define IS_BDW_ULT(dev_priv) \ diff --git a/drivers/gpu/drm/i915/i915_pci.c >b/drivers/gpu/drm/i915/i915_pci.c index 6c9f46fc3e12..29d2d6070f81 100644 >--- a/drivers/gpu/drm/i915/i915_pci.c >+++ b/drivers/gpu/drm/i915/i915_pci.c >@@ -765,6 +765,36 @@ static const struct intel_device_info >intel_elkhartlake_info = { > .ppgtt_size = 36, > }; > >+#define GEN12_FEATURES \ >+ GEN11_FEATURES, \ >+ GEN(12), \ >+ .pipe_offsets = { \ >+ [TRANSCODER_A] = PIPE_A_OFFSET, \ >+ [TRANSCODER_B] = PIPE_B_OFFSET, \ >+ [TRANSCODER_C] = PIPE_C_OFFSET, \ >+ [TRANSCODER_D] = PIPE_D_OFFSET, \ >+ [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ >+ [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ >+ }, \ >+ .trans_offsets = { \ >+ [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ >+ [TRANSCODER_B] = TRANSCODER_B_OFFSET, \ >+ [TRANSCODER_C] = TRANSCODER_C_OFFSET, \ >+ [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ >+ [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ >+ [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ >+ } >+ >+static const struct intel_device_info intel_tigerlake_12_info = { >+ GEN12_FEATURES, >+ PLATFORM(INTEL_TIGERLAKE), >+ .num_pipes = 4, >+ .require_force_probe = 1, >+ .display.has_modular_fia = 1, >+ .engine_mask = >+ BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), }; >+ > #undef GEN > #undef PLATFORM > >diff --git a/drivers/gpu/drm/i915/intel_device_info.c >b/drivers/gpu/drm/i915/intel_device_info.c >index e64536e1fd1b..e0d9a7a37994 100644 >--- a/drivers/gpu/drm/i915/intel_device_info.c >+++ b/drivers/gpu/drm/i915/intel_device_info.c >@@ -58,6 +58,7 @@ static const char * const platform_names[] = { > PLATFORM_NAME(CANNONLAKE), > PLATFORM_NAME(ICELAKE), > PLATFORM_NAME(ELKHARTLAKE), >+ PLATFORM_NAME(TIGERLAKE), > }; > #undef PLATFORM_NAME > >diff --git a/drivers/gpu/drm/i915/intel_device_info.h >b/drivers/gpu/drm/i915/intel_device_info.h >index e9dc86ed517b..45a9badc9b8e 100644 >--- a/drivers/gpu/drm/i915/intel_device_info.h >+++ b/drivers/gpu/drm/i915/intel_device_info.h >@@ -78,6 +78,8 @@ enum intel_platform { > /* gen11 */ > INTEL_ICELAKE, > INTEL_ELKHARTLAKE, >+ /* gen12 */ >+ INTEL_TIGERLAKE, > INTEL_MAX_PLATFORMS > }; > >-- >2.21.0 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7e981b03face..8d0106b89f24 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2091,6 +2091,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE) #define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE) #define IS_ELKHARTLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE) +#define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE) #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) #define IS_BDW_ULT(dev_priv) \ diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 6c9f46fc3e12..29d2d6070f81 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -765,6 +765,36 @@ static const struct intel_device_info intel_elkhartlake_info = { .ppgtt_size = 36, }; +#define GEN12_FEATURES \ + GEN11_FEATURES, \ + GEN(12), \ + .pipe_offsets = { \ + [TRANSCODER_A] = PIPE_A_OFFSET, \ + [TRANSCODER_B] = PIPE_B_OFFSET, \ + [TRANSCODER_C] = PIPE_C_OFFSET, \ + [TRANSCODER_D] = PIPE_D_OFFSET, \ + [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ + [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ + }, \ + .trans_offsets = { \ + [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ + [TRANSCODER_B] = TRANSCODER_B_OFFSET, \ + [TRANSCODER_C] = TRANSCODER_C_OFFSET, \ + [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ + [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ + [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ + } + +static const struct intel_device_info intel_tigerlake_12_info = { + GEN12_FEATURES, + PLATFORM(INTEL_TIGERLAKE), + .num_pipes = 4, + .require_force_probe = 1, + .display.has_modular_fia = 1, + .engine_mask = + BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), +}; + #undef GEN #undef PLATFORM diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index e64536e1fd1b..e0d9a7a37994 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -58,6 +58,7 @@ static const char * const platform_names[] = { PLATFORM_NAME(CANNONLAKE), PLATFORM_NAME(ICELAKE), PLATFORM_NAME(ELKHARTLAKE), + PLATFORM_NAME(TIGERLAKE), }; #undef PLATFORM_NAME diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index e9dc86ed517b..45a9badc9b8e 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -78,6 +78,8 @@ enum intel_platform { /* gen11 */ INTEL_ICELAKE, INTEL_ELKHARTLAKE, + /* gen12 */ + INTEL_TIGERLAKE, INTEL_MAX_PLATFORMS };