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: 161828 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp18552jan; Thu, 4 Apr 2019 22:28:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxSN//mY/1fTAB2TpzMriYhEhtlZsvQW5nE7R/g15a1hPt5MMSjDMO5bsBxX8uVWjbQFCNr X-Received: by 2002:a63:c746:: with SMTP id v6mr9776832pgg.401.1554442126314; Thu, 04 Apr 2019 22:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554442126; cv=none; d=google.com; s=arc-20160816; b=w5ZYwMeVZTHE96/10fwWPIx1noeHfvyuOyzhoToL0Uv5jLEzlp2BHndGDvlb3Dze/y F/rwreB6xvcUq6IByWHTUj9SvDfV4sLoFO5LSt1MTnFjSAlOVTHW5qAzIEqM5yswwiR8 dfdXTgqjunT8GMiRtp8JqqRVInp3LUixYtkaa+4Ww1dZkowiBc9OXQEyYQu8Xn7K2GSE fvdrHjCH6sfJo71+0ch+IsJbgEt64Jjf73e0ZRA6sA7zjQofhnVNKx70rEV21wgbh2z8 JVCB+UghSOVh9j+Q44epXvU55Zgdh5SwzzXmoebMDvKsQ/xwbT6Lz1VeDkI3NgQ9qBC2 uCaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=zchHbNz8lHdJ6OEQMswXJhbCfkLe2cHZtOEMULZMXVc=; b=CTMqk3xk3U4khnOXqDID2saDsmP5jGj9+elyPWQ9LwtZzIJi1K0urKfP2MW1BpiVou 6tWwYvBKqJdTh6itsttdNvDmRT1QZotmohM3iGBJneFVbAvWBVRR+leYADl//J7i7S3j 7jgn1y7tNabYynBOCFncXkk4sora/RsNS33Uw0oHjyMZ7fRDCcp/spaztYdy9GxD39Ri KbCIyojLOUVxe2dviSVRQNdU5Mwe9LaMWwHp/zF49WMiF4mTAN6vUZvRDTbPc0MuIBZ0 fLBjCXBjvB9UQa/vn+qL3l5/6lJEj3c/+oyCnW1xCqZ3KLvB38xntEW4uE8kmJ93RCc+ V/KQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id z8si18073829pgc.79.2019.04.04.22.28.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2019 22:28:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 C13CB6EA39; Fri, 5 Apr 2019 05:28:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93ED86EA39 for ; Fri, 5 Apr 2019 05:28:42 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id g8so2449442pgf.2 for ; Thu, 04 Apr 2019 22:28:42 -0700 (PDT) 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=MF27LZEoIDb83gA+PreBj2QO9nzU/LIBpCOXXrH06FXCQH6iz3SAePzoUwoOYuFdAN sT2P97pkdaADCYzhcjeDHoaKbpaJNi4MgS25/+wJMDfu7sBSVK8vaBmHCNf4Ykb4fbdw Q14llS2gai3gnMQWRz5YN5KTT3AY8nfJ/1Y6JdTRlG9sYgs32hc/1Fi5fXxxV6zZ83rq CQavuDwTcpP4HeJqOyIDQ0PYCnCxeNygEQ+1/TdtD7OvFpnxrqqGXYtp4KsAT4/ufUIv Lprt8/Z5FQc6wbFwWVaRXWDbqIejwkEjg4E+6WjFnFj48+YmDoy4bgSK3TXpmBm4GuSt NoBw== X-Gm-Message-State: APjAAAWHYPE1YN2VHvrs583m2UOjH09j0Yasbw6Snr4+B8C8+AO5xqgB LGAY361lfRmZSFgit2x4o6A= 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-Mailman-Original-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-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: Stephen Rothwell , kernel test robot , Andrew Jeffery , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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