korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: significantly reduce the use of <drm/i915_drm.h>

Browse Source 
The #include has been splattered all over the place, but there are
precious few places, all .c files, that actually need it.

v2: remove leftover double newlines

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200225133131.3301-1-jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2020-02-25 15:31:31 +02:00
parent 0b3a4dd4af
commit 83d2bdb6a0
48 changed files with 9 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/display/intel_bios.c
View File

@ -26,7 +26,6 @@
*/
#include <drm/drm_dp_helper.h>
#include <drm/i915_drm.h>
#include "display/intel_display.h"
#include "display/intel_display_types.h"

2
drivers/gpu/drm/i915/display/intel_bios.h
View File

@ -32,8 +32,6 @@
#include <linux/types.h>
#include <drm/i915_drm.h>
struct drm_i915_private;
struct intel_crtc_state;
struct intel_encoder;

1
drivers/gpu/drm/i915/display/intel_crt.c
View File

@ -32,7 +32,6 @@
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/drm_probe_helper.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_connector.h"

2
drivers/gpu/drm/i915/display/intel_ddi.h
View File

@ -6,8 +6,6 @@
#ifndef __INTEL_DDI_H__
#define __INTEL_DDI_H__
#include <drm/i915_drm.h>
#include "intel_display.h"
struct drm_connector_state;

1
drivers/gpu/drm/i915/display/intel_display.c
View File

@ -41,7 +41,6 @@
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_rect.h>
#include <drm/i915_drm.h>
#include "display/intel_crt.h"
#include "display/intel_ddi.h"

4
drivers/gpu/drm/i915/display/intel_display.h
View File

@ -26,7 +26,6 @@
#define _INTEL_DISPLAY_H_
#include <drm/drm_util.h>
#include <drm/i915_drm.h>
enum link_m_n_set;
struct dpll;
@ -40,6 +39,7 @@ struct drm_framebuffer;
struct drm_i915_error_state_buf;
struct drm_i915_gem_object;
struct drm_i915_private;
struct drm_mode_fb_cmd2;
struct drm_modeset_acquire_ctx;
struct drm_plane;
struct drm_plane_state;
@ -47,6 +47,7 @@ struct i915_ggtt_view;
struct intel_atomic_state;
struct intel_crtc;
struct intel_crtc_state;
struct intel_crtc_state;
struct intel_digital_port;
struct intel_dp;
struct intel_encoder;
@ -55,7 +56,6 @@ struct intel_plane;
struct intel_plane_state;
struct intel_remapped_info;
struct intel_rotation_info;
struct intel_crtc_state;
enum i915_gpio {
GPIOA,

1
drivers/gpu/drm/i915/display/intel_display_types.h
View File

@ -39,7 +39,6 @@
#include <drm/drm_probe_helper.h>
#include <drm/drm_rect.h>
#include <drm/drm_vblank.h>
#include <drm/i915_drm.h>
#include <drm/i915_mei_hdcp_interface.h>
#include <media/cec-notifier.h>

1
drivers/gpu/drm/i915/display/intel_dp.c
View File

@ -40,7 +40,6 @@
#include <drm/drm_edid.h>
#include <drm/drm_hdcp.h>
#include <drm/drm_probe_helper.h>
#include <drm/i915_drm.h>
#include "i915_debugfs.h"
#include "i915_drv.h"

2
drivers/gpu/drm/i915/display/intel_dp.h
View File

@ -8,8 +8,6 @@
#include <linux/types.h>
#include <drm/i915_drm.h>
#include "i915_reg.h"
enum pipe;

1
drivers/gpu/drm/i915/display/intel_dsi_vbt.c
View File

@ -36,7 +36,6 @@
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/i915_drm.h>
#include <video/mipi_display.h>

1
drivers/gpu/drm/i915/display/intel_dvo.c
View File

@ -30,7 +30,6 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_connector.h"

1
drivers/gpu/drm/i915/display/intel_fbdev.c
View File

@ -40,7 +40,6 @@
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_display_types.h"

1
drivers/gpu/drm/i915/display/intel_gmbus.c
View File

@ -32,7 +32,6 @@
#include <linux/i2c.h>
#include <drm/drm_hdcp.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_display_types.h"

2
drivers/gpu/drm/i915/display/intel_hdcp.h
View File

@ -8,8 +8,6 @@
#include <linux/types.h>
#include <drm/i915_drm.h>
struct drm_connector;
struct drm_connector_state;
struct drm_i915_private;

1
drivers/gpu/drm/i915/display/intel_hdmi.c
View File

@ -36,7 +36,6 @@
#include <drm/drm_edid.h>
#include <drm/drm_hdcp.h>
#include <drm/drm_scdc_helper.h>
#include <drm/i915_drm.h>
#include <drm/intel_lpe_audio.h>
#include "i915_debugfs.h"

2
drivers/gpu/drm/i915/display/intel_hdmi.h
View File

@ -9,8 +9,6 @@
#include <linux/hdmi.h>
#include <linux/types.h>
#include <drm/i915_drm.h>
#include "i915_reg.h"
struct drm_connector;

2
drivers/gpu/drm/i915/display/intel_hotplug.c
View File

@ -23,8 +23,6 @@
#include <linux/kernel.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_display_types.h"
#include "intel_hotplug.h"

2
drivers/gpu/drm/i915/display/intel_hotplug.h
View File

@ -8,8 +8,6 @@
#include <linux/types.h>
#include <drm/i915_drm.h>
struct drm_i915_private;
struct intel_connector;
struct intel_encoder;

1
drivers/gpu/drm/i915/display/intel_lvds.c
View File

@ -37,7 +37,6 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_atomic.h"

2
drivers/gpu/drm/i915/display/intel_opregion.c
View File

@ -30,8 +30,6 @@
#include <linux/firmware.h>
#include <acpi/video.h>
#include <drm/i915_drm.h>
#include "display/intel_panel.h"
#include "i915_drv.h"

1
drivers/gpu/drm/i915/display/intel_overlay.c
View File

@ -27,7 +27,6 @@
*/
#include <drm/drm_fourcc.h>
#include <drm/i915_drm.h>
#include "gem/i915_gem_pm.h"
#include "gt/intel_ring.h"

1
drivers/gpu/drm/i915/display/intel_sdvo.c
View File

@ -34,7 +34,6 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_atomic.h"

2
drivers/gpu/drm/i915/display/intel_sdvo.h
View File

@ -8,8 +8,6 @@
#include <linux/types.h>
#include <drm/i915_drm.h>
#include "i915_reg.h"
struct drm_i915_private;

1
drivers/gpu/drm/i915/display/intel_sprite.c
View File

@ -37,7 +37,6 @@
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_rect.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_trace.h"

1
drivers/gpu/drm/i915/display/intel_tv.c
View File

@ -33,7 +33,6 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_connector.h"

2
drivers/gpu/drm/i915/display/intel_vdsc.c
View File

@ -6,8 +6,6 @@
* Manasi Navare <manasi.d.navare@intel.com>
*/
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_display_types.h"
#include "intel_dsi.h"

2
drivers/gpu/drm/i915/gem/i915_gem_context.c
View File

@ -67,8 +67,6 @@
#include <linux/log2.h>
#include <linux/nospec.h>
#include <drm/i915_drm.h>
#include "gt/gen6_ppgtt.h"
#include "gt/intel_context.h"
#include "gt/intel_context_param.h"

1
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
View File

@ -10,7 +10,6 @@
#include <linux/uaccess.h>
#include <drm/drm_syncobj.h>
#include <drm/i915_drm.h>
#include "display/intel_frontbuffer.h"

2
drivers/gpu/drm/i915/gem/i915_gem_internal.c
View File

@ -8,8 +8,6 @@
#include <linux/slab.h>
#include <linux/swiotlb.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_gem.h"
#include "i915_gem_object.h"

2
drivers/gpu/drm/i915/gem/i915_gem_object.h
View File

@ -11,8 +11,6 @@
#include <drm/drm_file.h>
#include <drm/drm_device.h>
#include <drm/i915_drm.h>
#include "display/intel_frontbuffer.h"
#include "i915_gem_object_types.h"
#include "i915_gem_gtt.h"

1
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
View File

@ -12,7 +12,6 @@
#include <linux/pci.h>
#include <linux/dma-buf.h>
#include <linux/vmalloc.h>
#include <drm/i915_drm.h>
#include "i915_trace.h"

1
drivers/gpu/drm/i915/gem/i915_gem_tiling.c
View File

@ -6,7 +6,6 @@
#include <linux/string.h>
#include <linux/bitops.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_gem.h"

2
drivers/gpu/drm/i915/gem/i915_gem_userptr.c
View File

@ -10,8 +10,6 @@
#include <linux/swap.h>
#include <linux/sched/mm.h>
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_gem_ioctls.h"
#include "i915_gem_object.h"

2
drivers/gpu/drm/i915/gt/intel_ggtt.c
View File

@ -8,6 +8,8 @@
#include <asm/set_memory.h>
#include <asm/smp.h>
#include <drm/i915_drm.h>
#include "intel_gt.h"
#include "i915_drv.h"
#include "i915_scatterlist.h"

2
drivers/gpu/drm/i915/gt/intel_ring_submission.c
View File

@ -29,8 +29,6 @@
#include <linux/log2.h>
#include <drm/i915_drm.h>
#include "gem/i915_gem_context.h"
#include "gen6_ppgtt.h"

2
drivers/gpu/drm/i915/gt/intel_rps.c
View File

@ -4,6 +4,8 @@
* Copyright © 2019 Intel Corporation
*/
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "intel_gt.h"
#include "intel_gt_irq.h"

1
drivers/gpu/drm/i915/i915_drv.c
View File

@ -44,7 +44,6 @@
#include <drm/drm_ioctl.h>
#include <drm/drm_irq.h>
#include <drm/drm_probe_helper.h>
#include <drm/i915_drm.h>
#include "display/intel_acpi.h"
#include "display/intel_audio.h"

1
drivers/gpu/drm/i915/i915_gem.c
View File

@ -26,7 +26,6 @@
*/
#include <drm/drm_vma_manager.h>
#include <drm/i915_drm.h>
#include <linux/dma-fence-array.h>
#include <linux/kthread.h>
#include <linux/dma-resv.h>

2
drivers/gpu/drm/i915/i915_gem_evict.c
View File

@ -26,8 +26,6 @@
*
*/
#include <drm/i915_drm.h>
#include "gem/i915_gem_context.h"
#include "gt/intel_gt_requests.h"

2
drivers/gpu/drm/i915/i915_gem_fence_reg.c
View File

@ -21,8 +21,6 @@
* IN THE SOFTWARE.
*/
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_scatterlist.h"
#include "i915_vgpu.h"

2
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -15,8 +15,6 @@
#include <asm/set_memory.h>
#include <asm/smp.h>
#include <drm/i915_drm.h>
#include "display/intel_frontbuffer.h"
#include "gt/intel_gt.h"
#include "gt/intel_gt_requests.h"

1
drivers/gpu/drm/i915/i915_ioc32.c
View File

@ -28,7 +28,6 @@
*/
#include <linux/compat.h>
#include <drm/i915_drm.h>
#include <drm/drm_ioctl.h>
#include "i915_drv.h"

1
drivers/gpu/drm/i915/i915_irq.c
View File

@ -34,7 +34,6 @@
#include <drm/drm_drv.h>
#include <drm/drm_irq.h>
#include <drm/i915_drm.h>
#include "display/intel_display_types.h"
#include "display/intel_fifo_underrun.h"

1
drivers/gpu/drm/i915/i915_pci.c
View File

@ -26,6 +26,7 @@
#include <linux/vga_switcheroo.h>
#include <drm/drm_drv.h>
#include <drm/i915_pciids.h>
#include "display/intel_fbdev.h"

2
drivers/gpu/drm/i915/i915_pmu.h
View File

@ -10,7 +10,7 @@
#include <linux/hrtimer.h>
#include <linux/perf_event.h>
#include <linux/spinlock_types.h>
#include <drm/i915_drm.h>
#include <uapi/drm/i915_drm.h>
struct drm_i915_private;

2
drivers/gpu/drm/i915/i915_suspend.c
View File

@ -24,8 +24,6 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <drm/i915_drm.h>
#include "display/intel_fbc.h"
#include "display/intel_gmbus.h"
#include "display/intel_vga.h"

1
drivers/gpu/drm/i915/intel_device_info.c
View File

@ -23,6 +23,7 @@
*/
#include <drm/drm_print.h>
#include <drm/i915_pciids.h>
#include "display/intel_cdclk.h"
#include "intel_device_info.h"

1
include/drm/i915_mei_hdcp_interface.h
View File

@ -12,7 +12,6 @@
#include <linux/mutex.h>
#include <linux/device.h>
#include <drm/drm_hdcp.h>
#include <drm/i915_drm.h>
/**
* enum hdcp_port_type - HDCP port implementation type defined by ME FW