From patchwork Fri Aug 8 13:34:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 4696371 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A5DC19F373 for ; Fri, 8 Aug 2014 13:35:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4A3120179 for ; Fri, 8 Aug 2014 13:35:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C2B89200E3 for ; Fri, 8 Aug 2014 13:35:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AF206E093; Fri, 8 Aug 2014 06:35:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f49.google.com (mail-qa0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id A997D6E093 for ; Fri, 8 Aug 2014 06:34:59 -0700 (PDT) Received: by mail-qa0-f49.google.com with SMTP id dc16so5442625qab.22 for ; Fri, 08 Aug 2014 06:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=NdyTTnnbOIC1KR6r0ptqoIOX0D+6eyPxmc1lq41ewEw=; b=ydwAJNDD8MdJC4aUGxXiExtsvppFJG6AfoseFHxLE9kOFPtTjozFpkoR63R+LyoPEB zl1J65Fou+9K2IAdVwGncxtGbpa6NgZvXJf6RR4+b0qrGoV6VfqiTND7YbQeNGWVOEBx CGObdUXrvPWVkOt22IuX31D7ZJwZv0gTk8biMfQNlIDRFFAPL/+rvPx3n1KJ9IB8uqkL kcOGFeS0G3pCxeQU/tRdiB0qzhH0uxautw7yb8NYm15V6TZT3i5C31I/qBAEEfppdEVE H7ejDcF6FTchYoBvpl9hEUf6HCHOyBI0554dYQTkegtC8sCSCwqsO7TcktEgHXxdZ5Ts 05dw== MIME-Version: 1.0 X-Received: by 10.140.24.140 with SMTP id 12mr23891464qgr.11.1407504898948; Fri, 08 Aug 2014 06:34:58 -0700 (PDT) Received: by 10.140.103.71 with HTTP; Fri, 8 Aug 2014 06:34:58 -0700 (PDT) In-Reply-To: References: <1407397616-23934-1-git-send-email-michel@daenzer.net> <53E4383F.8040806@daenzer.net> <53E48DD2.6040505@vodafone.de> <53E48F55.2090103@daenzer.net> Date: Fri, 8 Aug 2014 09:34:58 -0400 Message-ID: Subject: Re: [PATCH] drm/radeon: Always flush VM again on < CIK From: Alex Deucher To: =?UTF-8?Q?Michel_D=C3=A4nzer?= Cc: Maling list - DRI developers X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Aug 8, 2014 at 9:31 AM, Alex Deucher wrote: > On Fri, Aug 8, 2014 at 4:50 AM, Michel Dänzer wrote: >> On 08.08.2014 17:44, Christian König wrote: >>>>>> On Thu, Aug 7, 2014 at 3:59 PM, Alex Deucher >>>>>> wrote: >>>>>>> We should be using PFP as much as possible. Does the attached >>>>>>> patch help? >>>> Unfortunately not. >>> >>> Maybe add a readback of the VM base addr pointer to make sure that the >>> write has really reached the SBRM? >> >> I'm not sure what exactly you're thinking of, but I'm happy to test any >> patches you guys come up with. :) >> > > Maybe some variant of this patch? Ignore that one. typo. Try this one instead. Alex diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index dbd9d81..565201d 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -5007,6 +5007,7 @@ static void si_vm_decode_fault(struct radeon_device *rdev, void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) { struct radeon_ring *ring = &rdev->ring[ridx]; + u32 reg; if (vm == NULL) return; @@ -5017,15 +5018,23 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) WRITE_DATA_DST_SEL(0))); if (vm->id < 8) { - radeon_ring_write(ring, - (VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (vm->id << 2)) >> 2); + reg = (VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (vm->id << 2)) >> 2; } else { - radeon_ring_write(ring, - (VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((vm->id - 8) << 2)) >> 2); + reg = (VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((vm->id - 8) << 2)) >> 2; } + radeon_ring_write(ring, reg); radeon_ring_write(ring, 0); radeon_ring_write(ring, vm->pd_gpu_addr >> 12); + /* wait for the address change to go through */ + radeon_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); + radeon_ring_write(ring, 3); /* == */ + radeon_ring_write(ring, reg); + radeon_ring_write(ring, 0); + radeon_ring_write(ring, vm->pd_gpu_addr >> 12); + radeon_ring_write(ring, 0x0fffffff); + radeon_ring_write(ring, 10); + /* flush hdp cache */ radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) | @@ -5034,6 +5043,14 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) radeon_ring_write(ring, 0); radeon_ring_write(ring, 0x1); + /* clear the response reg */ + radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); + radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) | + WRITE_DATA_DST_SEL(0))); + radeon_ring_write(ring, VM_INVALIDATE_RESPONSE >> 2); + radeon_ring_write(ring, 0); + radeon_ring_write(ring, 0); + /* bits 0-15 are the VM contexts0-15 */ radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3)); radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) | @@ -5042,6 +5059,15 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) radeon_ring_write(ring, 0); radeon_ring_write(ring, 1 << vm->id); + /* wait for the invalidate */ + radeon_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); + radeon_ring_write(ring, 3); /* == */ + radeon_ring_write(ring, VM_INVALIDATE_RESPONSE >> 2); + radeon_ring_write(ring, 0); + radeon_ring_write(ring, 1 << vm->id); + radeon_ring_write(ring, 1 << vm->id); + radeon_ring_write(ring, 10); + /* sync PFP to ME, otherwise we might get invalid PFP reads */ radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0)); radeon_ring_write(ring, 0x0);