From patchwork Wed Sep 10 10:43:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4876741 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 DA058C0338 for ; Wed, 10 Sep 2014 12:11:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 781E7201B9 for ; Wed, 10 Sep 2014 12:11:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 217C5200E5 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 3C70A6E442; 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-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 008A06E443 for ; Wed, 10 Sep 2014 05:11:19 -0700 (PDT) Received: by mail-we0-f179.google.com with SMTP id u56so4416574wes.10 for ; Wed, 10 Sep 2014 05:11:19 -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=Dg5TJrgqnDVzctYWKyMBkz3ppP4TUrtO9blFu3B9I4Q=; b=ECGef9Z4mEilQ0P/ZDvX72BTqn6Nba0BnW8XGTy2FI2qOqvYL9Dzz2hmD3VJFaaDVW +vBs2FyehzLeNapWhin3QjukKj2M46dBPPEIQpFLWp0LxP9Div+jmd2T14TyjUQytUMV gj4J+lb8rTdwvNaMcho6WD5wmygnv5U/Oc2MY= 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=Dg5TJrgqnDVzctYWKyMBkz3ppP4TUrtO9blFu3B9I4Q=; b=CctdK9J/eklg6xsWu+3fVXIIpKyq9zO2+fuiNw7Xvo+kl8UMB2F0Scus44PJB0QLzx hFvVQK2A0gKSF5xyFD/yPSy9fA1WXKNX48+YV3UGjUSBkt2tmPm7304ySFZ/FdGWJuAd vntQpqge3sYSHfob4IEBpUwbMGnlod0bY0Y4hzK6JaCABezOClZmLjXnGYktUOlvUmll ZhpQHrr70WBRWmTN/RcXcKoa/qP1hI4REvfmG5SCitpZuuboMphCeL03lp2jAvBsAv7A CObnNFqQZ14vBmNwHhmITgKl25tSpP5p+hlQs+ETWpJSKyWiZFCmvgWKkAkOUNae0jHu YiQw== X-Gm-Message-State: ALoCoQmMUeB1bEH0kos5glwYXmNK3pgKJHCpPf3oDXEjf/2PPPQW4qF5kyj5OzR8E89dZwyC1Ckg X-Received: by 10.194.58.244 with SMTP id u20mr50336742wjq.36.1410351079162; Wed, 10 Sep 2014 05:11:19 -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.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2014 05:11:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/15] drm: Move ati pci gart into Date: Wed, 10 Sep 2014 12:43:50 +0200 Message-Id: <1410345840-3326-6-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 Only used by radeon/ati ums drivers, so let's hide it better. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/ati_pcigart.c | 1 + include/drm/drmP.h | 25 ------------------------- include/drm/drm_legacy.h | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index c399dea27a3b..5cb38a1962be 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c @@ -33,6 +33,7 @@ #include #include +#include "drm_legacy.h" # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 4da28f08bda3..fe18acae9a73 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -461,25 +461,6 @@ struct drm_map_list { struct drm_master *master; }; -/* location of GART table */ -#define DRM_ATI_GART_MAIN 1 -#define DRM_ATI_GART_FB 2 - -#define DRM_ATI_GART_PCI 1 -#define DRM_ATI_GART_PCIE 2 -#define DRM_ATI_GART_IGP 3 - -struct drm_ati_pcigart_info { - int gart_table_location; - int gart_reg_if; - void *addr; - dma_addr_t bus_addr; - dma_addr_t table_mask; - struct drm_dma_handle *table_handle; - struct drm_local_map mapping; - int table_size; -}; - /** * This structure defines the drm_mm memory object, which will be used by the * DRM for its buffer objects. @@ -1316,12 +1297,6 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr extern int drm_vma_info(struct seq_file *m, void *data); - /* ATI PCIGART support (ati_pcigart.h) */ -extern int drm_ati_pcigart_init(struct drm_device *dev, - struct drm_ati_pcigart_info * gart_info); -extern int drm_ati_pcigart_cleanup(struct drm_device *dev, - struct drm_ati_pcigart_info * gart_info); - 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); diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 605d66081e3f..2af19f81eea5 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -55,4 +55,28 @@ 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); +/* ATI GART (ati_pcigart.c) */ +#define DRM_ATI_GART_MAIN 1 +#define DRM_ATI_GART_FB 2 + +#define DRM_ATI_GART_PCI 1 +#define DRM_ATI_GART_PCIE 2 +#define DRM_ATI_GART_IGP 3 + +struct drm_ati_pcigart_info { + int gart_table_location; + int gart_reg_if; + void *addr; + dma_addr_t bus_addr; + dma_addr_t table_mask; + struct drm_dma_handle *table_handle; + struct drm_local_map mapping; + int table_size; +}; + +extern int drm_ati_pcigart_init(struct drm_device *dev, + struct drm_ati_pcigart_info * gart_info); +extern int drm_ati_pcigart_cleanup(struct drm_device *dev, + struct drm_ati_pcigart_info * gart_info); + #endif /* __DRM_DRM_LEGACY_H__ */