Hi Daniel. On Fri, Apr 03, 2020 at 01:06:10PM +0200, Daniel Vetter wrote: > 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 <daniel.vetter@xxxxxxxxx> Looks good, and survived my build testing. Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > --- > 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 > > 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 <linux/mm.h> > #include <linux/mman.h> > #include <linux/nospec.h> > +#include <linux/pci.h> > #include <linux/slab.h> > #include <linux/uaccess.h> > #include <linux/vmalloc.h> > @@ -43,7 +44,6 @@ > #include <drm/drm_device.h> > #include <drm/drm_drv.h> > #include <drm/drm_file.h> > -#include <drm/drm_pci.h> > #include <drm/drm_print.h> > > #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 <linux/export.h> > +#include <linux/pci.h> > > #include <drm/drm_drv.h> > -#include <drm/drm_pci.h> > #include <drm/drm_print.h> > > #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 <drm/drm.h> > #include <drm/drm_agpsupport.h> > #include <drm/drm_drv.h> > -#include <drm/drm_pci.h> > #include <drm/drm_print.h> > > #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 <drm/drm.h> /* for drm_legacy.h! */ > #include <drm/drm_cache.h> > -#include <drm/drm_legacy.h> /* for drm_pci.h! */ > -#include <drm/drm_pci.h> > > #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 <linux/export.h> > +#include <linux/pci.h> > > #include <drm/drm_device.h> > -#include <drm/drm_pci.h> > +#include <drm/drm_legacy.h> > #include <drm/drm_print.h> > > #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 <linux/pm_runtime.h> > #include <linux/vga_switcheroo.h> > #include <linux/mmu_notifier.h> > +#include <linux/pci.h> > > #include <drm/drm_agpsupport.h> > #include <drm/drm_crtc_helper.h> > @@ -44,7 +45,6 @@ > #include <drm/drm_file.h> > #include <drm/drm_gem.h> > #include <drm/drm_ioctl.h> > -#include <drm/drm_pci.h> > #include <drm/drm_pciids.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_vblank.h> > 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 <faith@xxxxxxxxxxx> > - * Author: Gareth Hughes <gareth@xxxxxxxxxxx> > - * > - * 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 <linux/pci.h> > - > -#endif /* _DRM_PCI_H_ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
