From patchwork Wed Sep 10 10:43:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4876761 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 26897C033A for ; Wed, 10 Sep 2014 12:11:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C73B3201B9 for ; Wed, 10 Sep 2014 12:11:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9F1702018B for ; Wed, 10 Sep 2014 12:11:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D7556E449; Wed, 10 Sep 2014 05:11:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 48B796E443 for ; Wed, 10 Sep 2014 05:11:21 -0700 (PDT) Received: by mail-wi0-f181.google.com with SMTP id bs8so295003wib.14 for ; Wed, 10 Sep 2014 05:11:20 -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=DtL1oAO6NIYcC/G4IIr6D9+LW9UZi0xHOngZmT//6DI=; b=LuRbDvCdJLMZZNjgGGt69ha4E4hYI1l9VdPqjcesM8R3Q3lsihTHz3UOFehf+/4Z7h C79DQznJ4OHM+dMR2RFOBvvrw192riWrtl94jyY646bpbSBIkgxELMEs6RS0Y7iUR2QM JVZNSghO88BHYQuCVewMaHZL4YUonCzGMWwec= 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=DtL1oAO6NIYcC/G4IIr6D9+LW9UZi0xHOngZmT//6DI=; b=S70bCLYLtoV4O/CvSvXU1jrl31Oa4e/g8oO4NYbpKUoVBSPUSX4SEGXhqsdJ7G4Ifg WahPNvEwHVejWQ6K+XoOdDtYZXlgsx2F9t7r3pMSO4kMXI65qpDP4DMyNkyLiFW9cM4p xDQUJ2hqoJuTIlTIX4koSdDo4czfQA57PNHrWqYLAw4bCRxVFlXDiFT4sa00NKt7bbE+ gbu5PmTpkSfOoBxcz9Z0tZnRvIW2NmR3MstJsv83sNQ6yOU95jjbYxko4lPuiu6SU6bL HmP2IpgJSR0Xvk7960hb5Lw3gCHuqzWiMgZjpfUMnfsrAw55q3iNVPFNQebY+En4IiNF 03FQ== X-Gm-Message-State: ALoCoQkf+RQWbOZIzpvylUYQFlUGoqbaiuB/7dy1LkQcJsVt33Un7gIyRXYLZpHhxSpyWY4FE7Is X-Received: by 10.180.189.195 with SMTP id gk3mr36982305wic.82.1410351080449; Wed, 10 Sep 2014 05:11:20 -0700 (PDT) Received: from wespe.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id fp19sm2244443wic.3.2014.09.10.05.11.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2014 05:11:19 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/15] drm: Move __drm_pci_free to drm_legacy.c Date: Wed, 10 Sep 2014 12:43:51 +0200 Message-Id: <1410345840-3326-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1410345840-3326-1-git-send-email-daniel.vetter@ffwll.ch> References: <1410345840-3326-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-6.6 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 Also sprinkle the customary legacy_ prefix. Unfortunately we can't move the other functions since i915 is still using them. Shame on me for that one :( Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_bufs.c | 2 +- drivers/gpu/drm/drm_pci.c | 4 ++-- drivers/gpu/drm/drm_vm.c | 2 +- include/drm/drmP.h | 1 - include/drm/drm_legacy.h | 3 +++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 70ba89f66199..569064a00693 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -473,7 +473,7 @@ int drm_legacy_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) dmah.vaddr = map->handle; dmah.busaddr = map->offset; dmah.size = map->size; - __drm_pci_free(dev, &dmah); + __drm_legacy_pci_free(dev, &dmah); break; } kfree(map); diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 7563130c6b70..02ab8c52f311 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -81,7 +81,7 @@ EXPORT_SYMBOL(drm_pci_alloc); * * This function is for internal use in the Linux-specific DRM core code. */ -void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) +void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) { unsigned long addr; size_t sz; @@ -105,7 +105,7 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) */ void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) { - __drm_pci_free(dev, dmah); + __drm_legacy_pci_free(dev, dmah); kfree(dmah); } diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 4b3e9c4754d1..06cad0323699 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -272,7 +272,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) dmah.vaddr = map->handle; dmah.busaddr = map->offset; dmah.size = map->size; - __drm_pci_free(dev, &dmah); + __drm_legacy_pci_free(dev, &dmah); break; } kfree(map); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index fe18acae9a73..3c5990b5da80 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1299,7 +1299,6 @@ extern int drm_vma_info(struct seq_file *m, void *data); extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, size_t align); -extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); extern int drm_pci_set_unique(struct drm_device *dev, struct drm_master *master, diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 2af19f81eea5..49767e9dcc6b 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -55,6 +55,9 @@ int drm_legacy_addbufs_pci(struct drm_device *d, struct drm_buf_desc *req); void drm_legacy_idlelock_take(struct drm_lock_data *lock); void drm_legacy_idlelock_release(struct drm_lock_data *lock); +/* drm_pci.c dma alloc wrappers */ +void __drm_legacy_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); + /* ATI GART (ati_pcigart.c) */ #define DRM_ATI_GART_MAIN 1 #define DRM_ATI_GART_FB 2