diff mbox

[2/3] drm/i915/skl: Declare that GT3 has a second VCS

Message ID 1422540820-10954-2-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Jan. 29, 2015, 2:13 p.m. UTC 
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

Comments

Rodrigo Vivi Feb. 4, 2015, 1:55 a.m. UTC | #1 
On Thu, Jan 29, 2015 at 6:13 AM, Damien Lespiau
<damien.lespiau@intel.com> wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 6484229..9fdaf64 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -356,7 +356,7 @@ static const struct intel_device_info intel_cherryview_info = {
>         CURSOR_OFFSETS,
>  };
>
> -static const struct intel_device_info intel_skylake_info = {
> +static const struct intel_device_info intel_skylake_gt12_info = {

didn't like much gt12 because i can be confusing with 12 1, 2, 1.2 1.5...

>         .is_preliminary = 1,
>         .is_skylake = 1,
>         .gen = 9, .num_pipes = 3,
> @@ -369,6 +369,19 @@ static const struct intel_device_info intel_skylake_info = {
>         IVB_CURSOR_OFFSETS,
>  };
>
> +static const struct intel_device_info intel_skylake_gt3_info = {
> +       .is_preliminary = 1,
> +       .is_skylake = 1,
> +       .gen = 9, .num_pipes = 3,
> +       .need_gfx_hws = 1, .has_hotplug = 1,
> +       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> +       .has_llc = 1,
> +       .has_ddi = 1,
> +       .has_fbc = 1,
> +       GEN_DEFAULT_PIPEOFFSETS,
> +       IVB_CURSOR_OFFSETS,
> +};
> +
>  /*
>   * Make sure any device matches here are from most specific to most
>   * general.  For example, since the Quanta match is based on the subsystem
> @@ -406,7 +419,9 @@ static const struct intel_device_info intel_skylake_info = {
>         INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \
>         INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
>         INTEL_CHV_IDS(&intel_cherryview_info),  \
> -       INTEL_SKL_IDS(&intel_skylake_info)
> +       INTEL_SKL_GT1_IDS(&intel_skylake_gt12_info),    \
> +       INTEL_SKL_GT2_IDS(&intel_skylake_gt12_info),    \
> +       INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info)      \
>
>  static const struct pci_device_id pciidlist[] = {              /* aka */
>         INTEL_PCI_IDS,
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

But anyway patch is right!

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Daniel Vetter Feb. 4, 2015, 9:27 a.m. UTC | #2 
On Tue, Feb 03, 2015 at 05:55:05PM -0800, Rodrigo Vivi wrote:
> On Thu, Jan 29, 2015 at 6:13 AM, Damien Lespiau
> <damien.lespiau@intel.com> wrote:
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c | 19 +++++++++++++++++--
> >  1 file changed, 17 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index 6484229..9fdaf64 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -356,7 +356,7 @@ static const struct intel_device_info intel_cherryview_info = {
> >         CURSOR_OFFSETS,
> >  };
> >
> > -static const struct intel_device_info intel_skylake_info = {
> > +static const struct intel_device_info intel_skylake_gt12_info = {
> 
> didn't like much gt12 because i can be confusing with 12 1, 2, 1.2 1.5...

Yeah, at first I've thought this would be for some gt2 with stuff fused
off ... Imo just leave out the 12 and call it skylake_gt_info or so.
-Daniel

> 
> >         .is_preliminary = 1,
> >         .is_skylake = 1,
> >         .gen = 9, .num_pipes = 3,
> > @@ -369,6 +369,19 @@ static const struct intel_device_info intel_skylake_info = {
> >         IVB_CURSOR_OFFSETS,
> >  };
> >
> > +static const struct intel_device_info intel_skylake_gt3_info = {
> > +       .is_preliminary = 1,
> > +       .is_skylake = 1,
> > +       .gen = 9, .num_pipes = 3,
> > +       .need_gfx_hws = 1, .has_hotplug = 1,
> > +       .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
> > +       .has_llc = 1,
> > +       .has_ddi = 1,
> > +       .has_fbc = 1,
> > +       GEN_DEFAULT_PIPEOFFSETS,
> > +       IVB_CURSOR_OFFSETS,
> > +};
> > +
> >  /*
> >   * Make sure any device matches here are from most specific to most
> >   * general.  For example, since the Quanta match is based on the subsystem
> > @@ -406,7 +419,9 @@ static const struct intel_device_info intel_skylake_info = {
> >         INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \
> >         INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
> >         INTEL_CHV_IDS(&intel_cherryview_info),  \
> > -       INTEL_SKL_IDS(&intel_skylake_info)
> > +       INTEL_SKL_GT1_IDS(&intel_skylake_gt12_info),    \
> > +       INTEL_SKL_GT2_IDS(&intel_skylake_gt12_info),    \
> > +       INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info)      \
> >
> >  static const struct pci_device_id pciidlist[] = {              /* aka */
> >         INTEL_PCI_IDS,
> > --
> > 1.8.3.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> But anyway patch is right!
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> -- 
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6484229..9fdaf64 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -356,7 +356,7 @@  static const struct intel_device_info intel_cherryview_info = {
 	CURSOR_OFFSETS,
 };
 
-static const struct intel_device_info intel_skylake_info = {
+static const struct intel_device_info intel_skylake_gt12_info = {
 	.is_preliminary = 1,
 	.is_skylake = 1,
 	.gen = 9, .num_pipes = 3,
@@ -369,6 +369,19 @@  static const struct intel_device_info intel_skylake_info = {
 	IVB_CURSOR_OFFSETS,
 };
 
+static const struct intel_device_info intel_skylake_gt3_info = {
+	.is_preliminary = 1,
+	.is_skylake = 1,
+	.gen = 9, .num_pipes = 3,
+	.need_gfx_hws = 1, .has_hotplug = 1,
+	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
+	.has_llc = 1,
+	.has_ddi = 1,
+	.has_fbc = 1,
+	GEN_DEFAULT_PIPEOFFSETS,
+	IVB_CURSOR_OFFSETS,
+};
+
 /*
  * Make sure any device matches here are from most specific to most
  * general.  For example, since the Quanta match is based on the subsystem
@@ -406,7 +419,9 @@  static const struct intel_device_info intel_skylake_info = {
 	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),	\
 	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \
 	INTEL_CHV_IDS(&intel_cherryview_info),	\
-	INTEL_SKL_IDS(&intel_skylake_info)
+	INTEL_SKL_GT1_IDS(&intel_skylake_gt12_info),	\
+	INTEL_SKL_GT2_IDS(&intel_skylake_gt12_info),	\
+	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info)	\
 
 static const struct pci_device_id pciidlist[] = {		/* aka */
 	INTEL_PCI_IDS,