From patchwork Fri Apr 5 05:28:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 10886893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A45213B5 for ; Fri, 5 Apr 2019 05:28:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F66328AF6 for ; Fri, 5 Apr 2019 05:28:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2326928AFC; Fri, 5 Apr 2019 05:28:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B211E28AF6 for ; Fri, 5 Apr 2019 05:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=UiVMaA6ssCkpoH2TWId2Du4eoAB+Mjhxy0nsw64LU8c=; b=uCghYMWLLWy7us 3GzjYFlfzClCnR71F+kGxLUl1PvJS4Ay+/awglBM3W5ma3iun6E9TnWndqc0LPtiujOCccyu3xoU1 jwvu2WyV6AwnE4HM2hMKOnIDC5z9Vijvz/DQr1WKUS1hji+FV+5GVi/UjCZ7Hf1evfJX+f9WYEMx+ Iei4b9fgRM3+omxhVUtISnCIzSZ/3xYFxkx0sVh2+PTMc8WXrpHSbdoPXOQYm2/ZIF5CQ/raEbF8O D7J6y2DetFwt3n5Shri3+CFd9d1Rfc6Go/mV9n5fbZdlrMdNVuFItROu03OMNsC9Q/FZ+PdTB/VZ1 sqOkoNcfLlpnNrO5Y1zQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hCHPC-0002a1-FP; Fri, 05 Apr 2019 05:28:46 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hCHP8-0002ZD-SS for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2019 05:28:44 +0000 Received: by mail-pf1-x442.google.com with SMTP id b3so2638661pfd.1 for ; Thu, 04 Apr 2019 22:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ieDXWkWNFHDytcYjlcIgrOi8QIjGI3S9JoWjSja3KxY=; b=nXk9R0ZrWj/m3Mo+/zYOiLANsBNEUYijgiQ4o1PbJlfwVj/2wOTtJlC5Jr1K4KHkl8 n6hxwJoGNG+aTTl+BmyG/Ea4HK+7Jr4DsIA/HJ2vjGMjQlTpd4WvK1R2CpM6F7eYY3dT B472QVro0UXRHnaeW/FGc9k1rlhVmUCqmpqZpJ7Xbx6omo/MWO94rlakJ3iXU+CzPPab BAMuPMIJEf1ndpAQ6796F8cuFsIxzv18HxZrg1dXeLRkmezw3RKGNbCIep87v6ZIG5YJ TcbTLuQXRg81+Gupr0/ubF8deQmjfF3W15H7D+6A1HxTI4J/qLxffeXgt7ekWUtWIepm RlwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=ieDXWkWNFHDytcYjlcIgrOi8QIjGI3S9JoWjSja3KxY=; b=cXbPyyIGFI5why5hXRz7jlJCanBv1M+XlHEdkgeFSMeri4Rv81Jobg4hI0FSQMjy6t naCJPQI7dylqVGFIfXPXUmAQUILU+NEleTwN700hZE5PxB2swdykbAZwKFWeh+dSsob5 owoYGnYbbWNYR9YMFRdDhqNoUVoGTYinUEAQaJCGhT++b6z4Um7oadl5OtRBepmBI6Ka gHAFvpAJ4gPP2CRMGos1D/WOUVRssXJFifFrAo7vHrTqLYWwKNjXpC3+TlmRtAJUWYjt xzBcrEyahtuJGY1ujrVyfyyOzpCQzI5NqiB1W9i+knME5oJSdnWj2T9vD9Wl2zMC2eIT xkTQ== X-Gm-Message-State: APjAAAXFKsSZFZ/urLiwBgUymKtjPp0aIEAZUlfb6mkVhkrR9WgbhEDN 8EIoEcPmugkGyjyqUI3dv/Q= X-Google-Smtp-Source: APXvYqzlpjxzD+9WhA2AVukFK50vWkuSUrcRumRv5V2BK+CLIJtSf+rzOyg3D80yR5jQSonwx4k12g== X-Received: by 2002:a63:243:: with SMTP id 64mr9969327pgc.214.1554442121880; Thu, 04 Apr 2019 22:28:41 -0700 (PDT) Received: from voyager.jms.id.au ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id n22sm24510348pfa.51.2019.04.04.22.28.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2019 22:28:40 -0700 (PDT) Received: by voyager.jms.id.au (sSMTP sendmail emulation); Fri, 05 Apr 2019 15:58:33 +1030 From: Joel Stanley To: David Airlie , Daniel Vetter Subject: [PATCH] drm: aspeed: Select CMA only if available Date: Fri, 5 Apr 2019 15:58:30 +1030 Message-Id: <20190405052830.27899-1-joel@jms.id.au> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190404_222842_922925_DD0DEADE X-CRM114-Status: GOOD ( 12.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , kernel test robot , Andrew Jeffery , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, =?utf-8?q?No?= =?utf-8?q?ralf_Tr=C3=B8nnes?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP When building this driver for architectures where CMA is not available. Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver") Reported-by: Stephen Rothwell Reported-by: kernel test robot Signed-off-by: Joel Stanley --- This fixes the build break. Another question is if we need to select this at all, as we have a reserved memory region to allocate from. I am not familiar with this area, so advice is welcome. drivers/gpu/drm/aspeed/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig index 42b74d18a41b..1775fb85ec74 100644 --- a/drivers/gpu/drm/aspeed/Kconfig +++ b/drivers/gpu/drm/aspeed/Kconfig @@ -4,8 +4,8 @@ config DRM_ASPEED_GFX select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER select DRM_PANEL - select DMA_CMA - select CMA + select DMA_CMA if HAVE_DMA_CONTIGUOUS + select CMA if HAVE_DMA_CONTIGUOUS select MFD_SYSCON help Chose this option if you have an ASPEED AST2500 SOC Display