From patchwork Fri Oct 12 19:24:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 1589431 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id D2F6F3FCFC for ; Sun, 14 Oct 2012 09:44:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EE7D9ED82 for ; Sun, 14 Oct 2012 02:44:29 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F9599E752 for ; Fri, 12 Oct 2012 12:25:08 -0700 (PDT) Received: by mail-la0-f49.google.com with SMTP id z14so2170227lag.36 for ; Fri, 12 Oct 2012 12:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=3gTa6OPsXPBw9oViaKDkB35YMRD7oY/X/1nhhttN8sA=; b=F8k0SSlVm07oHgEXUiqi0QvbKtoR1q71vfoNeSlekMaDykf1WVnQIilmNQQsBSVrSg Zj2O2ZpNOsu6b5r0JheXhvdwGCFnOOwteL13ensW5YHLIDYByWZhA9PsAuel5JOXNX5L zTAEVQs/cb7sd60YKVlt2zxdfWoivEN1ZhrFwRPLTFFaLQUF1ly9khpbzetTBu+mKuTo Fh85H+sFEWrpTumGL8SuwwPj3pj0sLmGn5dLFMSv8k1DdCnZlYVKNAuT/fd1PmR2F123 aqcyqIDCmbClkxCeFD/IS7973ZO7soeiUG34pFNFiuNUeF/CP/GIh0ItNBBcSzsqfQeH NIfg== Received: by 10.112.17.40 with SMTP id l8mr1996739lbd.58.1350069907094; Fri, 12 Oct 2012 12:25:07 -0700 (PDT) Received: from grizzly.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id sy1sm2423382lab.16.2012.10.12.12.25.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 12:25:04 -0700 (PDT) From: Max Filippov To: dri-devel@lists.freedesktop.org Subject: [PATCH] nuoveau: only call ttm_agp_tt_create when __OS_HAS_AGP Date: Fri, 12 Oct 2012 23:24:55 +0400 Message-Id: <1350069895-12403-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 X-Mailman-Approved-At: Sun, 14 Oct 2012 02:44:11 -0700 Cc: Ben Skeggs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org ttm_agp_tt_create is itself defined under CONFIG_AGP, so there's no point calling it otherwise. Signed-off-by: Max Filippov --- This fixes allmodconfig build failure for xtensa: http://kisskb.ellerman.id.au/kisskb/buildresult/7346547/ drivers/gpu/drm/nouveau/nouveau_bo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 259e5f1..35ac57f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -456,6 +456,7 @@ static struct ttm_tt * nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size, uint32_t page_flags, struct page *dummy_read) { +#if __OS_HAS_AGP struct nouveau_drm *drm = nouveau_bdev(bdev); struct drm_device *dev = drm->dev; @@ -463,6 +464,7 @@ nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size, return ttm_agp_tt_create(bdev, dev->agp->bridge, size, page_flags, dummy_read); } +#endif return nouveau_sgdma_create_ttm(bdev, size, page_flags, dummy_read); }