diff mbox

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

Message ID 1423056147-28109-1-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Feb. 4, 2015, 1:22 p.m. UTC
v2: leave intel_skylake_info alone (Rodrigo, Daniel)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Rodrigo Vivi Feb. 4, 2015, 3:43 p.m. UTC | #1
just reinforcing..

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Wed, Feb 4, 2015 at 5:22 AM, Damien Lespiau <damien.lespiau@intel.com> wrote:
> v2: leave intel_skylake_info alone (Rodrigo, Daniel)
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 8039cec..6f4f3c5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -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_info), \
> +       INTEL_SKL_GT2_IDS(&intel_skylake_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
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8039cec..6f4f3c5 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -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_info),	\
+	INTEL_SKL_GT2_IDS(&intel_skylake_info),	\
+	INTEL_SKL_GT3_IDS(&intel_skylake_gt3_info)	\
 
 static const struct pci_device_id pciidlist[] = {		/* aka */
 	INTEL_PCI_IDS,