From patchwork Fri Sep 27 13:46:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Yu X-Patchwork-Id: 11164547 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 346D813BD for ; Fri, 27 Sep 2019 13:47:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1BA01217D7 for ; Fri, 27 Sep 2019 13:47:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BA01217D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 612FE6E22A; Fri, 27 Sep 2019 13:47:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 50D836E22A; Fri, 27 Sep 2019 13:47:38 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id i14so3512993pgt.11; Fri, 27 Sep 2019 06:47:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LgNE1dnflbO76HHoSzXDBrhS2Qt9Qg9bvtNf3mYw86I=; b=T7ziUE+PJT5VUvLqZGsWjs3lO4uxbSNUK2mKCHZmiwn/sCnThHSWWjX18SiTFBGHmP o3ijkhfQFk9tcigoxLYwtaKjY4lmrECdcBsmgOVh6PyplbVuusekOziRjbWZcLP+lvFO Kj+au60oGdketna8jEvS8jQx/e7ohJExvQI4JJMcq0oTx97GCdFXrXsWy72J2KkoFold 7/Y3oCrNlmjaEAekEGcYAN8qC4YO9yZW2aAOXCDgr2QbpWV6chr1bkUQQJTfgzkVcpZ8 douYsMCwQky1ysw7kJCqWKAXiFIgImceAPwBmaC4mf3JHDhhU/JdJJQw8+blivu/V5w+ w0Fw== X-Gm-Message-State: APjAAAWcC45OCecNl0ciztzZkPr7GHmlNA6WPR1zSLN87x8V+3mCCvkr PBmMvvxq48vKPWOLxZPREKf4hWrql2Q= X-Google-Smtp-Source: APXvYqwwHWMqYdUtw+4kFiwkUrXCikUrN/LGx+TS3Ct/ckajj7Ptg+mbYAdCoEYMXsuyBiIPYg9j8w== X-Received: by 2002:a63:d846:: with SMTP id k6mr9407645pgj.378.1569592057691; Fri, 27 Sep 2019 06:47:37 -0700 (PDT) Received: from localhost.localdomain (ah.ptr230.ptrcloud.net. [153.122.161.8]) by smtp.gmail.com with ESMTPSA id q71sm5608860pjb.26.2019.09.27.06.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 06:47:37 -0700 (PDT) From: Qiang Yu To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 6/6] drm/lima: add __GFP_NOWARN flag to all dma_alloc_wc Date: Fri, 27 Sep 2019 21:46:16 +0800 Message-Id: <20190927134616.21899-7-yuq825@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927134616.21899-1-yuq825@gmail.com> References: <20190927134616.21899-1-yuq825@gmail.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LgNE1dnflbO76HHoSzXDBrhS2Qt9Qg9bvtNf3mYw86I=; b=kfUKqSjumKv76d0ksK5/sd/yt/R2KmEFkkY8xxAkhK/SFKJXRP2OWzDsoVTkoLjyTb 2w98lAs39X/2fmoIMZq4NDjoF7f7tmzBpS6WRE75MVvGR+W6K1ah67BCo7i2GsA9aXXP f8B+sKfs7pFz8ynl3AKoNPWSqfECftdX7vR59JM9RecVKZe2UIJtyZ6jcq97RWVMFkLm A4sih3O5DQsInPQ41yVqG+bfd0vFzKoGpWCKyi5o5Y74KdVTflVRJuoRvvMxsRshs0vy f5f/AgIBpgtDqw1t42WMjkZJVj1x2jHIZKzWq4GW4Bk3Rd1yIViAgXMLMXJmq788C0sJ D8Ow== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lima@lists.freedesktop.org, Maxime Ripard , David Airlie , Qiang Yu , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This prevent CMA printing dumy "PFNs busy" info which is caused by alloc fail re-try case. Signed-off-by: Qiang Yu --- drivers/gpu/drm/lima/lima_device.c | 2 +- drivers/gpu/drm/lima/lima_vm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c index d86b8d81a483..3d1a2b4d1005 100644 --- a/drivers/gpu/drm/lima/lima_device.c +++ b/drivers/gpu/drm/lima/lima_device.c @@ -313,7 +313,7 @@ int lima_device_init(struct lima_device *ldev) ldev->va_end = LIMA_VA_RESERVE_START; ldev->dlbu_cpu = dma_alloc_wc( ldev->dev, LIMA_PAGE_SIZE, - &ldev->dlbu_dma, GFP_KERNEL); + &ldev->dlbu_dma, GFP_KERNEL | __GFP_NOWARN); if (!ldev->dlbu_cpu) { err = -ENOMEM; goto err_out2; diff --git a/drivers/gpu/drm/lima/lima_vm.c b/drivers/gpu/drm/lima/lima_vm.c index 8e69c4540e8b..840e2350d872 100644 --- a/drivers/gpu/drm/lima/lima_vm.c +++ b/drivers/gpu/drm/lima/lima_vm.c @@ -56,7 +56,7 @@ static int lima_vm_map_page(struct lima_vm *vm, dma_addr_t pa, u32 va) vm->bts[pbe].cpu = dma_alloc_wc( vm->dev->dev, LIMA_PAGE_SIZE << LIMA_VM_NUM_PT_PER_BT_SHIFT, - &vm->bts[pbe].dma, GFP_KERNEL | __GFP_ZERO); + &vm->bts[pbe].dma, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO); if (!vm->bts[pbe].cpu) return -ENOMEM; @@ -208,7 +208,7 @@ struct lima_vm *lima_vm_create(struct lima_device *dev) kref_init(&vm->refcount); vm->pd.cpu = dma_alloc_wc(dev->dev, LIMA_PAGE_SIZE, &vm->pd.dma, - GFP_KERNEL | __GFP_ZERO); + GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO); if (!vm->pd.cpu) goto err_out0;