From 33775336d56ebed543f4d6cc636e9018c8a671a1 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 3 Apr 2020 13:06:09 +0200 Subject: drm/pci: Move drm_pci_alloc/free under CONFIG_DRM_LEGACY All other users have been removed, yay! Signed-off-by: Daniel Vetter Reviewed-by: Sam Ravnborg [fix checkpatch warning] Signed-off-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20200403110610.2344842-1-daniel.vetter@ffwll.ch --- include/drm/drm_pci.h | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'include/drm/drm_pci.h') diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h index 3941b0255ecf..1bf31131960e 100644 --- a/include/drm/drm_pci.h +++ b/include/drm/drm_pci.h @@ -34,30 +34,4 @@ #include -struct drm_dma_handle; -struct drm_device; -struct drm_driver; -struct drm_master; - -#ifdef CONFIG_PCI - -struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, - size_t align); -void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); - -#else - -static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, - size_t size, size_t align) -{ - return NULL; -} - -static inline void drm_pci_free(struct drm_device *dev, - struct drm_dma_handle *dmah) -{ -} - -#endif - #endif /* _DRM_PCI_H_ */ -- cgit v1.2.3-70-g09d2 From 625c18d706f7f96db2a315a60c7895761bba6128 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 3 Apr 2020 13:06:10 +0200 Subject: drm: delete drm_pci.h It's empty! After more than 20 years of OS abstraction layer for pci devices, it's kinda gone now. Signed-off-by: Daniel Vetter Signed-off-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20200403110610.2344842-2-daniel.vetter@ffwll.ch --- drivers/gpu/drm/drm_bufs.c | 2 +- drivers/gpu/drm/drm_dma.c | 2 +- drivers/gpu/drm/drm_pci.c | 1 - drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 -- drivers/gpu/drm/r128/ati_pcigart.c | 3 ++- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- include/drm/drm_pci.h | 37 -------------------------------- 7 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 include/drm/drm_pci.h (limited to 'include/drm/drm_pci.h') diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index dcabf5698333..ef26ac57f039 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include #include "drm_legacy.h" diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index a7add55a85b4..d07ba54ec945 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c @@ -34,9 +34,9 @@ */ #include +#include #include -#include #include #include "drm_legacy.h" diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 131b7a139fda..75e2b7053f35 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "drm_internal.h" diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c index 698e22420dc5..7fe9831aa9ba 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c @@ -10,8 +10,6 @@ #include /* for drm_legacy.h! */ #include -#include /* for drm_pci.h! */ -#include #include "gt/intel_gt.h" #include "i915_drv.h" diff --git a/drivers/gpu/drm/r128/ati_pcigart.c b/drivers/gpu/drm/r128/ati_pcigart.c index 9b4072f97215..3e76ae5a17ee 100644 --- a/drivers/gpu/drm/r128/ati_pcigart.c +++ b/drivers/gpu/drm/r128/ati_pcigart.c @@ -32,9 +32,10 @@ */ #include +#include #include -#include +#include #include #include "ati_pcigart.h" diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 59f8186a2415..bbb0883e8ce6 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -44,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h deleted file mode 100644 index 1bf31131960e..000000000000 --- a/include/drm/drm_pci.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Internal Header for the Direct Rendering Manager - * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - * Copyright (c) 2009-2010, Code Aurora Forum. - * All rights reserved. - * - * Author: Rickard E. (Rik) Faith - * Author: Gareth Hughes - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef _DRM_PCI_H_ -#define _DRM_PCI_H_ - -#include - -#endif /* _DRM_PCI_H_ */ -- cgit v1.2.3-70-g09d2