From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [RFC 07/44] drm/i915: Disable 'get seqno' workaround for VLV Date: Wed, 2 Jul 2014 10:51:23 -0700 Message-ID: <20140702105123.45815c7a@jbarnes-desktop> References: <1403803475-16337-1-git-send-email-John.C.Harrison@Intel.com> <1403803475-16337-8-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by gabe.freedesktop.org (Postfix) with ESMTP id E383C6E3F0 for ; Wed, 2 Jul 2014 10:50:38 -0700 (PDT) Received: by mail-pd0-f175.google.com with SMTP id v10so12267301pde.6 for ; Wed, 02 Jul 2014 10:50:38 -0700 (PDT) In-Reply-To: <1403803475-16337-8-git-send-email-John.C.Harrison@Intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: John.C.Harrison@Intel.com Cc: Intel-GFX@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, 26 Jun 2014 18:23:58 +0100 John.C.Harrison@Intel.com wrote: > From: John Harrison > > There is a workaround for a hardware bug when reading the seqno from the status > page. The bug does not exist on VLV however, the workaround was still being > applied. > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 279488a..bad5db0 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -1960,7 +1960,10 @@ int intel_init_render_ring_buffer(struct drm_device *dev) > ring->irq_put = gen6_ring_put_irq; > } > ring->irq_enable_mask = GT_RENDER_USER_INTERRUPT; > - ring->get_seqno = gen6_ring_get_seqno; > + if (IS_VALLEYVIEW(dev)) > + ring->get_seqno = ring_get_seqno; > + else > + ring->get_seqno = gen6_ring_get_seqno; > ring->set_seqno = ring_set_seqno; > ring->semaphore.sync_to = gen6_ring_sync; > ring->semaphore.signal = gen6_signal; Assuming this has been well tested: Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center