Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon: Don't include <drm/drm_pci.h>

Including <drm/drm_pci.h> is unnecessary in most cases. Replace
these instances.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191203100406.9674-9-tzimmermann@suse.de

+54 -54
+1
drivers/gpu/drm/radeon/atom.h
··· 25 25 #ifndef ATOM_H 26 26 #define ATOM_H 27 27 28 + #include <linux/mutex.h> 28 29 #include <linux/types.h> 29 30 30 31 #define ATOM_BIOS_MAGIC 0xAA55
+1 -1
drivers/gpu/drm/radeon/atombios_encoders.c
··· 26 26 27 27 #include <linux/backlight.h> 28 28 #include <linux/dmi.h> 29 + #include <linux/pci.h> 29 30 30 31 #include <drm/drm_crtc_helper.h> 31 32 #include <drm/drm_file.h> 32 - #include <drm/drm_pci.h> 33 33 #include <drm/radeon_drm.h> 34 34 35 35 #include "atom.h"
+1 -2
drivers/gpu/drm/radeon/btc_dpm.c
··· 22 22 * Authors: Alex Deucher 23 23 */ 24 24 25 + #include <linux/pci.h> 25 26 #include <linux/seq_file.h> 26 - 27 - #include <drm/drm_pci.h> 28 27 29 28 #include "atom.h" 30 29 #include "btc_dpm.h"
+1 -2
drivers/gpu/drm/radeon/ci_dpm.c
··· 22 22 */ 23 23 24 24 #include <linux/firmware.h> 25 + #include <linux/pci.h> 25 26 #include <linux/seq_file.h> 26 - 27 - #include <drm/drm_pci.h> 28 27 29 28 #include "atom.h" 30 29 #include "ci_dpm.h"
+2 -2
drivers/gpu/drm/radeon/cik.c
··· 23 23 */ 24 24 25 25 #include <linux/firmware.h> 26 - #include <linux/slab.h> 27 26 #include <linux/module.h> 27 + #include <linux/pci.h> 28 + #include <linux/slab.h> 28 29 29 - #include <drm/drm_pci.h> 30 30 #include <drm/drm_vblank.h> 31 31 32 32 #include "atom.h"
+1 -1
drivers/gpu/drm/radeon/cypress_dpm.c
··· 22 22 * Authors: Alex Deucher 23 23 */ 24 24 25 - #include <drm/drm_pci.h> 25 + #include <linux/pci.h> 26 26 27 27 #include "atom.h" 28 28 #include "cypress_dpm.h"
+1 -1
drivers/gpu/drm/radeon/evergreen.c
··· 23 23 */ 24 24 25 25 #include <linux/firmware.h> 26 + #include <linux/pci.h> 26 27 #include <linux/slab.h> 27 28 28 - #include <drm/drm_pci.h> 29 29 #include <drm/drm_vblank.h> 30 30 #include <drm/radeon_drm.h> 31 31
+1 -2
drivers/gpu/drm/radeon/kv_dpm.c
··· 21 21 * 22 22 */ 23 23 24 + #include <linux/pci.h> 24 25 #include <linux/seq_file.h> 25 - 26 - #include <drm/drm_pci.h> 27 26 28 27 #include "cikd.h" 29 28 #include "kv_dpm.h"
+2 -2
drivers/gpu/drm/radeon/ni.c
··· 23 23 */ 24 24 25 25 #include <linux/firmware.h> 26 - #include <linux/slab.h> 27 26 #include <linux/module.h> 27 + #include <linux/pci.h> 28 + #include <linux/slab.h> 28 29 29 - #include <drm/drm_pci.h> 30 30 #include <drm/radeon_drm.h> 31 31 32 32 #include "atom.h"
+1 -2
drivers/gpu/drm/radeon/ni_dpm.c
··· 22 22 */ 23 23 24 24 #include <linux/math64.h> 25 + #include <linux/pci.h> 25 26 #include <linux/seq_file.h> 26 - 27 - #include <drm/drm_pci.h> 28 27 29 28 #include "atom.h" 30 29 #include "ni_dpm.h"
+3 -3
drivers/gpu/drm/radeon/r100.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 - #include <linux/seq_file.h> 30 - #include <linux/slab.h> 31 29 #include <linux/firmware.h> 32 30 #include <linux/module.h> 31 + #include <linux/pci.h> 32 + #include <linux/seq_file.h> 33 + #include <linux/slab.h> 33 34 34 35 #include <drm/drm_debugfs.h> 35 36 #include <drm/drm_device.h> 36 37 #include <drm/drm_file.h> 37 38 #include <drm/drm_fourcc.h> 38 - #include <drm/drm_pci.h> 39 39 #include <drm/drm_vblank.h> 40 40 #include <drm/radeon_drm.h> 41 41
+1 -1
drivers/gpu/drm/radeon/r300.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 29 30 #include <linux/seq_file.h> 30 31 #include <linux/slab.h> 31 32 ··· 35 34 #include <drm/drm_debugfs.h> 36 35 #include <drm/drm_device.h> 37 36 #include <drm/drm_file.h> 38 - #include <drm/drm_pci.h> 39 37 #include <drm/radeon_drm.h> 40 38 41 39 #include "r100_track.h"
+1 -1
drivers/gpu/drm/radeon/r420.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 29 30 #include <linux/seq_file.h> 30 31 #include <linux/slab.h> 31 32 32 33 #include <drm/drm_debugfs.h> 33 34 #include <drm/drm_device.h> 34 35 #include <drm/drm_file.h> 35 - #include <drm/drm_pci.h> 36 36 37 37 #include "atom.h" 38 38 #include "r100d.h"
+3 -3
drivers/gpu/drm/radeon/r600.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 - #include <linux/slab.h> 30 - #include <linux/seq_file.h> 31 29 #include <linux/firmware.h> 32 30 #include <linux/module.h> 31 + #include <linux/pci.h> 32 + #include <linux/slab.h> 33 + #include <linux/seq_file.h> 33 34 34 35 #include <drm/drm_debugfs.h> 35 36 #include <drm/drm_device.h> 36 - #include <drm/drm_pci.h> 37 37 #include <drm/drm_vblank.h> 38 38 #include <drm/radeon_drm.h> 39 39
+2 -1
drivers/gpu/drm/radeon/radeon_agp.c
··· 25 25 * Jerome Glisse <glisse@freedesktop.org> 26 26 */ 27 27 28 + #include <linux/pci.h> 29 + 28 30 #include <drm/drm_agpsupport.h> 29 31 #include <drm/drm_device.h> 30 - #include <drm/drm_pci.h> 31 32 #include <drm/radeon_drm.h> 32 33 33 34 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_asic.c
··· 27 27 */ 28 28 29 29 #include <linux/console.h> 30 + #include <linux/pci.h> 30 31 #include <linux/vgaarb.h> 31 32 32 33 #include <drm/drm_crtc_helper.h> 33 - #include <drm/drm_pci.h> 34 34 #include <drm/radeon_drm.h> 35 35 36 36 #include "atom.h"
+2 -1
drivers/gpu/drm/radeon/radeon_atombios.c
··· 24 24 * Alex Deucher 25 25 */ 26 26 27 + #include <linux/pci.h> 28 + 27 29 #include <drm/drm_device.h> 28 - #include <drm/drm_pci.h> 29 30 #include <drm/radeon_drm.h> 30 31 31 32 #include "radeon.h"
+2 -2
drivers/gpu/drm/radeon/radeon_bios.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 - #include <linux/slab.h> 30 29 #include <linux/acpi.h> 30 + #include <linux/pci.h> 31 + #include <linux/slab.h> 31 32 32 33 #include <drm/drm_device.h> 33 - #include <drm/drm_pci.h> 34 34 35 35 #include "atom.h" 36 36 #include "radeon.h"
+2 -1
drivers/gpu/drm/radeon/radeon_clocks.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 30 + 29 31 #include <drm/drm_device.h> 30 - #include <drm/drm_pci.h> 31 32 #include <drm/radeon_drm.h> 32 33 33 34 #include "atom.h"
+2 -1
drivers/gpu/drm/radeon/radeon_combios.c
··· 25 25 * Alex Deucher 26 26 */ 27 27 28 + #include <linux/pci.h> 29 + 28 30 #include <drm/drm_device.h> 29 - #include <drm/drm_pci.h> 30 31 #include <drm/radeon_drm.h> 31 32 32 33 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_cs.c
··· 26 26 */ 27 27 28 28 #include <linux/list_sort.h> 29 + #include <linux/pci.h> 29 30 #include <linux/uaccess.h> 30 31 31 32 #include <drm/drm_device.h> 32 33 #include <drm/drm_file.h> 33 - #include <drm/drm_pci.h> 34 34 #include <drm/radeon_drm.h> 35 35 36 36 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_device.c
··· 28 28 29 29 #include <linux/console.h> 30 30 #include <linux/efi.h> 31 + #include <linux/pci.h> 31 32 #include <linux/pm_runtime.h> 32 33 #include <linux/slab.h> 33 34 #include <linux/vga_switcheroo.h> ··· 39 38 #include <drm/drm_debugfs.h> 40 39 #include <drm/drm_device.h> 41 40 #include <drm/drm_file.h> 42 - #include <drm/drm_pci.h> 43 41 #include <drm/drm_probe_helper.h> 44 42 #include <drm/radeon_drm.h> 45 43
+1 -1
drivers/gpu/drm/radeon/radeon_display.c
··· 24 24 * Alex Deucher 25 25 */ 26 26 27 + #include <linux/pci.h> 27 28 #include <linux/pm_runtime.h> 28 29 #include <linux/gcd.h> 29 30 ··· 37 36 #include <drm/drm_fb_helper.h> 38 37 #include <drm/drm_fourcc.h> 39 38 #include <drm/drm_gem_framebuffer_helper.h> 40 - #include <drm/drm_pci.h> 41 39 #include <drm/drm_plane_helper.h> 42 40 #include <drm/drm_probe_helper.h> 43 41 #include <drm/drm_vblank.h>
+2 -1
drivers/gpu/drm/radeon/radeon_encoders.c
··· 24 24 * Alex Deucher 25 25 */ 26 26 27 + #include <linux/pci.h> 28 + 27 29 #include <drm/drm_crtc_helper.h> 28 30 #include <drm/drm_device.h> 29 - #include <drm/drm_pci.h> 30 31 #include <drm/radeon_drm.h> 31 32 32 33 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_fb.c
··· 25 25 */ 26 26 27 27 #include <linux/module.h> 28 + #include <linux/pci.h> 28 29 #include <linux/pm_runtime.h> 29 30 #include <linux/slab.h> 30 31 #include <linux/vga_switcheroo.h> ··· 34 33 #include <drm/drm_crtc_helper.h> 35 34 #include <drm/drm_fb_helper.h> 36 35 #include <drm/drm_fourcc.h> 37 - #include <drm/drm_pci.h> 38 36 #include <drm/radeon_drm.h> 39 37 40 38 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_gart.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 29 30 #include <linux/vmalloc.h> 30 31 31 - #include <drm/drm_pci.h> 32 32 #include <drm/radeon_drm.h> 33 33 #ifdef CONFIG_X86 34 34 #include <asm/set_memory.h>
+2 -1
drivers/gpu/drm/radeon/radeon_gem.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 30 + 29 31 #include <drm/drm_debugfs.h> 30 32 #include <drm/drm_device.h> 31 33 #include <drm/drm_file.h> 32 - #include <drm/drm_pci.h> 33 34 #include <drm/radeon_drm.h> 34 35 35 36 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_i2c.c
··· 25 25 */ 26 26 27 27 #include <linux/export.h> 28 + #include <linux/pci.h> 28 29 29 30 #include <drm/drm_device.h> 30 31 #include <drm/drm_edid.h> 31 - #include <drm/drm_pci.h> 32 32 #include <drm/radeon_drm.h> 33 33 34 34 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_irq_kms.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 29 30 #include <linux/pm_runtime.h> 30 31 31 32 #include <drm/drm_crtc_helper.h> 32 33 #include <drm/drm_device.h> 33 34 #include <drm/drm_irq.h> 34 - #include <drm/drm_pci.h> 35 35 #include <drm/drm_probe_helper.h> 36 36 #include <drm/drm_vblank.h> 37 37 #include <drm/radeon_drm.h>
+1 -1
drivers/gpu/drm/radeon/radeon_kms.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 + #include <linux/pci.h> 29 30 #include <linux/pm_runtime.h> 30 31 #include <linux/slab.h> 31 32 #include <linux/uaccess.h> ··· 35 34 #include <drm/drm_fb_helper.h> 36 35 #include <drm/drm_file.h> 37 36 #include <drm/drm_ioctl.h> 38 - #include <drm/drm_pci.h> 39 37 #include <drm/radeon_drm.h> 40 38 41 39 #include "radeon.h"
+1 -1
drivers/gpu/drm/radeon/radeon_legacy_encoders.c
··· 25 25 */ 26 26 27 27 #include <linux/backlight.h> 28 + #include <linux/pci.h> 28 29 29 30 #include <drm/drm_crtc_helper.h> 30 31 #include <drm/drm_device.h> 31 32 #include <drm/drm_file.h> 32 - #include <drm/drm_pci.h> 33 33 #include <drm/drm_util.h> 34 34 #include <drm/radeon_drm.h> 35 35
+1 -1
drivers/gpu/drm/radeon/radeon_pm.c
··· 23 23 24 24 #include <linux/hwmon-sysfs.h> 25 25 #include <linux/hwmon.h> 26 + #include <linux/pci.h> 26 27 #include <linux/power_supply.h> 27 28 28 29 #include <drm/drm_debugfs.h> 29 - #include <drm/drm_pci.h> 30 30 #include <drm/drm_vblank.h> 31 31 32 32 #include "atom.h"
+1 -1
drivers/gpu/drm/radeon/radeon_ttm.c
··· 32 32 33 33 #include <linux/dma-mapping.h> 34 34 #include <linux/pagemap.h> 35 + #include <linux/pci.h> 35 36 #include <linux/seq_file.h> 36 37 #include <linux/slab.h> 37 38 #include <linux/swap.h> ··· 42 41 #include <drm/drm_debugfs.h> 43 42 #include <drm/drm_device.h> 44 43 #include <drm/drm_file.h> 45 - #include <drm/drm_pci.h> 46 44 #include <drm/drm_prime.h> 47 45 #include <drm/radeon_drm.h> 48 46 #include <drm/ttm/ttm_bo_api.h>
+1 -1
drivers/gpu/drm/radeon/rs600.c
··· 37 37 */ 38 38 39 39 #include <linux/io-64-nonatomic-lo-hi.h> 40 + #include <linux/pci.h> 40 41 41 42 #include <drm/drm_device.h> 42 - #include <drm/drm_pci.h> 43 43 #include <drm/drm_vblank.h> 44 44 45 45 #include "atom.h"
+1 -1
drivers/gpu/drm/radeon/rs690.c
··· 26 26 * Jerome Glisse 27 27 */ 28 28 29 - #include <drm/drm_pci.h> 29 + #include <linux/pci.h> 30 30 31 31 #include "atom.h" 32 32 #include "radeon.h"
+1 -2
drivers/gpu/drm/radeon/rs780_dpm.c
··· 22 22 * Authors: Alex Deucher 23 23 */ 24 24 25 + #include <linux/pci.h> 25 26 #include <linux/seq_file.h> 26 - 27 - #include <drm/drm_pci.h> 28 27 29 28 #include "atom.h" 30 29 #include "r600_dpm.h"
+1 -1
drivers/gpu/drm/radeon/rv770.c
··· 27 27 */ 28 28 29 29 #include <linux/firmware.h> 30 + #include <linux/pci.h> 30 31 #include <linux/slab.h> 31 32 32 33 #include <drm/drm_device.h> 33 - #include <drm/drm_pci.h> 34 34 #include <drm/radeon_drm.h> 35 35 36 36 #include "atom.h"
+2 -2
drivers/gpu/drm/radeon/si.c
··· 23 23 */ 24 24 25 25 #include <linux/firmware.h> 26 - #include <linux/slab.h> 27 26 #include <linux/module.h> 27 + #include <linux/pci.h> 28 + #include <linux/slab.h> 28 29 29 - #include <drm/drm_pci.h> 30 30 #include <drm/drm_vblank.h> 31 31 #include <drm/radeon_drm.h> 32 32
+1 -2
drivers/gpu/drm/radeon/si_dpm.c
··· 22 22 */ 23 23 24 24 #include <linux/math64.h> 25 + #include <linux/pci.h> 25 26 #include <linux/seq_file.h> 26 - 27 - #include <drm/drm_pci.h> 28 27 29 28 #include "atom.h" 30 29 #include "r600_dpm.h"
+1 -2
drivers/gpu/drm/radeon/trinity_dpm.c
··· 21 21 * 22 22 */ 23 23 24 + #include <linux/pci.h> 24 25 #include <linux/seq_file.h> 25 - 26 - #include <drm/drm_pci.h> 27 26 28 27 #include "r600_dpm.h" 29 28 #include "radeon.h"