diff mbox

[3/3] drm/i915/skl: Remove the check enforcing VCS2 to be gen8 only

Message ID 1422540820-10954-3-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/intel_ringbuffer.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Comments

Shuang He Jan. 31, 2015, 5:17 p.m. UTC | #1 
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 5682
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                                  353/353              353/353
ILK                                  353/353              353/353
SNB                                  400/422              400/422
IVB              +1-2              485/487              484/487
BYT                                  296/296              296/296
HSW              +1-1              507/508              507/508
BDW                 -2              401/402              399/402
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*IVB  igt_gem_evict_everything_minor-normal      PASS(2, M34)      DMESG_WARN(1, M34)
 IVB  igt_gem_storedw_batches_loop_normal      DMESG_WARN(5, M34M4)PASS(15, M34M4M21)      PASS(1, M34)
 IVB  igt_gem_storedw_batches_loop_secure-dispatch      DMESG_WARN(1, M34)PASS(6, M34M4)      DMESG_WARN(1, M34)
 HSW  igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance      DMESG_WARN(1, M40)PASS(18, M40M20)      PASS(1, M20)
 HSW  igt_gem_storedw_loop_vebox      DMESG_WARN(2, M20)PASS(3, M40M20)      DMESG_WARN(1, M20)
 BDW  igt_gem_pwrite_pread_display-pwrite-blt-gtt_mmap-performance      DMESG_WARN(4, M28)PASS(2, M30)      DMESG_WARN(1, M28)
*BDW  igt_gem_pwrite_pread_uncached-pwrite-blt-gtt_mmap-performance      PASS(6, M30M28)      DMESG_WARN(1, M28)
Note: You need to pay more attention to line start with '*'
Rodrigo Vivi Feb. 4, 2015, 1:55 a.m. UTC | #2 
Good catch!

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

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/intel_ringbuffer.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index d393026..bbe439d 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -2630,19 +2630,13 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
>  }
>
>  /**
> - * Initialize the second BSD ring for Broadwell GT3.
> - * It is noted that this only exists on Broadwell GT3.
> + * Initialize the second BSD ring (eg. Broadwell GT3, Skylake GT3)
>   */
>  int intel_init_bsd2_ring_buffer(struct drm_device *dev)
>  {
>         struct drm_i915_private *dev_priv = dev->dev_private;
>         struct intel_engine_cs *ring = &dev_priv->ring[VCS2];
>
> -       if ((INTEL_INFO(dev)->gen != 8)) {
> -               DRM_ERROR("No dual-BSD ring on non-BDW machine\n");
> -               return -EINVAL;
> -       }
> -
>         ring->name = "bsd2 ring";
>         ring->id = VCS2;
>
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter Feb. 4, 2015, 9:28 a.m. UTC | #3 
On Tue, Feb 03, 2015 at 05:55:46PM -0800, Rodrigo Vivi wrote:
> Good catch!
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> On Thu, Jan 29, 2015 at 6:13 AM, Damien Lespiau
> <damien.lespiau@intel.com> wrote:

Tiny commit messages! I've added a short blurb explaining that we track
this in intel_info already.

> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Queued for -next, thanks for the patch.
-Daniel

> > ---
> >  drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +-------
> >  1 file changed, 1 insertion(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > index d393026..bbe439d 100644
> > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > @@ -2630,19 +2630,13 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev)
> >  }
> >
> >  /**
> > - * Initialize the second BSD ring for Broadwell GT3.
> > - * It is noted that this only exists on Broadwell GT3.
> > + * Initialize the second BSD ring (eg. Broadwell GT3, Skylake GT3)
> >   */
> >  int intel_init_bsd2_ring_buffer(struct drm_device *dev)
> >  {
> >         struct drm_i915_private *dev_priv = dev->dev_private;
> >         struct intel_engine_cs *ring = &dev_priv->ring[VCS2];
> >
> > -       if ((INTEL_INFO(dev)->gen != 8)) {
> > -               DRM_ERROR("No dual-BSD ring on non-BDW machine\n");
> > -               return -EINVAL;
> > -       }
> > -
> >         ring->name = "bsd2 ring";
> >         ring->id = VCS2;
> >
> > --
> > 1.8.3.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> 
> 
> -- 
> 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/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index d393026..bbe439d 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2630,19 +2630,13 @@  int intel_init_bsd_ring_buffer(struct drm_device *dev)
 }
 
 /**
- * Initialize the second BSD ring for Broadwell GT3.
- * It is noted that this only exists on Broadwell GT3.
+ * Initialize the second BSD ring (eg. Broadwell GT3, Skylake GT3)
  */
 int intel_init_bsd2_ring_buffer(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_engine_cs *ring = &dev_priv->ring[VCS2];
 
-	if ((INTEL_INFO(dev)->gen != 8)) {
-		DRM_ERROR("No dual-BSD ring on non-BDW machine\n");
-		return -EINVAL;
-	}
-
 	ring->name = "bsd2 ring";
 	ring->id = VCS2;