From patchwork Tue Jan 26 18:49:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8126471 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 07A6BBEEE5 for ; Tue, 26 Jan 2016 18:50:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 354D82021A for ; Tue, 26 Jan 2016 18:50:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5A225201DD for ; Tue, 26 Jan 2016 18:50:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B38CF6E277; Tue, 26 Jan 2016 10:50:09 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CF4B6E269 for ; Tue, 26 Jan 2016 10:50:06 -0800 (PST) Received: by mail-wm0-f67.google.com with SMTP id 123so19035206wmz.2 for ; Tue, 26 Jan 2016 10:50:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ba991RGhEJAJkt57Y6rru3Qxrq09R/KqfUPmrAcgmRA=; b=CpCQ9K9hzlRG5gudbbbQ1yBJa9QAtilmky87mat/uI+NM3V2RQyRyD7VITOukA/S9e bBDea8y3p5VniO6svsWbfPfK+/GwjlBqTsyOUwrLBMtVC66qggw5M7GpTJnnbmu6gAUA NEM2NVjQmlv5SEE6xuh7gXdC407DgDs5MOVC8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ba991RGhEJAJkt57Y6rru3Qxrq09R/KqfUPmrAcgmRA=; b=TjcZfnx44MfB6B6CHGjeuiGusQtaFskhY9gdxSSRLR0/JCZgSG7hujqZm4vwn4iquA /aDU8YBcj1CopnghwfEWOoxRyRGd4kY6krVCprB1c7NLrer2yrOWbuF+joV6SWy7FOCU oEyo+/gMrjWMbHjQBx8SAaqCKvV5tKxzP6zLx91NkHc8iSS1qX6yeEtLo3F/drhuZ5nn YJ+hB8oHOakWwExZRk5sYUw/eyVXLzJ/r8eKW0W7sjzKraYjURAjwqbaj0a3NMlpiiO4 IAZxq4fHz/50LjyN8M/DwEdLvlLSlbi8JtISCgAjepYDM6JWtgCnXiB15iAGWEcQ/Nof Y5HA== X-Gm-Message-State: AG10YOSES8UmqQqMVbDA+gvP0rOx06oQBzLGo6f0XSuiQIxb+z1nktj2bnvygQwMsWZNdQ== X-Received: by 10.194.83.105 with SMTP id p9mr24260230wjy.179.1453834204621; Tue, 26 Jan 2016 10:50:04 -0800 (PST) Received: from hummel.ffwll.local ([2a02:168:56c9:0:226:2dff:fef1:5bff]) by smtp.gmail.com with ESMTPSA id x10sm2671023wjx.8.2016.01.26.10.50.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 10:50:03 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 26 Jan 2016 19:49:55 +0100 Message-Id: <1453834196-5741-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453834196-5741-1-git-send-email-daniel.vetter@ffwll.ch> References: <1453834196-5741-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH 2/3] drm/i915: Stop depending upon CONFIG_AGP/_INTEL X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need this to be able to paper over some CI fail: DMA API debuggin complaints that we leak the gmch scratch page, but fundamentally that's the only way to do it if there's both the intel-agp and i915 driver using it: intel-agp shadow-attaches, i915 binds for real to the gpu. But when i915 unloads we need to keep the dma-mapping for intel-agp around, and the dma debugging code doesn't approve of that. With this patch we can disable CONFIG_AGP_INTEL and avoid this troubel. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93769 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index fcd77b27514d..9aa7d2d98add 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -2,9 +2,7 @@ config DRM_I915 tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics" depends on DRM depends on X86 && PCI - depends on (AGP || AGP=n) select INTEL_GTT - select AGP_INTEL if AGP select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular # the shmem_readpage() which depends upon tmpfs