From patchwork Fri Apr 5 08:11:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 10886991 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 C017A1390 for ; Fri, 5 Apr 2019 08:11:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA72B28AFB for ; Fri, 5 Apr 2019 08:11:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9960928AFF; Fri, 5 Apr 2019 08:11:33 +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,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 97B3E28AFB for ; Fri, 5 Apr 2019 08:11:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 083CA6EA50; Fri, 5 Apr 2019 08:11:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 698A66EA50 for ; Fri, 5 Apr 2019 08:11:30 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id e24so2839389pfi.12 for ; Fri, 05 Apr 2019 01:11:30 -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=sEA6p5JevwHNXaBrdUMxSWF58a6asPN8krCKpHrLb0c=; b=hXlIKpD0VszHBPoJfm7S+ayd7xuh2ZvRXbQJdmDH5OjvSPmxt7PoJj/SoCe0L2m3qv mQpzz2h5ZHz2cDkkAoZcgsZ4R+gCcvmC7W7ohi8WfuqhFTPJD2477/oxrFqJxFKOYKEP 1CN2qsI+dQl97ZQAKzDO/Xm9jDilAlLBanj+H4gpXrm6fBbgSbQACbcyy9uAPnE47CuH 06ETHy/dnmrzGNXja4EdTyoZRImUJLSDe6xiEmuKqJuJS+g/+BeQUmq+Vre6CKkSj0I/ QccmVMwU3HpmMLuvB76Xesntb/skZQtjL/omGUnUz4rAteSnLGQYTBaohMcJzEcjinhg 0CSA== X-Gm-Message-State: APjAAAU9QqTJvW2GCyayLJhl2Q6x4Xf8qGanZdFnhri/1ujRybiUYSJ4 kbdiawN+VFUkTlTMojo1CEk= X-Google-Smtp-Source: APXvYqzv1g6cLhtiDeerYEh7TUahcMOk+J7i6/lfgwKZ8QWWcg2vnnwhBjs+6GFgAF982jt6tHQQDQ== X-Received: by 2002:a65:47c6:: with SMTP id f6mr10535790pgs.173.1554451889641; Fri, 05 Apr 2019 01:11:29 -0700 (PDT) Received: from voyager.jms.id.au ([45.124.203.18]) by smtp.gmail.com with ESMTPSA id u5sm17188985pfm.121.2019.04.05.01.11.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2019 01:11:28 -0700 (PDT) Received: by voyager.jms.id.au (sSMTP sendmail emulation); Fri, 05 Apr 2019 18:41:18 +1030 From: Joel Stanley To: David Airlie , Daniel Vetter Subject: [PATCH v2] drm: aspeed: Clean up Kconfig options Date: Fri, 5 Apr 2019 18:41:17 +1030 Message-Id: <20190405081117.27339-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=sEA6p5JevwHNXaBrdUMxSWF58a6asPN8krCKpHrLb0c=; b=r+3kTvoYzn0O1if9OqvGksQTGdf8qEqBr8lXNxyqOnNmn3f+3zq8APRfdAi4uO5GQy TbIOvA9ZZB+eOT5KQaLK+Y1j27fTPApHiQP7brYNgoJ2tSb36ZnN54EawjRxOAXm8WE5 fuH1Fhfiyz4KmxDa1Jyix+juNMJP5DqVv5Iwe6QlFyU8GTVX/e1CbsG0ZSooQzZXZOzs YurlxeNLDdsCm6G+0RUhMQDNyB7e1GHA8Ceo/NOj+cE2dFHuqbQdtkD2OBl1vDlSDVWt JUOmTH7xPHRk9PID0UdS1xBu0sIYvaJ0G9reQTbi3H+vIj/pwC8gll/Ht7cKEhopDL7h 16Tg== 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, =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The GFX IP is inside of the ASPEED BMC SoC so there is little use enabling it on a kernel that does not support ASPEED. When building with COMPILE_TEST the architecture many not have CMA support, so to avoid breaking the build we only select these options if the architecture supports the contiguous allocator. I suspect the DRM_PANEL came from a cut/paste error. Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver") Reported-by: Stephen Rothwell Reported-by: kernel test robot Signed-off-by: Joel Stanley Acked-by: Daniel Vetter Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
--- This fixes the powerpc next-20190405 build. Sorry Stephen! v2: Clean up as well as fix the build v1: https://lore.kernel.org/lkml/20190405052830.27899-1-joel@jms.id.au/ drivers/gpu/drm/aspeed/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig index 42b74d18a41b..cccab520e02f 100644 --- a/drivers/gpu/drm/aspeed/Kconfig +++ b/drivers/gpu/drm/aspeed/Kconfig @@ -1,11 +1,11 @@ config DRM_ASPEED_GFX tristate "ASPEED BMC Display Controller" depends on DRM && OF + depends on (COMPILE_TEST || ARCH_ASPEED) 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