| Message ID | 1496184183-30740-7-git-send-email-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>-----Original Message----- >From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >Rodrigo Vivi >Sent: Tuesday, May 30, 2017 3:43 PM >To: intel-gfx@lists.freedesktop.org >Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >Subject: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake platform >definition. > >Coffee Lake is a Intel® Processor containing Intel® HD Graphics following >Kabylake. > >It is Gen9 graphics based platform on top of CNP PCH. > >Let's start by adding the platform definition based on previous platforms but yet >as preliminary_hw_support. > >On following patches we will start adding PCI IDs and the platform specific >changes. > >Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> >--- > drivers/gpu/drm/i915/i915_drv.h | 2 ++ > drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ > drivers/gpu/drm/i915/intel_device_info.c | 1 + > 3 files changed, 11 insertions(+) > >diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >index c31c0cf..2f20e87 100644 >--- a/drivers/gpu/drm/i915/i915_drv.h >+++ b/drivers/gpu/drm/i915/i915_drv.h >@@ -826,6 +826,7 @@ enum intel_platform { > INTEL_BROXTON, > INTEL_KABYLAKE, > INTEL_GEMINILAKE, >+ INTEL_COFFEELAKE, > INTEL_MAX_PLATFORMS > }; > >@@ -2768,6 +2769,7 @@ static inline struct scatterlist *__sg_next(struct >scatterlist *sg) > #define IS_BROXTON(dev_priv) ((dev_priv)->info.platform == INTEL_BROXTON) > #define IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) > #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == >INTEL_GEMINILAKE) >+#define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == >INTEL_COFFEELAKE) > #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) >diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >index cf43dc1..31ea988 100644 >--- a/drivers/gpu/drm/i915/i915_pci.c >+++ b/drivers/gpu/drm/i915/i915_pci.c >@@ -425,6 +425,14 @@ > .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | >BSD2_RING, }; > >+static const struct intel_device_info intel_coffeelake_info = { >+ BDW_FEATURES, >+ .is_alpha_support = 1, >+ .platform = INTEL_COFFEELAKE, >+ .gen = 9, >+ .ddb_size = 896, >+}; Rodrigo, what about properties like has_guc, has_csr, color etc? BR Anusha > /* > * Make sure any device matches here are from most specific to most > * general. For example, since the Quanta match is based on the subsystem diff - >-git a/drivers/gpu/drm/i915/intel_device_info.c >b/drivers/gpu/drm/i915/intel_device_info.c >index 3718341..acc746f 100644 >--- a/drivers/gpu/drm/i915/intel_device_info.c >+++ b/drivers/gpu/drm/i915/intel_device_info.c >@@ -51,6 +51,7 @@ > PLATFORM_NAME(BROXTON), > PLATFORM_NAME(KABYLAKE), > PLATFORM_NAME(GEMINILAKE), >+ PLATFORM_NAME(COFFEELAKE), > }; > #undef PLATFORM_NAME > >-- >1.9.1 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Jun 1, 2017 at 3:27 PM, Srivatsa, Anusha <anusha.srivatsa@intel.com> wrote: > > >>-----Original Message----- >>From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of >>Rodrigo Vivi >>Sent: Tuesday, May 30, 2017 3:43 PM >>To: intel-gfx@lists.freedesktop.org >>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >>Subject: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake platform >>definition. >> >>Coffee Lake is a Intel® Processor containing Intel® HD Graphics following >>Kabylake. >> >>It is Gen9 graphics based platform on top of CNP PCH. >> >>Let's start by adding the platform definition based on previous platforms but yet >>as preliminary_hw_support. >> >>On following patches we will start adding PCI IDs and the platform specific >>changes. >> >>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> >>--- >> drivers/gpu/drm/i915/i915_drv.h | 2 ++ >> drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ >> drivers/gpu/drm/i915/intel_device_info.c | 1 + >> 3 files changed, 11 insertions(+) >> >>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >>index c31c0cf..2f20e87 100644 >>--- a/drivers/gpu/drm/i915/i915_drv.h >>+++ b/drivers/gpu/drm/i915/i915_drv.h >>@@ -826,6 +826,7 @@ enum intel_platform { >> INTEL_BROXTON, >> INTEL_KABYLAKE, >> INTEL_GEMINILAKE, >>+ INTEL_COFFEELAKE, >> INTEL_MAX_PLATFORMS >> }; >> >>@@ -2768,6 +2769,7 @@ static inline struct scatterlist *__sg_next(struct >>scatterlist *sg) >> #define IS_BROXTON(dev_priv) ((dev_priv)->info.platform == INTEL_BROXTON) >> #define IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) >> #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == >>INTEL_GEMINILAKE) >>+#define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == >>INTEL_COFFEELAKE) >> #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) >>diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >>index cf43dc1..31ea988 100644 >>--- a/drivers/gpu/drm/i915/i915_pci.c >>+++ b/drivers/gpu/drm/i915/i915_pci.c >>@@ -425,6 +425,14 @@ >> .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | >>BSD2_RING, }; >> >>+static const struct intel_device_info intel_coffeelake_info = { >>+ BDW_FEATURES, >>+ .is_alpha_support = 1, >>+ .platform = INTEL_COFFEELAKE, >>+ .gen = 9, >>+ .ddb_size = 896, >>+}; > > Rodrigo, what about properties like has_guc, has_csr, color etc? I believe "has_guc" should be part of the GuC patch that you are about to send ;) as "has_csr" is part of "[PATCH 13/13] drm/i915/cfl: Coffe Lake reuses Kabylake DMC." while "color" one is not needed, as it was not in Kabylake and Skylake. > > BR > Anusha >> /* >> * Make sure any device matches here are from most specific to most >> * general. For example, since the Quanta match is based on the subsystem diff - >>-git a/drivers/gpu/drm/i915/intel_device_info.c >>b/drivers/gpu/drm/i915/intel_device_info.c >>index 3718341..acc746f 100644 >>--- a/drivers/gpu/drm/i915/intel_device_info.c >>+++ b/drivers/gpu/drm/i915/intel_device_info.c >>@@ -51,6 +51,7 @@ >> PLATFORM_NAME(BROXTON), >> PLATFORM_NAME(KABYLAKE), >> PLATFORM_NAME(GEMINILAKE), >>+ PLATFORM_NAME(COFFEELAKE), >> }; >> #undef PLATFORM_NAME >> >>-- >>1.9.1 >> >>_______________________________________________ >>Intel-gfx mailing list >>Intel-gfx@lists.freedesktop.org >>https://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>-----Original Message----- >From: Rodrigo Vivi [mailto:rodrigo.vivi@gmail.com] >Sent: Thursday, June 1, 2017 3:48 PM >To: Srivatsa, Anusha <anusha.srivatsa@intel.com> >Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; intel-gfx@lists.freedesktop.org >Subject: Re: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake >platform definition. > >On Thu, Jun 1, 2017 at 3:27 PM, Srivatsa, Anusha <anusha.srivatsa@intel.com> >wrote: >> >> >>>-----Original Message----- >>>From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On >>>Behalf Of Rodrigo Vivi >>>Sent: Tuesday, May 30, 2017 3:43 PM >>>To: intel-gfx@lists.freedesktop.org >>>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >>>Subject: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake >>>platform definition. >>> >>>Coffee Lake is a Intel® Processor containing Intel® HD Graphics >>>following Kabylake. >>> >>>It is Gen9 graphics based platform on top of CNP PCH. >>> >>>Let's start by adding the platform definition based on previous >>>platforms but yet as preliminary_hw_support. >>> >>>On following patches we will start adding PCI IDs and the platform >>>specific changes. >>> >>>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> >>>--- >>> drivers/gpu/drm/i915/i915_drv.h | 2 ++ >>> drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ >>> drivers/gpu/drm/i915/intel_device_info.c | 1 + >>> 3 files changed, 11 insertions(+) >>> >>>diff --git a/drivers/gpu/drm/i915/i915_drv.h >>>b/drivers/gpu/drm/i915/i915_drv.h index c31c0cf..2f20e87 100644 >>>--- a/drivers/gpu/drm/i915/i915_drv.h >>>+++ b/drivers/gpu/drm/i915/i915_drv.h >>>@@ -826,6 +826,7 @@ enum intel_platform { >>> INTEL_BROXTON, >>> INTEL_KABYLAKE, >>> INTEL_GEMINILAKE, >>>+ INTEL_COFFEELAKE, >>> INTEL_MAX_PLATFORMS >>> }; >>> >>>@@ -2768,6 +2769,7 @@ static inline struct scatterlist >>>*__sg_next(struct scatterlist *sg) #define IS_BROXTON(dev_priv) >>>((dev_priv)->info.platform == INTEL_BROXTON) #define >>>IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) >>> #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == >>>INTEL_GEMINILAKE) >>>+#define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == >>>INTEL_COFFEELAKE) >>> #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) diff --git a/drivers/gpu/drm/i915/i915_pci.c >>>b/drivers/gpu/drm/i915/i915_pci.c index cf43dc1..31ea988 100644 >>>--- a/drivers/gpu/drm/i915/i915_pci.c >>>+++ b/drivers/gpu/drm/i915/i915_pci.c >>>@@ -425,6 +425,14 @@ >>> .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | >>>BSD2_RING, }; >>> >>>+static const struct intel_device_info intel_coffeelake_info = { >>>+ BDW_FEATURES, >>>+ .is_alpha_support = 1, >>>+ .platform = INTEL_COFFEELAKE, >>>+ .gen = 9, >>>+ .ddb_size = 896, >>>+}; >> >> Rodrigo, what about properties like has_guc, has_csr, color etc? > >I believe "has_guc" should be part of the GuC patch that you are about to send ;) > >as "has_csr" is part of "[PATCH 13/13] drm/i915/cfl: Coffe Lake reuses Kabylake >DMC." > >while "color" one is not needed, as it was not in Kabylake and Skylake. Oh.... I actually sent GuC patch some weeks back without adding has_guc, Should I change that patch and resend or will adding has_guc in this patch make more sense? Anusha >> >> BR >> Anusha >>> /* >>> * Make sure any device matches here are from most specific to most >>> * general. For example, since the Quanta match is based on the >>>subsystem diff - -git a/drivers/gpu/drm/i915/intel_device_info.c >>>b/drivers/gpu/drm/i915/intel_device_info.c >>>index 3718341..acc746f 100644 >>>--- a/drivers/gpu/drm/i915/intel_device_info.c >>>+++ b/drivers/gpu/drm/i915/intel_device_info.c >>>@@ -51,6 +51,7 @@ >>> PLATFORM_NAME(BROXTON), >>> PLATFORM_NAME(KABYLAKE), >>> PLATFORM_NAME(GEMINILAKE), >>>+ PLATFORM_NAME(COFFEELAKE), >>> }; >>> #undef PLATFORM_NAME >>> >>>-- >>>1.9.1 >>> >>>_______________________________________________ >>>Intel-gfx mailing list >>>Intel-gfx@lists.freedesktop.org >>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > >-- >Rodrigo Vivi >Blog: http://blog.vivi.eng.br
On Thu, 2017-06-01 at 23:14 +0000, Srivatsa, Anusha wrote: > > >-----Original Message----- > >From: Rodrigo Vivi [mailto:rodrigo.vivi@gmail.com] > >Sent: Thursday, June 1, 2017 3:48 PM > >To: Srivatsa, Anusha <anusha.srivatsa@intel.com> > >Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; intel-gfx@lists.freedesktop.org > >Subject: Re: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake > >platform definition. > > > >On Thu, Jun 1, 2017 at 3:27 PM, Srivatsa, Anusha <anusha.srivatsa@intel.com> > >wrote: > >> > >> > >>>-----Original Message----- > >>>From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On > >>>Behalf Of Rodrigo Vivi > >>>Sent: Tuesday, May 30, 2017 3:43 PM > >>>To: intel-gfx@lists.freedesktop.org > >>>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> > >>>Subject: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake > >>>platform definition. > >>> > >>>Coffee Lake is a Intel® Processor containing Intel® HD Graphics > >>>following Kabylake. > >>> > >>>It is Gen9 graphics based platform on top of CNP PCH. > >>> > >>>Let's start by adding the platform definition based on previous > >>>platforms but yet as preliminary_hw_support. > >>> > >>>On following patches we will start adding PCI IDs and the platform > >>>specific changes. > >>> > >>>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > >>>--- > >>> drivers/gpu/drm/i915/i915_drv.h | 2 ++ > >>> drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ > >>> drivers/gpu/drm/i915/intel_device_info.c | 1 + > >>> 3 files changed, 11 insertions(+) > >>> > >>>diff --git a/drivers/gpu/drm/i915/i915_drv.h > >>>b/drivers/gpu/drm/i915/i915_drv.h index c31c0cf..2f20e87 100644 > >>>--- a/drivers/gpu/drm/i915/i915_drv.h > >>>+++ b/drivers/gpu/drm/i915/i915_drv.h > >>>@@ -826,6 +826,7 @@ enum intel_platform { > >>> INTEL_BROXTON, > >>> INTEL_KABYLAKE, > >>> INTEL_GEMINILAKE, > >>>+ INTEL_COFFEELAKE, > >>> INTEL_MAX_PLATFORMS > >>> }; > >>> > >>>@@ -2768,6 +2769,7 @@ static inline struct scatterlist > >>>*__sg_next(struct scatterlist *sg) #define IS_BROXTON(dev_priv) > >>>((dev_priv)->info.platform == INTEL_BROXTON) #define > >>>IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) > >>> #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == > >>>INTEL_GEMINILAKE) > >>>+#define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == > >>>INTEL_COFFEELAKE) > >>> #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) diff --git a/drivers/gpu/drm/i915/i915_pci.c > >>>b/drivers/gpu/drm/i915/i915_pci.c index cf43dc1..31ea988 100644 > >>>--- a/drivers/gpu/drm/i915/i915_pci.c > >>>+++ b/drivers/gpu/drm/i915/i915_pci.c > >>>@@ -425,6 +425,14 @@ > >>> .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | > >>>BSD2_RING, }; > >>> > >>>+static const struct intel_device_info intel_coffeelake_info = { > >>>+ BDW_FEATURES, > >>>+ .is_alpha_support = 1, > >>>+ .platform = INTEL_COFFEELAKE, > >>>+ .gen = 9, > >>>+ .ddb_size = 896, > >>>+}; > >> > >> Rodrigo, what about properties like has_guc, has_csr, color etc? > > > >I believe "has_guc" should be part of the GuC patch that you are about to send ;) > > > >as "has_csr" is part of "[PATCH 13/13] drm/i915/cfl: Coffe Lake reuses Kabylake > >DMC." > > > >while "color" one is not needed, as it was not in Kabylake and Skylake. > > Oh.... I actually sent GuC patch some weeks back without adding has_guc, Should I change that patch and resend or will adding has_guc in this patch make more sense? Well, you will have to resend here to this mailing list anyways after all these CFL patches gets merged. So I believe the right place for that is change that patch. and count on me for revieweing that ;) > > Anusha > >> > >> BR > >> Anusha > >>> /* > >>> * Make sure any device matches here are from most specific to most > >>> * general. For example, since the Quanta match is based on the > >>>subsystem diff - -git a/drivers/gpu/drm/i915/intel_device_info.c > >>>b/drivers/gpu/drm/i915/intel_device_info.c > >>>index 3718341..acc746f 100644 > >>>--- a/drivers/gpu/drm/i915/intel_device_info.c > >>>+++ b/drivers/gpu/drm/i915/intel_device_info.c > >>>@@ -51,6 +51,7 @@ > >>> PLATFORM_NAME(BROXTON), > >>> PLATFORM_NAME(KABYLAKE), > >>> PLATFORM_NAME(GEMINILAKE), > >>>+ PLATFORM_NAME(COFFEELAKE), > >>> }; > >>> #undef PLATFORM_NAME > >>> > >>>-- > >>>1.9.1 > >>> > >>>_______________________________________________ > >>>Intel-gfx mailing list > >>>Intel-gfx@lists.freedesktop.org > >>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx > >> _______________________________________________ > >> Intel-gfx mailing list > >> Intel-gfx@lists.freedesktop.org > >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > > > > >-- > >Rodrigo Vivi > >Blog: http://blog.vivi.eng.br
>-----Original Message----- >From: Vivi, Rodrigo >Sent: Thursday, June 1, 2017 4:20 PM >To: Srivatsa, Anusha <anusha.srivatsa@intel.com> >Cc: intel-gfx@lists.freedesktop.org; rodrigo.vivi@gmail.com >Subject: Re: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee Lake >platform definition. > >On Thu, 2017-06-01 at 23:14 +0000, Srivatsa, Anusha wrote: >> >> >-----Original Message----- >> >From: Rodrigo Vivi [mailto:rodrigo.vivi@gmail.com] >> >Sent: Thursday, June 1, 2017 3:48 PM >> >To: Srivatsa, Anusha <anusha.srivatsa@intel.com> >> >Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>; >> >intel-gfx@lists.freedesktop.org >> >Subject: Re: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee >> >Lake platform definition. >> > >> >On Thu, Jun 1, 2017 at 3:27 PM, Srivatsa, Anusha >> ><anusha.srivatsa@intel.com> >> >wrote: >> >> >> >> >> >>>-----Original Message----- >> >>>From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On >> >>>Behalf Of Rodrigo Vivi >> >>>Sent: Tuesday, May 30, 2017 3:43 PM >> >>>To: intel-gfx@lists.freedesktop.org >> >>>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com> >> >>>Subject: [Intel-gfx] [PATCH 07/13] drm/i915/cfl: Introduce Coffee >> >>>Lake platform definition. >> >>> >> >>>Coffee Lake is a Intel® Processor containing Intel® HD Graphics >> >>>following Kabylake. >> >>> >> >>>It is Gen9 graphics based platform on top of CNP PCH. >> >>> >> >>>Let's start by adding the platform definition based on previous >> >>>platforms but yet as preliminary_hw_support. >> >>> >> >>>On following patches we will start adding PCI IDs and the platform >> >>>specific changes. >> >>> >> >>>Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >> >>> drivers/gpu/drm/i915/i915_drv.h | 2 ++ >> >>> drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ >> >>> drivers/gpu/drm/i915/intel_device_info.c | 1 + >> >>> 3 files changed, 11 insertions(+) >> >>> >> >>>diff --git a/drivers/gpu/drm/i915/i915_drv.h >> >>>b/drivers/gpu/drm/i915/i915_drv.h index c31c0cf..2f20e87 100644 >> >>>--- a/drivers/gpu/drm/i915/i915_drv.h >> >>>+++ b/drivers/gpu/drm/i915/i915_drv.h >> >>>@@ -826,6 +826,7 @@ enum intel_platform { >> >>> INTEL_BROXTON, >> >>> INTEL_KABYLAKE, >> >>> INTEL_GEMINILAKE, >> >>>+ INTEL_COFFEELAKE, >> >>> INTEL_MAX_PLATFORMS >> >>> }; >> >>> >> >>>@@ -2768,6 +2769,7 @@ static inline struct scatterlist >> >>>*__sg_next(struct scatterlist *sg) #define IS_BROXTON(dev_priv) >> >>>((dev_priv)->info.platform == INTEL_BROXTON) #define >> >>>IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) >> >>> #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == >> >>>INTEL_GEMINILAKE) >> >>>+#define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == >> >>>INTEL_COFFEELAKE) >> >>> #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) diff --git a/drivers/gpu/drm/i915/i915_pci.c >> >>>b/drivers/gpu/drm/i915/i915_pci.c index cf43dc1..31ea988 100644 >> >>>--- a/drivers/gpu/drm/i915/i915_pci.c >> >>>+++ b/drivers/gpu/drm/i915/i915_pci.c >> >>>@@ -425,6 +425,14 @@ >> >>> .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING >> >>>| BSD2_RING, }; >> >>> >> >>>+static const struct intel_device_info intel_coffeelake_info = { >> >>>+ BDW_FEATURES, >> >>>+ .is_alpha_support = 1, >> >>>+ .platform = INTEL_COFFEELAKE, >> >>>+ .gen = 9, >> >>>+ .ddb_size = 896, >> >>>+}; >> >> >> >> Rodrigo, what about properties like has_guc, has_csr, color etc? >> > >> >I believe "has_guc" should be part of the GuC patch that you are >> >about to send ;) >> > >> >as "has_csr" is part of "[PATCH 13/13] drm/i915/cfl: Coffe Lake >> >reuses Kabylake DMC." >> > >> >while "color" one is not needed, as it was not in Kabylake and Skylake. >> >> Oh.... I actually sent GuC patch some weeks back without adding has_guc, >Should I change that patch and resend or will adding has_guc in this patch make >more sense? > >Well, you will have to resend here to this mailing list anyways after all these CFL >patches gets merged. So I believe the right place for that is change that patch. > >and count on me for revieweing that ;) Got it. Thanks :) Anusha >> >> Anusha >> >> >> >> BR >> >> Anusha >> >>> /* >> >>> * Make sure any device matches here are from most specific to >> >>>most >> >>> * general. For example, since the Quanta match is based on the >> >>>subsystem diff - -git a/drivers/gpu/drm/i915/intel_device_info.c >> >>>b/drivers/gpu/drm/i915/intel_device_info.c >> >>>index 3718341..acc746f 100644 >> >>>--- a/drivers/gpu/drm/i915/intel_device_info.c >> >>>+++ b/drivers/gpu/drm/i915/intel_device_info.c >> >>>@@ -51,6 +51,7 @@ >> >>> PLATFORM_NAME(BROXTON), >> >>> PLATFORM_NAME(KABYLAKE), >> >>> PLATFORM_NAME(GEMINILAKE), >> >>>+ PLATFORM_NAME(COFFEELAKE), >> >>> }; >> >>> #undef PLATFORM_NAME >> >>> >> >>>-- >> >>>1.9.1 >> >>> >> >>>_______________________________________________ >> >>>Intel-gfx mailing list >> >>>Intel-gfx@lists.freedesktop.org >> >>>https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> >> _______________________________________________ >> >> Intel-gfx mailing list >> >> Intel-gfx@lists.freedesktop.org >> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> > >> > >> > >> >-- >> >Rodrigo Vivi >> >Blog: http://blog.vivi.eng.br
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index c31c0cf..2f20e87 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -826,6 +826,7 @@ enum intel_platform { INTEL_BROXTON, INTEL_KABYLAKE, INTEL_GEMINILAKE, + INTEL_COFFEELAKE, INTEL_MAX_PLATFORMS }; @@ -2768,6 +2769,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) #define IS_BROXTON(dev_priv) ((dev_priv)->info.platform == INTEL_BROXTON) #define IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == INTEL_GEMINILAKE) +#define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == INTEL_COFFEELAKE) #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) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index cf43dc1..31ea988 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -425,6 +425,14 @@ .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, }; +static const struct intel_device_info intel_coffeelake_info = { + BDW_FEATURES, + .is_alpha_support = 1, + .platform = INTEL_COFFEELAKE, + .gen = 9, + .ddb_size = 896, +}; + /* * Make sure any device matches here are from most specific to most * general. For example, since the Quanta match is based on the subsystem diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 3718341..acc746f 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -51,6 +51,7 @@ PLATFORM_NAME(BROXTON), PLATFORM_NAME(KABYLAKE), PLATFORM_NAME(GEMINILAKE), + PLATFORM_NAME(COFFEELAKE), }; #undef PLATFORM_NAME
Coffee Lake is a Intel® Processor containing Intel® HD Graphics following Kabylake. It is Gen9 graphics based platform on top of CNP PCH. Let's start by adding the platform definition based on previous platforms but yet as preliminary_hw_support. On following patches we will start adding PCI IDs and the platform specific changes. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 8 ++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + 3 files changed, 11 insertions(+)