From patchwork Wed Mar 30 09:45:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694551 Return-Path: X-Original-To: patchwork-dri-devel@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 90CD6C0553 for ; Wed, 30 Mar 2016 09:46:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE7282035D for ; Wed, 30 Mar 2016 09:46:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E6D3B20148 for ; Wed, 30 Mar 2016 09:46:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CDC766E755; Wed, 30 Mar 2016 09:45:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) by gabe.freedesktop.org (Postfix) with ESMTPS id 471746E746 for ; Wed, 30 Mar 2016 09:45:28 +0000 (UTC) Received: by mail-wm0-x232.google.com with SMTP id 127so89994037wmu.1 for ; Wed, 30 Mar 2016 02:45:28 -0700 (PDT) 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=A5wtjRL1B++pcZpD6QOTba9fa4IxFnCODmz1Q9+cteY=; b=LxU6LeMDdzR+ycp1GkHUa5atkyugByanMj80vREbykvXgtiZusTef3xJtDf4PM0r/h IXll7LbmFWpBeBUVNLAPIpcu+JvDyrt+nfYBXiFx094j5xx1+PIB1UnzmxkkQvmOJBtr ZKSMRJHf0dqK8MxUMlg6GbYYUj/4ltzJT7NQs= 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=A5wtjRL1B++pcZpD6QOTba9fa4IxFnCODmz1Q9+cteY=; b=GyHk2nosOxMYvgqhuOLieioL7IUN8pzJ93Bm/3LbkPSlc2EV1hSfSiEepU+cJvzRhA keRxJxETjAPP7lsU5frZPuUEYEiPn0vow+VZkzK5Tu+zR5FiJIPxcHg2a/s9fLsgeFtY m6rsaG18DZS5FPb/ieRSSRHxf3zL/49iWQKipCgalRHLHau5BEAwYE4ARFJRfNPNGyas bpHTOUmvnMJR/MAWh0wIp7rtFtF0E3dk/p62n/+34GV9PGJ2Gl7PK9IjID5e+hBHwiJx WwPlVrhbFtpsm02AwJACKx1p1ctI7VgApkCZqFfPkrvdO8JtaCwtvIZh+bqGMpVvhBG1 jfcw== X-Gm-Message-State: AD7BkJJFX0XPgj//TB7tavU0V1TwVHS1Lwl1V4EK3dQGr9og3eyasulnfV+UBpXGDdEfmA== X-Received: by 10.28.111.14 with SMTP id k14mr9044153wmc.82.1459331125770; Wed, 30 Mar 2016 02:45:25 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id m130sm1905493wmf.10.2016.03.30.02.45.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:45:25 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/10] drm: Give drm_agp_clear drm_legacy_ prefix Date: Wed, 30 Mar 2016 11:45:15 +0200 Message-Id: <1459331120-27864-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.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 It has a DRIVER_MODESET check to sure make it's not creating havoc for drm drivers. Make that clear in the name too. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_agpsupport.c | 4 ++-- drivers/gpu/drm/drm_fops.c | 2 +- drivers/gpu/drm/drm_pci.c | 2 +- include/drm/drm_agpsupport.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index a10ea6aec629..605bd243fb36 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c @@ -423,7 +423,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) } /** - * drm_agp_clear - Clear AGP resource list + * drm_legacy_agp_clear - Clear AGP resource list * @dev: DRM device * * Iterate over all AGP resources and remove them. But keep the AGP head @@ -434,7 +434,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) * resources from getting destroyed. Drivers are responsible of cleaning them up * during device shutdown. */ -void drm_agp_clear(struct drm_device *dev) +void drm_legacy_agp_clear(struct drm_device *dev) { struct drm_agp_mem *entry, *tempe; diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index aeef58ed359b..7b5a13cda7a6 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -413,7 +413,7 @@ int drm_lastclose(struct drm_device * dev) mutex_lock(&dev->struct_mutex); - drm_agp_clear(dev); + drm_legacy_agp_clear(dev); drm_legacy_sg_cleanup(dev); drm_legacy_vma_flush(dev); diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index a1fff1179a97..29d5a548d07a 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -250,7 +250,7 @@ void drm_pci_agp_destroy(struct drm_device *dev) { if (dev->agp) { arch_phys_wc_del(dev->agp->agp_mtrr); - drm_agp_clear(dev); + drm_legacy_agp_clear(dev); kfree(dev->agp); dev->agp = NULL; } diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h index 193ef19dfc5c..e134e9ca422b 100644 --- a/include/drm/drm_agpsupport.h +++ b/include/drm/drm_agpsupport.h @@ -37,7 +37,7 @@ struct agp_memory *drm_agp_bind_pages(struct drm_device *dev, uint32_t type); struct drm_agp_head *drm_agp_init(struct drm_device *dev); -void drm_agp_clear(struct drm_device *dev); +void drm_legacy_agp_clear(struct drm_device *dev); int drm_agp_acquire(struct drm_device *dev); int drm_agp_acquire_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);