[PATCH 03/13] UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
From: David Howells <dhowells@redhat.com>
Date: 2012-07-20 21:57:55
Also in:
lkml
Subsystem:
drm driver for ast server graphics chips, drm driver for mga g200 graphics chips, drm driver for nvidia geforce/quadro gpus, drm driver for usb displaylink video adapters, drm driver for vmware virtual gpu, drm drivers, drm drivers and misc gpu patches, drm drivers for exynos, drm drivers for gma500 (poulsbo, moorestown and derivative chipsets), drm ttm subsystem, intel drm i915 driver (meteor lake, dg2 and older excluding poulsbo, moorestown and derivative), radeon and amdgpu drm drivers, the rest · Maintainers:
Dave Airlie, Lyude Paul, Danilo Krummrich, Zack Rusin, David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Inki Dae, Seung-Woo Kim, Kyungmin Park, Patrik Jakobsson, Christian Koenig, Huang Rui, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin, Alex Deucher, Christian König, Linus Torvalds
Convert #include "..." to #include <path/...> in drivers/gpu/. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Dave Airlie <airlied@redhat.com> --- drivers/gpu/drm/ast/ast_drv.c | 4 ++-- drivers/gpu/drm/ast/ast_drv.h | 12 ++++++------ drivers/gpu/drm/ast/ast_fb.c | 6 +++--- drivers/gpu/drm/ast/ast_main.c | 6 +++--- drivers/gpu/drm/ast/ast_mode.c | 6 +++--- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/ast/ast_ttm.c | 2 +- drivers/gpu/drm/ati_pcigart.c | 2 +- drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- drivers/gpu/drm/cirrus/cirrus_drv.h | 10 +++++----- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 4 ++-- drivers/gpu/drm/cirrus/cirrus_main.c | 4 ++-- drivers/gpu/drm/cirrus/cirrus_mode.c | 4 ++-- drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 +- drivers/gpu/drm/drm_agpsupport.c | 2 +- drivers/gpu/drm/drm_auth.c | 2 +- drivers/gpu/drm/drm_buffer.c | 2 +- drivers/gpu/drm/drm_bufs.c | 2 +- drivers/gpu/drm/drm_cache.c | 2 +- drivers/gpu/drm/drm_context.c | 2 +- drivers/gpu/drm/drm_crtc.c | 8 ++++---- drivers/gpu/drm/drm_crtc_helper.c | 12 ++++++------ drivers/gpu/drm/drm_debugfs.c | 2 +- drivers/gpu/drm/drm_dma.c | 2 +- drivers/gpu/drm/drm_dp_i2c_helper.c | 4 ++-- drivers/gpu/drm/drm_drv.c | 4 ++-- drivers/gpu/drm/drm_edid.c | 4 ++-- drivers/gpu/drm/drm_edid_load.c | 8 ++++---- drivers/gpu/drm/drm_edid_modes.h | 4 ++-- drivers/gpu/drm/drm_encoder_slave.c | 2 +- drivers/gpu/drm/drm_fb_helper.c | 8 ++++---- drivers/gpu/drm/drm_fops.c | 2 +- drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_global.c | 2 +- drivers/gpu/drm/drm_hashtab.c | 4 ++-- drivers/gpu/drm/drm_info.c | 2 +- drivers/gpu/drm/drm_ioc32.c | 4 ++-- drivers/gpu/drm/drm_ioctl.c | 8 ++++---- drivers/gpu/drm/drm_irq.c | 2 +- drivers/gpu/drm/drm_lock.c | 2 +- drivers/gpu/drm/drm_memory.c | 2 +- drivers/gpu/drm/drm_mm.c | 4 ++-- drivers/gpu/drm/drm_modes.c | 4 ++-- drivers/gpu/drm/drm_pci.c | 2 +- drivers/gpu/drm/drm_platform.c | 2 +- drivers/gpu/drm/drm_prime.c | 2 +- drivers/gpu/drm/drm_proc.c | 2 +- drivers/gpu/drm/drm_scatter.c | 2 +- drivers/gpu/drm/drm_stub.c | 4 ++-- drivers/gpu/drm/drm_sysfs.c | 6 +++--- drivers/gpu/drm/drm_trace_points.c | 2 +- drivers/gpu/drm/drm_usb.c | 2 +- drivers/gpu/drm/drm_vm.c | 2 +- drivers/gpu/drm/exynos/exynos_ddc.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_buf.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_core.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_fb.c | 8 ++++---- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 8 ++++---- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 6 +++--- drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +++--- drivers/gpu/drm/exynos/exynos_hdmiphy.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +- drivers/gpu/drm/gma500/cdv_device.c | 2 +- drivers/gpu/drm/gma500/gem.c | 2 +- drivers/gpu/drm/gma500/intel_bios.c | 2 +- drivers/gpu/drm/gma500/intel_gmbus.c | 4 ++-- drivers/gpu/drm/gma500/mid_bios.c | 2 +- drivers/gpu/drm/gma500/oaktrail_device.c | 2 +- drivers/gpu/drm/gma500/psb_device.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.h | 4 ++-- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 8 ++++---- drivers/gpu/drm/i2c/ch7006_priv.h | 8 ++++---- drivers/gpu/drm/i2c/sil164_drv.c | 8 ++++---- drivers/gpu/drm/i810/i810_dma.c | 4 ++-- drivers/gpu/drm/i810/i810_drv.c | 6 +++--- drivers/gpu/drm/i915/dvo.h | 4 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/i915_dma.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.c | 6 +++--- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_debug.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/i915_gem_evict.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_tiling.c | 8 ++++---- drivers/gpu/drm/i915/i915_ioc32.c | 4 ++-- drivers/gpu/drm/i915/i915_irq.c | 4 ++-- drivers/gpu/drm/i915/i915_suspend.c | 4 ++-- drivers/gpu/drm/i915/intel_acpi.c | 2 +- drivers/gpu/drm/i915/intel_bios.c | 4 ++-- drivers/gpu/drm/i915/intel_bios.h | 2 +- drivers/gpu/drm/i915/intel_crt.c | 10 +++++----- drivers/gpu/drm/i915/intel_display.c | 8 ++++---- drivers/gpu/drm/i915/intel_dp.c | 12 ++++++------ drivers/gpu/drm/i915/intel_drv.h | 8 ++++---- drivers/gpu/drm/i915/intel_dvo.c | 6 +++--- drivers/gpu/drm/i915/intel_fb.c | 8 ++++---- drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++---- drivers/gpu/drm/i915/intel_i2c.c | 4 ++-- drivers/gpu/drm/i915/intel_lvds.c | 8 ++++---- drivers/gpu/drm/i915/intel_modes.c | 4 ++-- drivers/gpu/drm/i915/intel_opregion.c | 4 ++-- drivers/gpu/drm/i915/intel_overlay.c | 4 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++---- drivers/gpu/drm/i915/intel_sprite.c | 8 ++++---- drivers/gpu/drm/i915/intel_tv.c | 8 ++++---- drivers/gpu/drm/mga/mga_dma.c | 4 ++-- drivers/gpu/drm/mga/mga_drv.c | 6 +++--- drivers/gpu/drm/mga/mga_ioc32.c | 4 ++-- drivers/gpu/drm/mga/mga_irq.c | 4 ++-- drivers/gpu/drm/mga/mga_state.c | 4 ++-- drivers/gpu/drm/mga/mga_warp.c | 4 ++-- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 ++-- drivers/gpu/drm/mgag200/mgag200_drv.h | 12 ++++++------ drivers/gpu/drm/mgag200/mgag200_fb.c | 4 ++-- drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +- drivers/gpu/drm/mgag200/mgag200_main.c | 4 ++-- drivers/gpu/drm/mgag200/mgag200_mode.c | 4 ++-- drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_calc.c | 2 +- drivers/gpu/drm/nouveau/nouveau_channel.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_connector.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_drv.h | 12 ++++++------ drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 10 +++++----- drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +- drivers/gpu/drm/nouveau/nouveau_hdmi.c | 2 +- drivers/gpu/drm/nouveau/nouveau_hw.c | 2 +- drivers/gpu/drm/nouveau/nouveau_hw.h | 2 +- drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- drivers/gpu/drm/nouveau/nouveau_i2c.h | 2 +- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- drivers/gpu/drm/nouveau/nouveau_irq.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_mem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_mm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_mxm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_notifier.c | 2 +- drivers/gpu/drm/nouveau/nouveau_object.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- drivers/gpu/drm/nouveau/nouveau_pm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_prime.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_ramht.c | 2 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- drivers/gpu/drm/nouveau/nouveau_state.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_vm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_vm.h | 2 +- drivers/gpu/drm/nouveau/nouveau_volt.c | 2 +- drivers/gpu/drm/nouveau/nv04_crtc.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_cursor.c | 2 +- drivers/gpu/drm/nouveau/nv04_dac.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_dfp.c | 6 +++--- drivers/gpu/drm/nouveau/nv04_display.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- drivers/gpu/drm/nouveau/nv04_fifo.c | 2 +- drivers/gpu/drm/nouveau/nv04_graph.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_instmem.c | 2 +- drivers/gpu/drm/nouveau/nv04_mc.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_pm.c | 2 +- drivers/gpu/drm/nouveau/nv04_software.c | 2 +- drivers/gpu/drm/nouveau/nv04_timer.c | 4 ++-- drivers/gpu/drm/nouveau/nv04_tv.c | 6 +++--- drivers/gpu/drm/nouveau/nv10_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nv10_fence.c | 2 +- drivers/gpu/drm/nouveau/nv10_fifo.c | 2 +- drivers/gpu/drm/nouveau/nv10_gpio.c | 2 +- drivers/gpu/drm/nouveau/nv10_graph.c | 4 ++-- drivers/gpu/drm/nouveau/nv17_fifo.c | 2 +- drivers/gpu/drm/nouveau/nv17_tv.c | 4 ++-- drivers/gpu/drm/nouveau/nv17_tv_modes.c | 4 ++-- drivers/gpu/drm/nouveau/nv20_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nv20_graph.c | 4 ++-- drivers/gpu/drm/nouveau/nv30_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nv31_mpeg.c | 2 +- drivers/gpu/drm/nouveau/nv40_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nv40_fifo.c | 2 +- drivers/gpu/drm/nouveau/nv40_graph.c | 2 +- drivers/gpu/drm/nouveau/nv40_grctx.c | 2 +- drivers/gpu/drm/nouveau/nv40_mc.c | 4 ++-- drivers/gpu/drm/nouveau/nv40_pm.c | 2 +- drivers/gpu/drm/nouveau/nv50_calc.c | 2 +- drivers/gpu/drm/nouveau/nv50_crtc.c | 4 ++-- drivers/gpu/drm/nouveau/nv50_cursor.c | 2 +- drivers/gpu/drm/nouveau/nv50_dac.c | 4 ++-- drivers/gpu/drm/nouveau/nv50_display.c | 2 +- drivers/gpu/drm/nouveau/nv50_display.h | 2 +- drivers/gpu/drm/nouveau/nv50_evo.c | 2 +- drivers/gpu/drm/nouveau/nv50_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nv50_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nv50_fifo.c | 2 +- drivers/gpu/drm/nouveau/nv50_gpio.c | 2 +- drivers/gpu/drm/nouveau/nv50_graph.c | 2 +- drivers/gpu/drm/nouveau/nv50_grctx.c | 2 +- drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +- drivers/gpu/drm/nouveau/nv50_mc.c | 2 +- drivers/gpu/drm/nouveau/nv50_mpeg.c | 2 +- drivers/gpu/drm/nouveau/nv50_pm.c | 2 +- drivers/gpu/drm/nouveau/nv50_software.c | 2 +- drivers/gpu/drm/nouveau/nv50_sor.c | 4 ++-- drivers/gpu/drm/nouveau/nv50_vm.c | 2 +- drivers/gpu/drm/nouveau/nv50_vram.c | 2 +- drivers/gpu/drm/nouveau/nv84_bsp.c | 2 +- drivers/gpu/drm/nouveau/nv84_crypt.c | 2 +- drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- drivers/gpu/drm/nouveau/nv84_fifo.c | 2 +- drivers/gpu/drm/nouveau/nv84_vp.c | 2 +- drivers/gpu/drm/nouveau/nv98_crypt.c | 2 +- drivers/gpu/drm/nouveau/nv98_ppp.c | 2 +- drivers/gpu/drm/nouveau/nva3_copy.c | 2 +- drivers/gpu/drm/nouveau/nva3_pm.c | 2 +- drivers/gpu/drm/nouveau/nvc0_copy.c | 2 +- drivers/gpu/drm/nouveau/nvc0_fb.c | 4 ++-- drivers/gpu/drm/nouveau/nvc0_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nvc0_fence.c | 2 +- drivers/gpu/drm/nouveau/nvc0_fifo.c | 2 +- drivers/gpu/drm/nouveau/nvc0_graph.c | 2 +- drivers/gpu/drm/nouveau/nvc0_grctx.c | 2 +- drivers/gpu/drm/nouveau/nvc0_instmem.c | 2 +- drivers/gpu/drm/nouveau/nvc0_pm.c | 2 +- drivers/gpu/drm/nouveau/nvc0_software.c | 2 +- drivers/gpu/drm/nouveau/nvc0_vm.c | 2 +- drivers/gpu/drm/nouveau/nvc0_vram.c | 2 +- drivers/gpu/drm/nouveau/nvd0_display.c | 4 ++-- drivers/gpu/drm/nouveau/nve0_fifo.c | 2 +- drivers/gpu/drm/nouveau/nve0_graph.c | 2 +- drivers/gpu/drm/nouveau/nve0_grctx.c | 2 +- drivers/gpu/drm/r128/r128_cce.c | 4 ++-- drivers/gpu/drm/r128/r128_drv.c | 6 +++--- drivers/gpu/drm/r128/r128_ioc32.c | 4 ++-- drivers/gpu/drm/r128/r128_irq.c | 4 ++-- drivers/gpu/drm/r128/r128_state.c | 4 ++-- drivers/gpu/drm/radeon/atom.h | 2 +- drivers/gpu/drm/radeon/atombios_dp.c | 6 +++--- drivers/gpu/drm/radeon/atombios_encoders.c | 6 +++--- drivers/gpu/drm/radeon/atombios_i2c.c | 4 ++-- drivers/gpu/drm/radeon/evergreen.c | 4 ++-- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 4 ++-- drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 4 ++-- drivers/gpu/drm/radeon/ni.c | 4 ++-- drivers/gpu/drm/radeon/r100.c | 4 ++-- drivers/gpu/drm/radeon/r200.c | 4 ++-- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r300_cmdbuf.c | 6 +++--- drivers/gpu/drm/radeon/r420.c | 2 +- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/r600_audio.c | 2 +- drivers/gpu/drm/radeon/r600_blit.c | 4 ++-- drivers/gpu/drm/radeon/r600_blit_kms.c | 4 ++-- drivers/gpu/drm/radeon/r600_cp.c | 4 ++-- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_hdmi.c | 4 ++-- drivers/gpu/drm/radeon/radeon_acpi.c | 4 ++-- drivers/gpu/drm/radeon/radeon_agp.c | 4 ++-- drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++-- drivers/gpu/drm/radeon/radeon_bios.c | 2 +- drivers/gpu/drm/radeon/radeon_clocks.c | 4 ++-- drivers/gpu/drm/radeon/radeon_combios.c | 4 ++-- drivers/gpu/drm/radeon/radeon_connectors.c | 10 +++++----- drivers/gpu/drm/radeon/radeon_cp.c | 4 ++-- drivers/gpu/drm/radeon/radeon_cs.c | 4 ++-- drivers/gpu/drm/radeon/radeon_cursor.c | 4 ++-- drivers/gpu/drm/radeon/radeon_display.c | 8 ++++---- drivers/gpu/drm/radeon/radeon_drv.c | 6 +++--- drivers/gpu/drm/radeon/radeon_encoders.c | 6 +++--- drivers/gpu/drm/radeon/radeon_fb.c | 10 +++++----- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_gart.c | 4 ++-- drivers/gpu/drm/radeon/radeon_gem.c | 4 ++-- drivers/gpu/drm/radeon/radeon_i2c.c | 6 +++--- drivers/gpu/drm/radeon/radeon_ioc32.c | 4 ++-- drivers/gpu/drm/radeon/radeon_irq.c | 4 ++-- drivers/gpu/drm/radeon/radeon_irq_kms.c | 6 +++--- drivers/gpu/drm/radeon/radeon_kms.c | 4 ++-- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 6 +++--- drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 ++-- drivers/gpu/drm/radeon/radeon_mem.c | 4 ++-- drivers/gpu/drm/radeon/radeon_mode.h | 10 +++++----- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 2 +- drivers/gpu/drm/radeon/radeon_prime.c | 4 ++-- drivers/gpu/drm/radeon/radeon_ring.c | 4 ++-- drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/radeon/radeon_semaphore.c | 2 +- drivers/gpu/drm/radeon/radeon_state.c | 6 +++--- drivers/gpu/drm/radeon/radeon_trace_points.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 2 +- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 4 ++-- drivers/gpu/drm/radeon/si.c | 4 ++-- drivers/gpu/drm/savage/savage_bci.c | 4 ++-- drivers/gpu/drm/savage/savage_drv.c | 6 +++--- drivers/gpu/drm/savage/savage_state.c | 4 ++-- drivers/gpu/drm/sis/sis_drv.c | 6 +++--- drivers/gpu/drm/sis/sis_drv.h | 2 +- drivers/gpu/drm/sis/sis_mm.c | 4 ++-- drivers/gpu/drm/tdfx/tdfx_drv.c | 4 ++-- drivers/gpu/drm/ttm/ttm_agp_backend.c | 8 ++++---- drivers/gpu/drm/ttm/ttm_bo.c | 6 +++--- drivers/gpu/drm/ttm/ttm_bo_manager.c | 8 ++++---- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 ++-- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +++--- drivers/gpu/drm/ttm/ttm_lock.c | 4 ++-- drivers/gpu/drm/ttm/ttm_memory.c | 6 +++--- drivers/gpu/drm/ttm/ttm_module.c | 4 ++-- drivers/gpu/drm/ttm/ttm_object.c | 4 ++-- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++-- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 4 ++-- drivers/gpu/drm/ttm/ttm_tt.c | 12 ++++++------ drivers/gpu/drm/udl/udl_connector.c | 8 ++++---- drivers/gpu/drm/udl/udl_drv.c | 4 ++-- drivers/gpu/drm/udl/udl_encoder.c | 6 +++--- drivers/gpu/drm/udl/udl_fb.c | 8 ++++---- drivers/gpu/drm/udl/udl_gem.c | 2 +- drivers/gpu/drm/udl/udl_main.c | 2 +- drivers/gpu/drm/udl/udl_modeset.c | 6 +++--- drivers/gpu/drm/udl/udl_transfer.c | 2 +- drivers/gpu/drm/via/via_dma.c | 4 ++-- drivers/gpu/drm/via/via_dmablit.c | 4 ++-- drivers/gpu/drm/via/via_drv.c | 6 +++--- drivers/gpu/drm/via/via_drv.h | 2 +- drivers/gpu/drm/via/via_irq.c | 4 ++-- drivers/gpu/drm/via/via_map.c | 4 ++-- drivers/gpu/drm/via/via_mm.c | 4 ++-- drivers/gpu/drm/via/via_verifier.c | 4 ++-- drivers/gpu/drm/via/via_video.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 6 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 +++++----- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 18 +++++++++--------- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 ++++---- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- 374 files changed, 727 insertions(+), 727 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index 0912eeb..0250b60 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c@@ -28,8 +28,8 @@ #include <linux/module.h> #include <linux/console.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "ast_drv.h"
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index d4af9ed..aea4397 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h@@ -28,13 +28,13 @@ #ifndef __AST_DRV_H__ #define __AST_DRV_H__ -#include "drm_fb_helper.h" +#include <drm/drm_fb_helper.h> -#include "ttm/ttm_bo_api.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_memory.h" -#include "ttm/ttm_module.h" +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_memory.h> +#include <drm/ttm/ttm_module.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index d0d2792..d9ec779 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c@@ -37,9 +37,9 @@ #include <linux/init.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fb_helper.h> #include "ast_drv.h" static void ast_dirty_update(struct ast_fbdev *afbdev,
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 95ae55b..f668e6c 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c@@ -25,12 +25,12 @@ /* * Authors: Dave Airlie <airlied@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "ast_drv.h" -#include "drm_fb_helper.h" -#include "drm_crtc_helper.h" +#include <drm/drm_fb_helper.h> +#include <drm/drm_crtc_helper.h> #include "ast_dram_tables.h"
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 65f9d23..c58de5a 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c@@ -28,9 +28,9 @@ * Authors: Dave Airlie <airlied@redhat.com> */ #include <linux/export.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> #include "ast_drv.h" #include "ast_tables.h"
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 6edbee6..977cfb3 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c@@ -26,7 +26,7 @@ * Authors: Dave Airlie <airlied@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "ast_drv.h" #include "ast_dram_tables.h"
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index 6cf2ade..1a026ac 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c@@ -25,7 +25,7 @@ /* * Authors: Dave Airlie <airlied@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "ast_drv.h" #include <ttm/ttm_page_alloc.h>
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index 9afe495..c399dea 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c@@ -32,7 +32,7 @@ */ #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index be4e2bc..c314778 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c@@ -10,7 +10,7 @@ */ #include <linux/module.h> #include <linux/console.h> -#include "drmP.h" +#include <drm/drmP.h> #include "cirrus_drv.h"
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h
index 64ea597..7f0d71f 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.h
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.h@@ -15,11 +15,11 @@ #include <drm/drm_fb_helper.h> -#include "ttm/ttm_bo_api.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_memory.h" -#include "ttm/ttm_module.h" +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_memory.h> +#include <drm/ttm/ttm_module.h> #define DRIVER_AUTHOR "Matthew Garrett"
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
index 6aaada5..6c6b4c8 100644
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c@@ -9,8 +9,8 @@ * Dave Airlie */ #include <linux/module.h> -#include "drmP.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_fb_helper.h> #include <linux/fb.h>
diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c
index 5690d24..6a9b12e 100644
--- a/drivers/gpu/drm/cirrus/cirrus_main.c
+++ b/drivers/gpu/drm/cirrus/cirrus_main.c@@ -8,8 +8,8 @@ * Authors: Matthew Garrett * Dave Airlie */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "cirrus_drv.h"
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index c2373e9..fdefc55 100644
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c@@ -14,8 +14,8 @@ * * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com> */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <video/cirrus.h>
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 50e170f..bc83f83 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c@@ -25,7 +25,7 @@ /* * Authors: Dave Airlie <airlied@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "cirrus_drv.h" #include <ttm/ttm_page_alloc.h>
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 0cb2ba5..3d8fed1 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c@@ -31,7 +31,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/module.h> #include <linux/slab.h>
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index ba23790..3cedae1 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c@@ -33,7 +33,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> /** * Find the file with the given magic number.
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c
index 08ccefe..39a7183 100644
--- a/drivers/gpu/drm/drm_buffer.c
+++ b/drivers/gpu/drm/drm_buffer.c@@ -33,7 +33,7 @@ */ #include <linux/export.h> -#include "drm_buffer.h" +#include <drm/drm_buffer.h> /** * Allocate the drm buffer object.
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 348b367..c0b8547 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c@@ -38,7 +38,7 @@ #include <linux/log2.h> #include <linux/export.h> #include <asm/shmparam.h> -#include "drmP.h" +#include <drm/drmP.h> static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, struct drm_local_map *map)
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 08758e0..ec46982 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c@@ -29,7 +29,7 @@ */ #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> #if defined(CONFIG_X86) static void
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index affa629..45adf97 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c@@ -40,7 +40,7 @@ * needed by SiS driver's memory management. */ -#include "drmP.h" +#include <drm/drmP.h> /******************************************************************/ /** \name Context bitmap support */
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d6eab42..fc4cdc2 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c@@ -32,10 +32,10 @@ #include <linux/list.h> #include <linux/slab.h> #include <linux/export.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" -#include "drm_fourcc.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_fourcc.h> /* Avoid boilerplate. I'm tired of typing. */ #define DRM_ENUM_NAME_FN(fnname, list) \
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 3252e70..9c936ad3 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c@@ -32,12 +32,12 @@ #include <linux/export.h> #include <linux/moduleparam.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_fourcc.h" -#include "drm_crtc_helper.h" -#include "drm_fb_helper.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_edid.h> static bool drm_kms_helper_poll = true; module_param_named(poll, drm_kms_helper_poll, bool, 0600);
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 1c7a1c0..4a55a7b 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c@@ -34,7 +34,7 @@ #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> #if defined(CONFIG_DEBUG_FS)
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index cfb4e33..4c65103 100644
--- a/drivers/gpu/drm/drm_dma.c
+++ b/drivers/gpu/drm/drm_dma.c@@ -34,7 +34,7 @@ */ #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> /** * Initialize the DMA data.
diff --git a/drivers/gpu/drm/drm_dp_i2c_helper.c b/drivers/gpu/drm/drm_dp_i2c_helper.c
index f7eba0a..7f246f2 100644
--- a/drivers/gpu/drm/drm_dp_i2c_helper.c
+++ b/drivers/gpu/drm/drm_dp_i2c_helper.c@@ -27,8 +27,8 @@ #include <linux/errno.h> #include <linux/sched.h> #include <linux/i2c.h> -#include "drm_dp_helper.h" -#include "drmP.h" +#include <drm/drm_dp_helper.h> +#include <drm/drmP.h> /* Run a single AUX_CH I2C transaction, writing/reading data as necessary */ static int
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 8a9d079..7de37b1 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c@@ -49,8 +49,8 @@ #include <linux/debugfs.h> #include <linux/slab.h> #include <linux/export.h> -#include "drmP.h" -#include "drm_core.h" +#include <drm/drmP.h> +#include <drm/drm_core.h> static int drm_version(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index a8743c3..2f799f9 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c@@ -31,8 +31,8 @@ #include <linux/slab.h> #include <linux/i2c.h> #include <linux/module.h> -#include "drmP.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> #include "drm_edid_modes.h" #define version_greater(edid, maj, min) \
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 66d4a28..5b6fc12 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c@@ -21,10 +21,10 @@ #include <linux/module.h> #include <linux/firmware.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> static char edid_firmware[PATH_MAX]; module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644);
diff --git a/drivers/gpu/drm/drm_edid_modes.h b/drivers/gpu/drm/drm_edid_modes.h
index ff98a7e..fbd354c 100644
--- a/drivers/gpu/drm/drm_edid_modes.h
+++ b/drivers/gpu/drm/drm_edid_modes.h@@ -24,8 +24,8 @@ */ #include <linux/kernel.h> -#include "drmP.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> /* * Autogenerated from the DMT spec.
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index fb94355..63e7334 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c@@ -26,7 +26,7 @@ #include <linux/module.h> -#include "drm_encoder_slave.h" +#include <drm/drm_encoder_slave.h> /** * drm_i2c_encoder_init - Initialize an I2C slave encoder
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 5683b7f..8b029de 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c@@ -32,10 +32,10 @@ #include <linux/slab.h> #include <linux/fb.h> #include <linux/module.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_fb_helper.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_crtc_helper.h> MODULE_AUTHOR("David Airlie, Jesse Barnes"); MODULE_DESCRIPTION("DRM KMS helper");
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 123de28..3a3e490 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c@@ -34,7 +34,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/poll.h> #include <linux/slab.h> #include <linux/module.h>
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index d58e69d..6867d97 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c@@ -36,7 +36,7 @@ #include <linux/pagemap.h> #include <linux/shmem_fs.h> #include <linux/dma-buf.h> -#include "drmP.h" +#include <drm/drmP.h> /** @file drm_gem.c *
diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
index c87dc96..f731116 100644
--- a/drivers/gpu/drm/drm_global.c
+++ b/drivers/gpu/drm/drm_global.c@@ -31,7 +31,7 @@ #include <linux/mutex.h> #include <linux/slab.h> #include <linux/module.h> -#include "drm_global.h" +#include <drm/drm_global.h> struct drm_global_item { struct mutex mutex;
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c
index 68dc874..c3745c4 100644
--- a/drivers/gpu/drm/drm_hashtab.c
+++ b/drivers/gpu/drm/drm_hashtab.c@@ -32,8 +32,8 @@ * Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ -#include "drmP.h" -#include "drm_hashtab.h" +#include <drm/drmP.h> +#include <drm/drm_hashtab.h> #include <linux/hash.h> #include <linux/slab.h> #include <linux/export.h>
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index ab1162d..50afc9e 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c@@ -34,7 +34,7 @@ */ #include <linux/seq_file.h> -#include "drmP.h" +#include <drm/drmP.h> /** * Called when "/proc/dri/.../name" is read.
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 637fcc3..2f4c434 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c@@ -31,8 +31,8 @@ #include <linux/ratelimit.h> #include <linux/export.h> -#include "drmP.h" -#include "drm_core.h" +#include <drm/drmP.h> +#include <drm/drm_core.h> #define DRM_IOCTL_VERSION32 DRM_IOWR(0x00, drm_version32_t) #define DRM_IOCTL_GET_UNIQUE32 DRM_IOWR(0x01, drm_unique32_t)
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 64a62c6..aa70c0b2 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c@@ -33,11 +33,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_core.h" +#include <drm/drmP.h> +#include <drm/drm_core.h> -#include "linux/pci.h" -#include "linux/export.h" +#include <linux/pci.h> +#include <linux/export.h> /** * Get the bus id.
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index c798eea..f940b80 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c@@ -33,7 +33,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "drm_trace.h" #include <linux/interrupt.h> /* For task queue support */
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 5211520..29f2235 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c@@ -34,7 +34,7 @@ */ #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> static int drm_notifier(void *priv);
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index c86a0f1..126d50e 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c@@ -35,7 +35,7 @@ #include <linux/highmem.h> #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> #if __OS_HAS_AGP static void *agp_remap(unsigned long offset, unsigned long size,
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 961fb54..71ec94c 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c@@ -41,8 +41,8 @@ * Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ -#include "drmP.h" -#include "drm_mm.h" +#include <drm/drmP.h> +#include <drm/drm_mm.h> #include <linux/slab.h> #include <linux/seq_file.h> #include <linux/export.h>
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index c9b3e89..00fd6e3 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c@@ -33,8 +33,8 @@ #include <linux/list.h> #include <linux/list_sort.h> #include <linux/export.h> -#include "drmP.h" -#include "drm_crtc.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> /** * drm_mode_debug_printmodeline - debug print a mode
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 13f3d93..ba70844 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c@@ -40,7 +40,7 @@ #include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> /**********************************************************************/ /** \name PCI memory */
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 82431dc..aaeb6f8 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c@@ -26,7 +26,7 @@ */ #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> /** * Register.
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index f546ff9..7f12573 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c@@ -28,7 +28,7 @@ #include <linux/export.h> #include <linux/dma-buf.h> -#include "drmP.h" +#include <drm/drmP.h> /* * DMA-BUF/GEM Object references and lifetime overview:
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index fff8722..5b5532e 100644
--- a/drivers/gpu/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c@@ -40,7 +40,7 @@ #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> /*************************************************** * Initialization, etc.
diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c
index 7525e03..d87f60b 100644
--- a/drivers/gpu/drm/drm_scatter.c
+++ b/drivers/gpu/drm/drm_scatter.c@@ -33,7 +33,7 @@ #include <linux/vmalloc.h> #include <linux/slab.h> -#include "drmP.h" +#include <drm/drmP.h> #define DEBUG_SCATTER 0
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 21bcd4a..c236fd2 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c@@ -34,8 +34,8 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/slab.h> -#include "drmP.h" -#include "drm_core.h" +#include <drm/drmP.h> +#include <drm/drm_core.h> unsigned int drm_debug = 0; /* 1 to enable debug output */ EXPORT_SYMBOL(drm_debug);
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 45cf1dd..ccc7c48 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c@@ -18,9 +18,9 @@ #include <linux/err.h> #include <linux/export.h> -#include "drm_sysfs.h" -#include "drm_core.h" -#include "drmP.h" +#include <drm/drm_sysfs.h> +#include <drm/drm_core.h> +#include <drm/drmP.h> #define to_drm_minor(d) container_of(d, struct drm_minor, kdev) #define to_drm_connector(d) container_of(d, struct drm_connector, kdev)
diff --git a/drivers/gpu/drm/drm_trace_points.c b/drivers/gpu/drm/drm_trace_points.c
index 0d0eb90..3bbc4de 100644
--- a/drivers/gpu/drm/drm_trace_points.c
+++ b/drivers/gpu/drm/drm_trace_points.c@@ -1,4 +1,4 @@ -#include "drmP.h" +#include <drm/drmP.h> #define CREATE_TRACE_POINTS #include "drm_trace.h"
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
index 37c9a52..3cec306 100644
--- a/drivers/gpu/drm/drm_usb.c
+++ b/drivers/gpu/drm/drm_usb.c@@ -1,4 +1,4 @@ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/usb.h> #include <linux/module.h>
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 961ee08..85a8fa6 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c@@ -33,7 +33,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/export.h> #if defined(__ia64__) #include <linux/efi.h>
diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c
index 7e1051d..961a180 100644
--- a/drivers/gpu/drm/exynos/exynos_ddc.c
+++ b/drivers/gpu/drm/exynos/exynos_ddc.c@@ -11,7 +11,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/kernel.h> #include <linux/i2c.h>
diff --git a/drivers/gpu/drm/exynos/exynos_drm_buf.c b/drivers/gpu/drm/exynos/exynos_drm_buf.c
index 8c1d0c8..118c117 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_buf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_buf.c@@ -23,8 +23,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "exynos_drm.h" +#include <drm/drmP.h> +#include <drm/exynos_drm.h> #include "exynos_drm_drv.h" #include "exynos_drm_gem.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c
index bf791fa..8ec67dd 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_connector.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c@@ -25,8 +25,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c
index eaf630d..c1c1b38 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_core.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_core.c@@ -26,7 +26,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "exynos_drm_drv.h" #include "exynos_drm_encoder.h" #include "exynos_drm_connector.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 4afb625..e75dd18 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c@@ -26,8 +26,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "exynos_drm_crtc.h" #include "exynos_drm_drv.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
index 4fd7733..7c6ac695 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c@@ -23,7 +23,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "exynos_drm_drv.h" #include "exynos_drm_gem.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 760878a..fa5067a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c@@ -25,8 +25,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <drm/exynos_drm.h>
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index 23d5ad3..20e6dc1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c@@ -26,8 +26,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "exynos_drm_drv.h" #include "exynos_drm_crtc.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 4ccfe43..53afcc5 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c@@ -26,10 +26,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> #include "exynos_drm_drv.h" #include "exynos_drm_fb.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index d5586cc..be879c0 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c@@ -26,10 +26,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_fb_helper.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_crtc_helper.h> #include "exynos_drm_drv.h" #include "exynos_drm_fb.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 29fdbfe..93b6abed3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c@@ -11,7 +11,7 @@ * option) any later version. * */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/kernel.h> #include <linux/module.h>
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index d2d88f2..8f04f82 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c@@ -18,8 +18,8 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include "drmP.h" -#include "exynos_drm.h" +#include <drm/drmP.h> +#include <drm/exynos_drm.h> #include "exynos_drm_drv.h" #include "exynos_drm_gem.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 7368c28..a440783 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c@@ -23,7 +23,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/shmem_fs.h> #include <drm/exynos_drm.h>
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
index 5d9d2c2..a8d1f22 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c@@ -11,7 +11,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/kernel.h> #include <linux/wait.h>
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index c4c6525..968236a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c@@ -9,9 +9,9 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> -#include "exynos_drm.h" +#include <drm/exynos_drm.h> #include "exynos_drm_crtc.h" #include "exynos_drm_drv.h" #include "exynos_drm_encoder.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 7b9c153..b2e3115 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c@@ -10,7 +10,7 @@ * option) any later version. * */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/kernel.h> #include <linux/module.h>
@@ -18,8 +18,8 @@ #include <drm/exynos_drm.h> -#include "drm_edid.h" -#include "drm_crtc_helper.h" +#include <drm/drm_edid.h> +#include <drm/drm_crtc_helper.h> #include "exynos_drm_drv.h" #include "exynos_drm_crtc.h"
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index a137e9e..e939938 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c@@ -14,9 +14,9 @@ * */ -#include "drmP.h" -#include "drm_edid.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> +#include <drm/drm_crtc_helper.h> #include "regs-hdmi.h"
diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/drivers/gpu/drm/exynos/exynos_hdmiphy.c
index 9fe2995..0a8162b 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c@@ -11,7 +11,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/kernel.h> #include <linux/i2c.h>
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index e2147a2..71bf56a 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c@@ -14,7 +14,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "regs-mixer.h" #include "regs-vp.h"
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index b7e7b49..7db0e3b 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c@@ -20,7 +20,7 @@ #include <linux/backlight.h> #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index fc7d144..f3a1ae8 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c@@ -25,7 +25,7 @@ #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" int psb_gem_init_object(struct drm_gem_object *obj)
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index 973d7f6..badfcf2 100644
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c@@ -20,7 +20,7 @@ */ #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c
index f1cfdf1..62cd42e 100644
--- a/drivers/gpu/drm/gma500/intel_gmbus.c
+++ b/drivers/gpu/drm/gma500/intel_gmbus.c@@ -29,9 +29,9 @@ #include <linux/module.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include "drmP.h" +#include <drm/drmP.h> #include "psb_intel_drv.h" -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index b2a790b..64d18a3 100644
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c@@ -25,7 +25,7 @@ #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "mid_bios.h"
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index 0f9b7db..45a7ee9 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c@@ -22,7 +22,7 @@ #include <linux/dmi.h> #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index 5971bc8..7563cd5 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c@@ -20,7 +20,7 @@ #include <linux/backlight.h> #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index a8858a9..4cdc810 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c@@ -21,7 +21,7 @@ #include <drm/drmP.h> #include <drm/drm.h> -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "framebuffer.h" #include "psb_reg.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 1bd115e..b15282f 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h@@ -23,9 +23,9 @@ #include <linux/kref.h> #include <drm/drmP.h> -#include "drm_global.h" +#include <drm/drm_global.h> #include "gem_glue.h" -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_reg.h" #include "psb_intel_drv.h" #include "gtt.h"
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 6270e6a..1bb8956 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c@@ -29,11 +29,11 @@ #include <linux/i2c.h> #include <linux/slab.h> #include <linux/delay.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> #include "psb_intel_drv.h" -#include "gma_drm.h" +#include <drm/gma_drm.h> #include "psb_drv.h" #include "psb_intel_sdvo_regs.h" #include "psb_intel_reg.h"
diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h
index 17667b7..6738041 100644
--- a/drivers/gpu/drm/i2c/ch7006_priv.h
+++ b/drivers/gpu/drm/i2c/ch7006_priv.h@@ -27,10 +27,10 @@ #ifndef __DRM_I2C_CH7006_PRIV_H__ #define __DRM_I2C_CH7006_PRIV_H__ -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "drm_encoder_slave.h" -#include "i2c/ch7006.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_encoder_slave.h> +#include <drm/i2c/ch7006.h> typedef int64_t fixed; #define fixed1 (1LL << 32)
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
index b7d45ab..bebac0e 100644
--- a/drivers/gpu/drm/i2c/sil164_drv.c
+++ b/drivers/gpu/drm/i2c/sil164_drv.c@@ -26,10 +26,10 @@ #include <linux/module.h> -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "drm_encoder_slave.h" -#include "i2c/sil164.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_encoder_slave.h> +#include <drm/i2c/sil164.h> struct sil164_priv { struct sil164_encoder_params config;
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index cf11c2c..7d65ba9 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c@@ -30,8 +30,8 @@ * */ -#include "drmP.h" -#include "i810_drm.h" +#include <drm/drmP.h> +#include <drm/i810_drm.h> #include "i810_drv.h" #include <linux/interrupt.h> /* For task queue support */ #include <linux/delay.h>
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 9701bdf..c18df1f 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c@@ -32,11 +32,11 @@ #include <linux/module.h> -#include "drmP.h" -#include "i810_drm.h" +#include <drm/drmP.h> +#include <drm/i810_drm.h> #include "i810_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static struct pci_device_id pciidlist[] = { i810_PCI_IDS
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
index f051058..26b5314 100644
--- a/drivers/gpu/drm/i915/dvo.h
+++ b/drivers/gpu/drm/i915/dvo.h@@ -24,8 +24,8 @@ #define _INTEL_DVO_H #include <linux/i2c.h> -#include "drmP.h" -#include "drm_crtc.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> #include "intel_drv.h" struct intel_dvo_device {
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index cc9569d..0b7b583 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c@@ -30,10 +30,10 @@ #include <linux/debugfs.h> #include <linux/slab.h> #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> #include "intel_drv.h" #include "intel_ringbuffer.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" #define DRM_I915_RING_DEBUG 1
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2ba3613..d83c678f 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c@@ -28,11 +28,11 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" #include <linux/pci.h>
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index ed7b324..a53d8e8 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c@@ -28,14 +28,14 @@ */ #include <linux/device.h> -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_drv.h" #include <linux/console.h> #include <linux/module.h> -#include "drm_crtc_helper.h" +#include <drm/drm_crtc_helper.h> static int i915_modeset __read_mostly = -1; module_param_named(modeset, i915_modeset, int, 0400);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 32b741b..3d2a4c4 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c@@ -25,8 +25,8 @@ * */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c
index acb0872..ab418c02 100644
--- a/drivers/gpu/drm/i915/i915_gem_debug.c
+++ b/drivers/gpu/drm/i915/i915_gem_debug.c@@ -25,8 +25,8 @@ * */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #if WATCH_LISTS
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index aa308e1..af19959 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c@@ -23,7 +23,7 @@ * Authors: * Dave Airlie <airlied@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "i915_drv.h" #include <linux/dma-buf.h>
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index 2db948b..727398a 100644
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c@@ -26,9 +26,9 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "i915_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_trace.h" static bool
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index f9508a6..8989b5a 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c@@ -26,8 +26,8 @@ * */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9530bf2..2b92eb6 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c@@ -22,8 +22,8 @@ * */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index de023c1..8e91083 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c@@ -26,8 +26,8 @@ * */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" /*
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 4e61443..c2b7b67 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c@@ -25,10 +25,10 @@ * */ -#include "linux/string.h" -#include "linux/bitops.h" -#include "drmP.h" -#include "i915_drm.h" +#include <linux/string.h> +#include <linux/bitops.h> +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" /** @file i915_gem_tiling.c
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
index 4b697bb..3c59584 100644
--- a/drivers/gpu/drm/i915/i915_ioc32.c
+++ b/drivers/gpu/drm/i915/i915_ioc32.c@@ -31,8 +31,8 @@ */ #include <linux/compat.h> -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" typedef struct _drm_i915_batchbuffer32 {
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6b08891..70552f7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c@@ -30,8 +30,8 @@ #include <linux/sysrq.h> #include <linux/slab.h> -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index ed5e99b..1078a69 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c@@ -24,8 +24,8 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "intel_drv.h" #include "i915_reg.h"
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index f413899..bcbbaea 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c@@ -8,7 +8,7 @@ #include <linux/vga_switcheroo.h> #include <acpi/acpi_drivers.h> -#include "drmP.h" +#include <drm/drmP.h> #include "i915_drv.h" #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 9f3c4bb..c9f4667 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c@@ -26,8 +26,8 @@ */ #include <linux/dmi.h> #include <drm/drm_dp_helper.h> -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_bios.h"
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index dbda6e3..bf62234 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h@@ -28,7 +28,7 @@ #ifndef _I830_BIOS_H_ #define _I830_BIOS_H_ -#include "drmP.h" +#include <drm/drmP.h> struct vbt_header { u8 signature[20]; /**< Always starts with 'VBT$' */
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 02ac6ce..3f4a2a3 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c@@ -27,12 +27,12 @@ #include <linux/dmi.h> #include <linux/i2c.h> #include <linux/slab.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" /* Here's the desired hotplug mode */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a8538ac..ca933b9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c@@ -32,13 +32,13 @@ #include <linux/slab.h> #include <linux/vgaarb.h> #include <drm/drm_edid.h> -#include "drmP.h" +#include <drm/drmP.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" -#include "drm_dp_helper.h" -#include "drm_crtc_helper.h" +#include <drm/drm_dp_helper.h> +#include <drm/drm_crtc_helper.h> #include <linux/dma_remapping.h> #define HAS_eDP (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 926d8c1..cff5373 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c@@ -28,14 +28,14 @@ #include <linux/i2c.h> #include <linux/slab.h> #include <linux/export.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" -#include "drm_dp_helper.h" +#include <drm/drm_dp_helper.h> #define DP_RECEIVER_CAP_SIZE 0xf #define DP_LINK_STATUS_SIZE 6
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 3e09188..476bc6f 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h@@ -26,11 +26,11 @@ #define __INTEL_DRV_H__ #include <linux/i2c.h> -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_fb_helper.h" +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> #define _wait_for(COND, MS, W) ({ \ unsigned long timeout__ = jiffies + msecs_to_jiffies(MS); \
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 5e5b319..c961335 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c@@ -26,10 +26,10 @@ */ #include <linux/i2c.h> #include <linux/slab.h> -#include "drmP.h" -#include "drm_crtc.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" #include "dvo.h"
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 4a42637..70c87c5 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c@@ -36,11 +36,11 @@ #include <linux/init.h> #include <linux/vga_switcheroo.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fb_helper.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" static struct fb_ops intelfb_ops = {
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index f2ec7b6..315bab7 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c@@ -29,11 +29,11 @@ #include <linux/i2c.h> #include <linux/slab.h> #include <linux/delay.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 551d297..bce4e68 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c@@ -29,9 +29,9 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" struct gmbus_port {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 3123cb9..7e69273 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c@@ -31,11 +31,11 @@ #include <linux/dmi.h> #include <linux/i2c.h> #include <linux/slab.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" #include <linux/acpi.h>
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index d67ec3a..19829c8 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c@@ -27,8 +27,8 @@ #include <linux/i2c.h> #include <linux/fb.h> #include <drm/drm_edid.h> -#include "drmP.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> #include "intel_drv.h" #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 18bd0af..5cc624e 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c@@ -31,8 +31,8 @@ #include <linux/acpi_io.h> #include <acpi/video.h> -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index d03433c..3e7d8e8 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c@@ -25,8 +25,8 @@ * * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_reg.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 546a903..521f7d6 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c@@ -27,9 +27,9 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "i915_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_trace.h" #include "intel_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 9a5734f..025db1d 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c@@ -29,11 +29,11 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/export.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_sdvo_regs.h"
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 2a20fb0..2610d1b 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c@@ -29,11 +29,11 @@ * registers; newer ones are much simpler and we can use the new DRM plane * support. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_fourcc.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fourcc.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" static void
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index ab509d6..78cdf3e 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c@@ -30,11 +30,11 @@ * Integrated TV-out support for the 915GM and 945GM. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> #include "intel_drv.h" -#include "i915_drm.h" +#include <drm/i915_drm.h> #include "i915_drv.h" enum tv_margin {
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index 1e5a496..cc3166d 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c@@ -35,8 +35,8 @@ * \author Gareth Hughes <gareth@valinux.com> */ -#include "drmP.h" -#include "mga_drm.h" +#include <drm/drmP.h> +#include <drm/mga_drm.h> #include "mga_drv.h" #define MGA_DEFAULT_USEC_TIMEOUT 10000
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index c9bc5b7..111c7ae 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c@@ -31,11 +31,11 @@ #include <linux/module.h> -#include "drmP.h" -#include "mga_drm.h" +#include <drm/drmP.h> +#include <drm/mga_drm.h> #include "mga_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static int mga_driver_device_is_agp(struct drm_device *dev);
diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
index 67cc2a96..709e90d 100644
--- a/drivers/gpu/drm/mga/mga_ioc32.c
+++ b/drivers/gpu/drm/mga/mga_ioc32.c@@ -32,8 +32,8 @@ */ #include <linux/compat.h> -#include "drmP.h" -#include "mga_drm.h" +#include <drm/drmP.h> +#include <drm/mga_drm.h> typedef struct drm32_mga_init { int func;
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
index 89f88df..598c281 100644
--- a/drivers/gpu/drm/mga/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c@@ -31,8 +31,8 @@ * Eric Anholt <anholt@FreeBSD.org> */ -#include "drmP.h" -#include "mga_drm.h" +#include <drm/drmP.h> +#include <drm/mga_drm.h> #include "mga_drv.h" u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index 1f9fb5a..9c14514 100644
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c@@ -32,8 +32,8 @@ * Gareth Hughes <gareth@valinux.com> */ -#include "drmP.h" -#include "mga_drm.h" +#include <drm/drmP.h> +#include <drm/mga_drm.h> #include "mga_drv.h" /* ================================================================
diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c
index e38b173..0b76352 100644
--- a/drivers/gpu/drm/mga/mga_warp.c
+++ b/drivers/gpu/drm/mga/mga_warp.c@@ -32,8 +32,8 @@ #include <linux/platform_device.h> #include <linux/module.h> -#include "drmP.h" -#include "mga_drm.h" +#include <drm/drmP.h> +#include <drm/mga_drm.h> #include "mga_drv.h" #define FIRMWARE_G200 "matrox/g200_warp.fw"
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 1081458..1161f90 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c@@ -10,11 +10,11 @@ */ #include <linux/module.h> #include <linux/console.h> -#include "drmP.h" +#include <drm/drmP.h> #include "mgag200_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> /* * This is the generic driver code. This binds the driver to the drm core,
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 6f13b35..73868d0 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h@@ -15,12 +15,12 @@ #include <video/vga.h> -#include "drm/drm_fb_helper.h" -#include "ttm/ttm_bo_api.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_memory.h" -#include "ttm/ttm_module.h" +#include <drm/drm_fb_helper.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_memory.h> +#include <drm/ttm/ttm_module.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index 6015174..2f48648 100644
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c@@ -11,8 +11,8 @@ * Dave Airlie */ #include <linux/module.h> -#include "drmP.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_fb_helper.h> #include <linux/fb.h>
diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c
index 946da5a..5a88ec5 100644
--- a/drivers/gpu/drm/mgag200/mgag200_i2c.c
+++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c@@ -28,7 +28,7 @@ #include <linux/export.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include "drmP.h" +#include <drm/drmP.h> #include "mgag200_drv.h"
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index d65cb5e..d6a1aae 100644
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c@@ -10,8 +10,8 @@ * Matt Turner * Dave Airlie */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "mgag200_drv.h" static void mga_user_framebuffer_destroy(struct drm_framebuffer *fb)
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index a9cc3f4..9613ca5 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c@@ -13,8 +13,8 @@ #include <linux/delay.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "mgag200_drv.h"
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index b223dcb..1504699 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c@@ -25,7 +25,7 @@ /* * Authors: Dave Airlie <airlied@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "mgag200_drv.h" #include <ttm/ttm_page_alloc.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 4ed58ab..617b51c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c@@ -7,10 +7,10 @@ #include <acpi/acpi.h> #include <linux/mxm-wmi.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nv50_display.h" #include "nouveau_connector.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index fa22b28..2036748 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c@@ -33,9 +33,9 @@ #include <linux/backlight.h> #include <linux/acpi.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_reg.h" #include "nouveau_encoder.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 2f11e16..da20429 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c@@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #define NV_DEBUG_NOTRACE #include "nouveau_drv.h" #include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 7f80ed5..4ee2e7f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c@@ -27,10 +27,10 @@ * Jeremy Kolb <jkolb@brandeis.edu> */ -#include "drmP.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/drmP.h> +#include <drm/ttm/ttm_page_alloc.h> -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_calc.c b/drivers/gpu/drm/nouveau/nouveau_calc.c
index dad96cc..2c5eb5d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_calc.c
+++ b/drivers/gpu/drm/nouveau/nouveau_calc.c@@ -21,7 +21,7 @@ * SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 9d7c4c2..0cd61d3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c@@ -22,9 +22,9 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_dma.h" #include "nouveau_fifo.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7b11edb..abb92de 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c@@ -26,9 +26,9 @@ #include <acpi/button.h> -#include "drmP.h" -#include "drm_edid.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_reg.h" #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
index e485702..e1c1567 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h@@ -27,7 +27,7 @@ #ifndef __NOUVEAU_CONNECTOR_H__ #define __NOUVEAU_CONNECTOR_H__ -#include "drm_edid.h" +#include <drm/drm_edid.h> #include "nouveau_i2c.h" enum nouveau_underscan_type {
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index 188c92b..f68cb5e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c@@ -30,7 +30,7 @@ #include <linux/debugfs.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include <ttm/ttm_page_alloc.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 69688ef..4aeee5a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c@@ -24,8 +24,8 @@ * */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_fb.h" #include "nouveau_fbcon.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index fe11961..47d0412 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 7e289d2..898e5e3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_i2c.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index a061d0d..8356127 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c@@ -25,8 +25,8 @@ #include <linux/console.h> #include <linux/module.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_hw.h" #include "nouveau_fb.h"
@@ -35,7 +35,7 @@ #include "nouveau_fifo.h" #include "nv50_display.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> MODULE_PARM_DESC(agpmode, "AGP mode (0 to disable AGP)"); int nouveau_agpmode = -1;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 8613cb2..7b2a608 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h@@ -39,11 +39,11 @@ #define NOUVEAU_FAMILY 0x0000FFFF #define NOUVEAU_FLAGS 0xFFFF0000 -#include "ttm/ttm_bo_api.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_memory.h" -#include "ttm/ttm_module.h" +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_memory.h> +#include <drm/ttm/ttm_module.h> struct nouveau_fpriv { spinlock_t lock;
@@ -59,7 +59,7 @@ nouveau_fpriv(struct drm_file *file_priv) #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT) -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_reg.h" #include "nouveau_bios.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index 3dc14a3..db07b97 100644
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h@@ -27,7 +27,7 @@ #ifndef __NOUVEAU_ENCODER_H__ #define __NOUVEAU_ENCODER_H__ -#include "drm_encoder_slave.h" +#include <drm/drm_encoder_slave.h> #include "nouveau_drv.h" #define NV_DPMS_CLEARED 0x80
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index b1dd07d..7e41a40 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c@@ -38,12 +38,12 @@ #include <linux/vga_switcheroo.h> #include <linux/console.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "drm_fb_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_crtc.h" #include "nouveau_fb.h" #include "nouveau_fbcon.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h
index b73c29f8..1f2d278 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h@@ -27,7 +27,7 @@ #ifndef __NOUVEAU_FBCON_H__ #define __NOUVEAU_FBCON_H__ -#include "drm_fb_helper.h" +#include <drm/drm_fb_helper.h> #include "nouveau_fb.h" struct nouveau_fbdev {
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 2568b76..614df7b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include <linux/ktime.h> #include <linux/hrtimer.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 0af7b49..741a82a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c@@ -24,10 +24,10 @@ * */ #include <linux/dma-buf.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_dma.h" #include "nouveau_fence.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c
index 82c19e8..8881182 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_i2c.h" #include "nouveau_gpio.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
index c3de363..1e942cf 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hdmi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hdmi.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_connector.h" #include "nouveau_encoder.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c
index b87ad3b..6eabc2e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hw.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hw.c@@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.h b/drivers/gpu/drm/nouveau/nouveau_hw.h
index 2989090..06a66bc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hw.h
+++ b/drivers/gpu/drm/nouveau/nouveau_hw.h@@ -23,7 +23,7 @@ #ifndef __NOUVEAU_HW_H__ #define __NOUVEAU_HW_H__ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #define MASK(field) ( \
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index 77e5646..30f9045 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c@@ -24,7 +24,7 @@ #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_i2c.h" #include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index 1d08389..326bf5e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h@@ -25,7 +25,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include "drm_dp_helper.h" +#include <drm/drm_dp_helper.h> #define NV_I2C_PORT(n) (0x00 + (n)) #define NV_I2C_PORT_NUM 0x10
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
index 1d35fa8..aa3a067 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c@@ -33,7 +33,7 @@ #include <linux/compat.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 40f86ba..956a3ab 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c@@ -30,8 +30,8 @@ * Ben Skeggs <darktama@iinet.net.au> */ -#include "drmP.h" -#include "nouveau_drm.h" +#include <drm/drmP.h> +#include <drm/nouveau_drm.h> #include "nouveau_drv.h" #include "nouveau_reg.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 788e3a2..7f0afad 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c@@ -31,7 +31,7 @@ */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.c b/drivers/gpu/drm/nouveau/nouveau_mm.c
index b29ffb3..3e98806 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c
index 07d0d1e..d07f4a3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mxm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mxm.c@@ -24,7 +24,7 @@ #include <linux/acpi.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #define MXM_DBG(dev, fmt, args...) NV_DEBUG((dev), "MXM: " fmt, ##args)
diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index 815f0ec..0cce733 100644
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c@@ -25,7 +25,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index 2fb0981..4440ad7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c@@ -30,9 +30,9 @@ * Ben Skeggs <darktama@iinet.net.au> */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_fifo.h" #include "nouveau_ramht.h" #include "nouveau_software.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index ea6acf1..4946d30 100644
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index da3e7c3..7cf95b2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index 6fcb5ed..aef7181 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c@@ -22,10 +22,10 @@ * Authors: Dave Airlie */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_dma.h" #include <linux/dma-buf.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/nouveau_ramht.c
index a24a81f..0ebb62f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ramht.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 38483a0..9d76a82 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c@@ -1,4 +1,4 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include <linux/pagemap.h> #include <linux/slab.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 2dbe91c..4643416 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c@@ -25,13 +25,13 @@ #include <linux/swab.h> #include <linux/slab.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_fbcon.h" #include "nouveau_ramht.h" #include "nouveau_gpio.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 0f5a301..1ad411d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c@@ -24,7 +24,7 @@ #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index bd35f93..48de8dd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c@@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c
index 11edd5e..4c8d139 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.h b/drivers/gpu/drm/nouveau/nouveau_vm.h
index a8246e7..3cdf600 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_vm.h@@ -25,7 +25,7 @@ #ifndef __NOUVEAU_VM_H__ #define __NOUVEAU_VM_H__ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_volt.c b/drivers/gpu/drm/nouveau/nouveau_volt.c
index b010cb9..fbc3a1e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_volt.c
+++ b/drivers/gpu/drm/nouveau/nouveau_volt.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
index 4c31c63..eee31e7 100644
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c@@ -23,8 +23,8 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_encoder.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_cursor.c b/drivers/gpu/drm/nouveau/nv04_cursor.c
index 2efa40e..6463870 100644
--- a/drivers/gpu/drm/nouveau/nv04_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv04_cursor.c@@ -1,4 +1,4 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_reg.h" #include "nouveau_drv.h" #include "nouveau_crtc.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index 8300266..9428dd2 100644
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c@@ -24,8 +24,8 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_encoder.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c
index 2258746..3a139c4 100644
--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
+++ b/drivers/gpu/drm/nouveau/nv04_dfp.c@@ -24,8 +24,8 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_encoder.h"
@@ -34,7 +34,7 @@ #include "nouveau_hw.h" #include "nvreg.h" -#include "i2c/sil164.h" +#include <drm/i2c/sil164.h> #define FP_TG_CONTROL_ON (NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS | \ NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS | \
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index 5da848e..ea1e47a 100644
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c@@ -22,8 +22,8 @@ * Author: Ben Skeggs */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_fb.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_fb.c b/drivers/gpu/drm/nouveau/nv04_fb.c
index c36c2c8..375f553 100644
--- a/drivers/gpu/drm/nouveau/nv04_fb.c
+++ b/drivers/gpu/drm/nouveau/nv04_fb.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> int nv04_fb_vram_init(struct drm_device *dev)
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
index 7cd7857..fc53a39 100644
--- a/drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c@@ -22,7 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c
index abe89db..aa68592 100644
--- a/drivers/gpu/drm/nouveau/nv04_fence.c
+++ b/drivers/gpu/drm/nouveau/nv04_fence.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
index fe627ac..65f966d 100644
--- a/drivers/gpu/drm/nouveau/nv04_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv04_fifo.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index e055c4e..68cce60 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c@@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "nouveau_drm.h" +#include <drm/drmP.h> +#include <drm/nouveau_drm.h> #include "nouveau_drv.h" #include "nouveau_hw.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index 97353d3..a9e3800 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv04_instmem.c@@ -1,4 +1,4 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_mc.c b/drivers/gpu/drm/nouveau/nv04_mc.c
index f30e1d8..83751e7 100644
--- a/drivers/gpu/drm/nouveau/nv04_mc.c
+++ b/drivers/gpu/drm/nouveau/nv04_mc.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> int nv04_mc_init(struct drm_device *dev)
diff --git a/drivers/gpu/drm/nouveau/nv04_pm.c b/drivers/gpu/drm/nouveau/nv04_pm.c
index 6e75899..435b5a8 100644
--- a/drivers/gpu/drm/nouveau/nv04_pm.c
+++ b/drivers/gpu/drm/nouveau/nv04_pm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_hw.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_software.c b/drivers/gpu/drm/nouveau/nv04_software.c
index 0c41abf..02509e7 100644
--- a/drivers/gpu/drm/nouveau/nv04_software.c
+++ b/drivers/gpu/drm/nouveau/nv04_software.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv04_timer.c b/drivers/gpu/drm/nouveau/nv04_timer.c
index ffbe30f..71ad319 100644
--- a/drivers/gpu/drm/nouveau/nv04_timer.c
+++ b/drivers/gpu/drm/nouveau/nv04_timer.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_hw.h" int
diff --git a/drivers/gpu/drm/nouveau/nv04_tv.c b/drivers/gpu/drm/nouveau/nv04_tv.c
index 3eb605d..7157d40 100644
--- a/drivers/gpu/drm/nouveau/nv04_tv.c
+++ b/drivers/gpu/drm/nouveau/nv04_tv.c@@ -24,15 +24,15 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_encoder.h" #include "nouveau_connector.h" #include "nouveau_crtc.h" #include "nouveau_hw.h" -#include "drm_crtc_helper.h" +#include <drm/drm_crtc_helper.h> -#include "i2c/ch7006.h" +#include <drm/i2c/ch7006.h> static struct i2c_board_info nv04_tv_encoder_info[] = { {
diff --git a/drivers/gpu/drm/nouveau/nv10_fb.c b/drivers/gpu/drm/nouveau/nv10_fb.c
index 55fdbc2..510e90f 100644
--- a/drivers/gpu/drm/nouveau/nv10_fb.c
+++ b/drivers/gpu/drm/nouveau/nv10_fb.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> void nv10_fb_init_tile_region(struct drm_device *dev, int i, uint32_t addr,
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c
index 8a1b750..d30f752 100644
--- a/drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/drivers/gpu/drm/nouveau/nv10_fence.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs <bskeggs@redhat.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c b/drivers/gpu/drm/nouveau/nv10_fifo.c
index e192bba..05a2499 100644
--- a/drivers/gpu/drm/nouveau/nv10_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv10_fifo.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c
index 9d79180..ecc1b62 100644
--- a/drivers/gpu/drm/nouveau/nv10_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv10_gpio.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_hw.h" #include "nouveau_gpio.h"
diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/nv10_graph.c
index f3ef22a..75dd51b 100644
--- a/drivers/gpu/drm/nouveau/nv10_graph.c
+++ b/drivers/gpu/drm/nouveau/nv10_graph.c@@ -22,8 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "nouveau_drm.h" +#include <drm/drmP.h> +#include <drm/nouveau_drm.h> #include "nouveau_drv.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv17_fifo.c b/drivers/gpu/drm/nouveau/nv17_fifo.c
index 7128e66..4ae61ae 100644
--- a/drivers/gpu/drm/nouveau/nv17_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv17_fifo.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 696d7e7..fe67156 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c@@ -24,8 +24,8 @@ * */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_encoder.h" #include "nouveau_connector.h"
diff --git a/drivers/gpu/drm/nouveau/nv17_tv_modes.c b/drivers/gpu/drm/nouveau/nv17_tv_modes.c
index 4d1d29f..96e4286 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv_modes.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv_modes.c@@ -24,8 +24,8 @@ * */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_encoder.h" #include "nouveau_crtc.h"
diff --git a/drivers/gpu/drm/nouveau/nv20_fb.c b/drivers/gpu/drm/nouveau/nv20_fb.c
index 522e4da..5fffc21 100644
--- a/drivers/gpu/drm/nouveau/nv20_fb.c
+++ b/drivers/gpu/drm/nouveau/nv20_fb.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> static struct drm_mm_node * nv20_fb_alloc_tag(struct drm_device *dev, uint32_t size)
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
index 1856caa1..ffaab0b 100644
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/nv20_graph.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> /* * NV20
diff --git a/drivers/gpu/drm/nouveau/nv30_fb.c b/drivers/gpu/drm/nouveau/nv30_fb.c
index bbc5a8a..9cc4de8 100644
--- a/drivers/gpu/drm/nouveau/nv30_fb.c
+++ b/drivers/gpu/drm/nouveau/nv30_fb.c@@ -24,9 +24,9 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> void nv30_fb_init_tile_region(struct drm_device *dev, int i, uint32_t addr,
diff --git a/drivers/gpu/drm/nouveau/nv31_mpeg.c b/drivers/gpu/drm/nouveau/nv31_mpeg.c
index 5f239bf..818deb6 100644
--- a/drivers/gpu/drm/nouveau/nv31_mpeg.c
+++ b/drivers/gpu/drm/nouveau/nv31_mpeg.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv40_fb.c b/drivers/gpu/drm/nouveau/nv40_fb.c
index c901cef..88b4f7c 100644
--- a/drivers/gpu/drm/nouveau/nv40_fb.c
+++ b/drivers/gpu/drm/nouveau/nv40_fb.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> void nv40_fb_set_tile_region(struct drm_device *dev, int i)
diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/nv40_fifo.c
index c75ff45..cf952d2 100644
--- a/drivers/gpu/drm/nouveau/nv40_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv40_fifo.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index d2951e7..5489201 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv40_grctx.c b/drivers/gpu/drm/nouveau/nv40_grctx.c
index be0a747..cf115ad 100644
--- a/drivers/gpu/drm/nouveau/nv40_grctx.c
+++ b/drivers/gpu/drm/nouveau/nv40_grctx.c@@ -109,7 +109,7 @@ #define CP_LOAD_MAGIC_NV44TCL 0x00800029 /* per-vs state (0x4497) */ #define CP_LOAD_MAGIC_NV40TCL 0x00800041 /* per-vs state (0x4097) */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_grctx.h"
diff --git a/drivers/gpu/drm/nouveau/nv40_mc.c b/drivers/gpu/drm/nouveau/nv40_mc.c
index 61a2424..7885843 100644
--- a/drivers/gpu/drm/nouveau/nv40_mc.c
+++ b/drivers/gpu/drm/nouveau/nv40_mc.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> int nv40_mc_init(struct drm_device *dev)
diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c
index e66273a..b94dd87 100644
--- a/drivers/gpu/drm/nouveau/nv40_pm.c
+++ b/drivers/gpu/drm/nouveau/nv40_pm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_bios.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_calc.c b/drivers/gpu/drm/nouveau/nv50_calc.c
index 8cf63a8..4d019eb 100644
--- a/drivers/gpu/drm/nouveau/nv50_calc.c
+++ b/drivers/gpu/drm/nouveau/nv50_calc.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index 7fa8673..808df6c 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c@@ -24,8 +24,8 @@ * */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
index 01434c0..b290b7b 100644
--- a/drivers/gpu/drm/nouveau/nv50_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv50_cursor.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
index eb216a4..5a637b0 100644
--- a/drivers/gpu/drm/nouveau/nv50_dac.c
+++ b/drivers/gpu/drm/nouveau/nv50_dac.c@@ -24,8 +24,8 @@ * */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 5c41612..cde2e20 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c@@ -33,7 +33,7 @@ #include "nouveau_fbcon.h" #include "nouveau_ramht.h" #include "nouveau_software.h" -#include "drm_crtc_helper.h" +#include <drm/drm_crtc_helper.h> static void nv50_display_isr(struct drm_device *); static void nv50_display_bh(unsigned long);
diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h
index 016f574..009ec2a8 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.h
+++ b/drivers/gpu/drm/nouveau/nv50_display.h@@ -27,7 +27,7 @@ #ifndef __NV50_DISPLAY_H__ #define __NV50_DISPLAY_H__ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
index ddcd555..dabcd87 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c
index a33f98b..befd5fb 100644
--- a/drivers/gpu/drm/nouveau/nv50_fb.c
+++ b/drivers/gpu/drm/nouveau/nv50_fb.c@@ -1,6 +1,6 @@ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> #include "nouveau_fifo.h" struct nv50_fb_priv {
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index e3c8b05..ec24959 100644
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c
index a61fa13..5a440e8 100644
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv50_fifo.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c
index f429e6a..9d3c8d0 100644
--- a/drivers/gpu/drm/nouveau/nv50_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv50_gpio.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_hw.h" #include "nouveau_gpio.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index dcc4933..d3ceb87 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/nv50_grctx.c
index 881e22b..3bb96a0 100644
--- a/drivers/gpu/drm/nouveau/nv50_grctx.c
+++ b/drivers/gpu/drm/nouveau/nv50_grctx.c@@ -105,7 +105,7 @@ #define CP_SEEK_1 0x00c000ff #define CP_SEEK_2 0x00c800ff -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_grctx.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 126fbb6..05eff57 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c@@ -25,7 +25,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_mc.c b/drivers/gpu/drm/nouveau/nv50_mc.c
index c07490f..a739c2a 100644
--- a/drivers/gpu/drm/nouveau/nv50_mc.c
+++ b/drivers/gpu/drm/nouveau/nv50_mc.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" int
diff --git a/drivers/gpu/drm/nouveau/nv50_mpeg.c b/drivers/gpu/drm/nouveau/nv50_mpeg.c
index 90e8ed2..e11bb54 100644
--- a/drivers/gpu/drm/nouveau/nv50_mpeg.c
+++ b/drivers/gpu/drm/nouveau/nv50_mpeg.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index d020ed4..07593fd 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_bios.h" #include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_software.c b/drivers/gpu/drm/nouveau/nv50_software.c
index 114d251..25a1337 100644
--- a/drivers/gpu/drm/nouveau/nv50_software.c
+++ b/drivers/gpu/drm/nouveau/nv50_software.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index a9514ea..df4f578 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c@@ -24,8 +24,8 @@ * */ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) #include "nouveau_reg.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
index 179bb42..c9fdfb4 100644
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_vram.c b/drivers/gpu/drm/nouveau/nv50_vram.c
index 9ed9ae39..e2a1af7 100644
--- a/drivers/gpu/drm/nouveau/nv50_vram.c
+++ b/drivers/gpu/drm/nouveau/nv50_vram.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nv84_bsp.c b/drivers/gpu/drm/nouveau/nv84_bsp.c
index 7487573..a4f4d4a 100644
--- a/drivers/gpu/drm/nouveau/nv84_bsp.c
+++ b/drivers/gpu/drm/nouveau/nv84_bsp.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nv84_crypt.c b/drivers/gpu/drm/nouveau/nv84_crypt.c
index edece9c..c986439 100644
--- a/drivers/gpu/drm/nouveau/nv84_crypt.c
+++ b/drivers/gpu/drm/nouveau/nv84_crypt.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index c2f889b..60dd73d 100644
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_fifo.h"
diff --git a/drivers/gpu/drm/nouveau/nv84_fifo.c b/drivers/gpu/drm/nouveau/nv84_fifo.c
index f6d77fc..1b53024 100644
--- a/drivers/gpu/drm/nouveau/nv84_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv84_fifo.c@@ -24,7 +24,7 @@ * */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_fifo.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nv84_vp.c b/drivers/gpu/drm/nouveau/nv84_vp.c
index 6570d30..0dec495 100644
--- a/drivers/gpu/drm/nouveau/nv84_vp.c
+++ b/drivers/gpu/drm/nouveau/nv84_vp.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nv98_crypt.c b/drivers/gpu/drm/nouveau/nv98_crypt.c
index e25e13f..6f4c153 100644
--- a/drivers/gpu/drm/nouveau/nv98_crypt.c
+++ b/drivers/gpu/drm/nouveau/nv98_crypt.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h"
diff --git a/drivers/gpu/drm/nouveau/nv98_ppp.c b/drivers/gpu/drm/nouveau/nv98_ppp.c
index a987dd6..1847963 100644
--- a/drivers/gpu/drm/nouveau/nv98_ppp.c
+++ b/drivers/gpu/drm/nouveau/nv98_ppp.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.c b/drivers/gpu/drm/nouveau/nva3_copy.c
index 0387dc7..7801cbd 100644
--- a/drivers/gpu/drm/nouveau/nva3_copy.c
+++ b/drivers/gpu/drm/nouveau/nva3_copy.c@@ -23,7 +23,7 @@ */ #include <linux/firmware.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c
index 7988293..9258524 100644
--- a/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/drivers/gpu/drm/nouveau/nva3_pm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_bios.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_copy.c b/drivers/gpu/drm/nouveau/nvc0_copy.c
index dddf006..88a922d 100644
--- a/drivers/gpu/drm/nouveau/nvc0_copy.c
+++ b/drivers/gpu/drm/nouveau/nvc0_copy.c@@ -23,7 +23,7 @@ */ #include <linux/firmware.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_util.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_fb.c b/drivers/gpu/drm/nouveau/nvc0_fb.c
index a58203a..7459448 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fb.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fb.c@@ -22,9 +22,9 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" -#include "nouveau_drm.h" +#include <drm/nouveau_drm.h> struct nvc0_fb_priv { struct page *r100c10_page;
diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index 797159e..ade005f 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_fence.c b/drivers/gpu/drm/nouveau/nvc0_fence.c
index 47ab388..2e666d0 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fence.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fence.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_dma.h" #include "nouveau_fifo.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c
index 7d85553..69c359c 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fifo.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fifo.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index 2a01e6e..59670ac 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c@@ -25,7 +25,7 @@ #include <linux/firmware.h> #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c
index de77842..2f17654 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grctx.c
+++ b/drivers/gpu/drm/nouveau/nvc0_grctx.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h" #include "nvc0_graph.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_instmem.c b/drivers/gpu/drm/nouveau/nvc0_instmem.c
index b701c43..f5fac7c 100644
--- a/drivers/gpu/drm/nouveau/nvc0_instmem.c
+++ b/drivers/gpu/drm/nouveau/nvc0_instmem.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_pm.c b/drivers/gpu/drm/nouveau/nvc0_pm.c
index 7c95c44..122292f 100644
--- a/drivers/gpu/drm/nouveau/nvc0_pm.c
+++ b/drivers/gpu/drm/nouveau/nvc0_pm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_bios.h" #include "nouveau_pm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_software.c b/drivers/gpu/drm/nouveau/nvc0_software.c
index 93e8c16..940652e 100644
--- a/drivers/gpu/drm/nouveau/nvc0_software.c
+++ b/drivers/gpu/drm/nouveau/nvc0_software.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_ramht.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_vm.c b/drivers/gpu/drm/nouveau/nvc0_vm.c
index 30d2bd5..fad3383 100644
--- a/drivers/gpu/drm/nouveau/nvc0_vm.c
+++ b/drivers/gpu/drm/nouveau/nvc0_vm.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_vm.h"
diff --git a/drivers/gpu/drm/nouveau/nvc0_vram.c b/drivers/gpu/drm/nouveau/nvc0_vram.c
index a7eef89..4d62a1d 100644
--- a/drivers/gpu/drm/nouveau/nvc0_vram.c
+++ b/drivers/gpu/drm/nouveau/nvc0_vram.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index c486d3c..9ef0097 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c@@ -24,8 +24,8 @@ #include <linux/dma-mapping.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "nouveau_drv.h" #include "nouveau_connector.h"
diff --git a/drivers/gpu/drm/nouveau/nve0_fifo.c b/drivers/gpu/drm/nouveau/nve0_fifo.c
index 1855ecb..78fb27e 100644
--- a/drivers/gpu/drm/nouveau/nve0_fifo.c
+++ b/drivers/gpu/drm/nouveau/nve0_fifo.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nve0_graph.c b/drivers/gpu/drm/nouveau/nve0_graph.c
index 8a8051b..b784a8b 100644
--- a/drivers/gpu/drm/nouveau/nve0_graph.c
+++ b/drivers/gpu/drm/nouveau/nve0_graph.c@@ -25,7 +25,7 @@ #include <linux/firmware.h> #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h"
diff --git a/drivers/gpu/drm/nouveau/nve0_grctx.c b/drivers/gpu/drm/nouveau/nve0_grctx.c
index d8cb360..d3a8029 100644
--- a/drivers/gpu/drm/nouveau/nve0_grctx.c
+++ b/drivers/gpu/drm/nouveau/nve0_grctx.c@@ -22,7 +22,7 @@ * Authors: Ben Skeggs */ -#include "drmP.h" +#include <drm/drmP.h> #include "nouveau_drv.h" #include "nouveau_mm.h" #include "nve0_graph.h"
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 47d3b1c..d4660cf 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c@@ -34,8 +34,8 @@ #include <linux/slab.h> #include <linux/module.h> -#include "drmP.h" -#include "r128_drm.h" +#include <drm/drmP.h> +#include <drm/r128_drm.h> #include "r128_drv.h" #define R128_FIFO_DEBUG 0
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index b362a66..ba8b4c0 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c@@ -31,11 +31,11 @@ #include <linux/module.h> -#include "drmP.h" -#include "r128_drm.h" +#include <drm/drmP.h> +#include <drm/r128_drm.h> #include "r128_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static struct pci_device_id pciidlist[] = { r128_PCI_IDS
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
index b7fe638..a954c54 100644
--- a/drivers/gpu/drm/r128/r128_ioc32.c
+++ b/drivers/gpu/drm/r128/r128_ioc32.c@@ -31,8 +31,8 @@ */ #include <linux/compat.h> -#include "drmP.h" -#include "r128_drm.h" +#include <drm/drmP.h> +#include <drm/r128_drm.h> typedef struct drm_r128_init32 { int func;
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
index 4d8fdb6..2ea4f09 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c@@ -30,8 +30,8 @@ * Eric Anholt <anholt@FreeBSD.org> */ -#include "drmP.h" -#include "r128_drm.h" +#include <drm/drmP.h> +#include <drm/r128_drm.h> #include "r128_drv.h" u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index 9fd939d..19bb7e6 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c@@ -28,8 +28,8 @@ * Gareth Hughes <gareth@valinux.com> */ -#include "drmP.h" -#include "r128_drm.h" +#include <drm/drmP.h> +#include <drm/r128_drm.h> #include "r128_drv.h" /* ================================================================
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h
index 25fea63..feba6b8 100644
--- a/drivers/gpu/drm/radeon/atom.h
+++ b/drivers/gpu/drm/radeon/atom.h@@ -26,7 +26,7 @@ #define ATOM_H #include <linux/types.h> -#include "drmP.h" +#include <drm/drmP.h> #define ATOM_BIOS_MAGIC 0xAA55 #define ATOM_ATI_MAGIC_PTR 0x30
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 5131b3b..f61ba55 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c@@ -23,13 +23,13 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h" #include "atom-bits.h" -#include "drm_dp_helper.h" +#include <drm/drm_dp_helper.h> /* move these to drm_dp_helper.c/h */ #define DP_LINK_CONFIGURATION_SIZE 9
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index 486ccdf..f3b2f7b 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c@@ -23,9 +23,9 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon/atombios_i2c.c
index 44d87b6..082338d 100644
--- a/drivers/gpu/drm/radeon/atombios_i2c.c
+++ b/drivers/gpu/drm/radeon/atombios_i2c.c@@ -22,8 +22,8 @@ * Authors: Alex Deucher * */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 7fb3d2e..50d85e6 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c@@ -24,10 +24,10 @@ #include <linux/firmware.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "evergreend.h" #include "atom.h" #include "avivod.h"
diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
index de46d12..88e0e8a 100644
--- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c
+++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c@@ -24,8 +24,8 @@ * Alex Deucher <alexander.deucher@amd.com> */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "evergreend.h"
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index c1655412..76ad6c1 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c@@ -25,7 +25,7 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "evergreend.h" #include "evergreen_reg_safe.h"
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index 65c5416..327c08b 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c@@ -24,8 +24,8 @@ * Authors: Christian König * Rafał Miłecki */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_asic.h" #include "evergreend.h"
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index b7bf18e..2ce1c04 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c@@ -25,10 +25,10 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "nid.h" #include "atom.h" #include "ni_reg.h"
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index af732ad..46ece99 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c@@ -27,8 +27,8 @@ */ #include <linux/seq_file.h> #include <linux/slab.h> -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h" #include "radeon_asic.h"
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index 46a357d..66c93d0 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c@@ -25,8 +25,8 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h" #include "radeon_asic.h"
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 97722a3..4e79fd0 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c@@ -33,7 +33,7 @@ #include "radeon_reg.h" #include "radeon.h" #include "radeon_asic.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "r100_track.h" #include "r300d.h" #include "rv350d.h"
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 535d11a..002ab03 100644
--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c@@ -31,9 +31,9 @@ * Nicolai Haehnle <prefect_@gmx.net> */ -#include "drmP.h" -#include "drm_buffer.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_buffer.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" #include "r300_reg.h"
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 99137be..a432f35 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c@@ -27,7 +27,7 @@ */ #include <linux/seq_file.h> #include <linux/slab.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon_reg.h" #include "radeon.h" #include "radeon_asic.h"
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index b5cf837..dd0c5d7 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c@@ -25,7 +25,7 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index bff6272..ede970d 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c@@ -30,8 +30,8 @@ #include <linux/firmware.h> #include <linux/platform_device.h> #include <linux/module.h> -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_asic.h" #include "radeon_mode.h"
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 79b5591..cb03fe2 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c@@ -23,7 +23,7 @@ * * Authors: Christian König */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_reg.h" #include "radeon_asic.h"
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
index 689a631..26ace56 100644
--- a/drivers/gpu/drm/radeon/r600_blit.c
+++ b/drivers/gpu/drm/radeon/r600_blit.c@@ -23,8 +23,8 @@ * Authors: * Alex Deucher <alexander.deucher@amd.com> */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" #include "r600_blit_shaders.h"
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
index fc8f367..7e4e9af 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c@@ -23,8 +23,8 @@ * */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "r600d.h"
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index 44376bb..2514123 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c@@ -28,8 +28,8 @@ #include <linux/module.h> -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" #define PFP_UCODE_SIZE 576
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index ca87f7a..b4f53d3 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c@@ -26,7 +26,7 @@ * Jerome Glisse */ #include <linux/kernel.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "r600d.h" #include "r600_reg_safe.h"
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 82a0a4c..0de5e3f 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c@@ -23,8 +23,8 @@ * * Authors: Christian König */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_asic.h" #include "r600d.h"
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
index bbe3e25..215063e 100644
--- a/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c@@ -4,8 +4,8 @@ #include <acpi/acpi_drivers.h> #include <acpi/acpi_bus.h> -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "radeon.h" #include <linux/vga_switcheroo.h>
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
index 6ecd6f6..10ea17a 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c@@ -24,9 +24,9 @@ * Dave Airlie * Jerome Glisse <glisse@freedesktop.org> */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #if __OS_HAS_AGP
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index b1e3820..a25b95e 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c@@ -23,8 +23,8 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 501f488..1b8ab04 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c@@ -25,7 +25,7 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon_reg.h" #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c
index 9c6b29a..38e396d 100644
--- a/drivers/gpu/drm/radeon/radeon_clocks.c
+++ b/drivers/gpu/drm/radeon/radeon_clocks.c@@ -25,8 +25,8 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 576f4f6..a4ef1ee 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c@@ -24,8 +24,8 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 2914c57..cdb6da9 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c@@ -23,11 +23,11 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "drm_edid.h" -#include "drm_crtc_helper.h" -#include "drm_fb_helper.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 0c6f0c3..8b2797d 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c@@ -31,8 +31,8 @@ #include <linux/module.h> -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" #include "r300_reg.h"
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 142f894..3894632 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c@@ -24,8 +24,8 @@ * Authors: * Jerome Glisse <glisse@freedesktop.org> */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h"
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index 42acc64..1be849a 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c@@ -23,8 +23,8 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #define CURSOR_WIDTH 64
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 64a008d1..42e6d32 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c@@ -23,15 +23,15 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h" #include <asm/div64.h> -#include "drm_crtc_helper.h" -#include "drm_edid.h" +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> static void avivo_crtc_load_lut(struct drm_crtc *crtc) {
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 6d81a2d..6be49a5 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c@@ -29,11 +29,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> #include <linux/console.h> #include <linux/module.h>
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 7467069..5a1bae3 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c@@ -23,9 +23,9 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 36a412c..fae4937 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c@@ -27,13 +27,13 @@ #include <linux/slab.h> #include <linux/fb.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/radeon_drm.h> #include "radeon.h" -#include "drm_fb_helper.h" +#include <drm/drm_fb_helper.h> #include <linux/vga_switcheroo.h>
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 7c54020..3406aca 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c@@ -34,7 +34,7 @@ #include <linux/list.h> #include <linux/kref.h> #include <linux/slab.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon_reg.h" #include "radeon.h" #include "radeon_trace.h"
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index 84b648a..9fb3ae6 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c@@ -25,8 +25,8 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_reg.h"
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index de9fd1f..466c506 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c@@ -25,8 +25,8 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" int radeon_gem_object_init(struct drm_gem_object *obj)
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 3edec1c..c5bddd6 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c@@ -25,9 +25,9 @@ */ #include <linux/export.h> -#include "drmP.h" -#include "drm_edid.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_edid.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
index 5f2f401..8fc81a2 100644
--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c@@ -29,8 +29,8 @@ */ #include <linux/compat.h> -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" typedef struct drm_radeon_init32 {
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
index 9d0f1a9..e771033 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c@@ -30,8 +30,8 @@ * Michel D�zer <michel@daenzer.net> */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 5df58d1..f50f600 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c@@ -25,9 +25,9 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 7ee1d63..0d2c63f 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c@@ -25,9 +25,9 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include <linux/vga_switcheroo.h> #include <linux/slab.h>
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index a0c8222..840f188 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c@@ -23,9 +23,9 @@ * Authors: Dave Airlie * Alex Deucher */ -#include "drmP.h" -#include "drm_crtc_helper.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h" #include <linux/backlight.h>
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c
index b37ec0f..49750d0 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c@@ -1,5 +1,5 @@ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "radeon.h" /*
diff --git a/drivers/gpu/drm/radeon/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c
index 64f59a0..b9f0672 100644
--- a/drivers/gpu/drm/radeon/radeon_mem.c
+++ b/drivers/gpu/drm/radeon/radeon_mem.c@@ -29,8 +29,8 @@ * Keith Whitwell <keith@tungstengraphics.com> */ -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" /* Very simple allocator for GART memory, working on a static range
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index ac617e1..1dd06ab 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h@@ -30,11 +30,11 @@ #ifndef RADEON_MODE_H #define RADEON_MODE_H -#include <drm_crtc.h> -#include <drm_edid.h> -#include <drm_dp_helper.h> -#include <drm_fixed.h> -#include <drm_crtc_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_fixed.h> +#include <drm/drm_crtc_helper.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h>
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 830f1a7..4375cd6 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c@@ -32,7 +32,7 @@ #include <linux/list.h> #include <linux/slab.h> #include <drm/drmP.h> -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_trace.h"
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 5b37e28..18e4125 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c@@ -20,7 +20,7 @@ * Authors: Rafał Miłecki <zajec5@gmail.com> * Alex Deucher <alexdeucher@gmail.com> */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "avivod.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index a8cd2d5..e095218 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c@@ -23,10 +23,10 @@ * * Authors: Alex Deucher */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include <linux/dma-buf.h>
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 983658c..6436a53 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c@@ -28,8 +28,8 @@ */ #include <linux/seq_file.h> #include <linux/slab.h> -#include "drmP.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c
index ca569c5..f48f5a0 100644
--- a/drivers/gpu/drm/radeon/radeon_sa.c
+++ b/drivers/gpu/drm/radeon/radeon_sa.c@@ -41,7 +41,7 @@ * If we are asked to block we wait on all the oldest fence of all * rings. We just wait for any of those fence to complete. */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" static void radeon_sa_bo_remove_locked(struct radeon_sa_bo *sa_bo);
diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c
index 913a9e1..f7864e5 100644
--- a/drivers/gpu/drm/radeon/radeon_semaphore.c
+++ b/drivers/gpu/drm/radeon/radeon_semaphore.c@@ -27,7 +27,7 @@ * Authors: * Christian König <deathsimple@vodafone.de> */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h"
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index 2a56d45..8e9057b 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c@@ -27,9 +27,9 @@ * Kevin E. Martin <martin@valinux.com> */ -#include "drmP.h" -#include "drm_buffer.h" -#include "radeon_drm.h" +#include <drm/drmP.h> +#include <drm/drm_buffer.h> +#include <drm/radeon_drm.h> #include "radeon_drv.h" /* ================================================================
diff --git a/drivers/gpu/drm/radeon/radeon_trace_points.c b/drivers/gpu/drm/radeon/radeon_trace_points.c
index 8175993..e51d357 100644
--- a/drivers/gpu/drm/radeon/radeon_trace_points.c
+++ b/drivers/gpu/drm/radeon/radeon_trace_points.c@@ -2,7 +2,7 @@ * Author : Dave Airlie <airlied@redhat.com> */ #include <drm/drmP.h> -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "radeon.h" #define CREATE_TRACE_POINTS
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index e95c5e6..fa27f13 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c@@ -35,7 +35,7 @@ * close to the one of the R600 family (R600 likely being an evolution * of the RS600 GART block). */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 159b6a4..fce8358 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c@@ -25,7 +25,7 @@ * Alex Deucher * Jerome Glisse */ -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" #include "atom.h"
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 7f08ced..c4bbd06 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c@@ -27,7 +27,7 @@ */ #include <linux/seq_file.h> #include <linux/slab.h> -#include "drmP.h" +#include <drm/drmP.h> #include "rv515d.h" #include "radeon.h" #include "radeon_asic.h"
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index b4f51c5..30975de 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c@@ -28,10 +28,10 @@ #include <linux/firmware.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "rv770d.h" #include "atom.h" #include "avivod.h"
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 0b02792..9e31c05 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c@@ -25,10 +25,10 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" -#include "radeon_drm.h" +#include <drm/radeon_drm.h> #include "sid.h" #include "atom.h" #include "si_blit_shaders.h"
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index 6eb507a..98dff8c 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c@@ -22,8 +22,8 @@ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "savage_drm.h" +#include <drm/drmP.h> +#include <drm/savage_drm.h> #include "savage_drv.h" /* Need a long timeout for shadow status updates can take a while
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index 89afe0b..06f9153 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c@@ -25,11 +25,11 @@ #include <linux/module.h> -#include "drmP.h" -#include "savage_drm.h" +#include <drm/drmP.h> +#include <drm/savage_drm.h> #include "savage_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static struct pci_device_id pciidlist[] = { savage_PCI_IDS
diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/savage/savage_state.c
index b6d8608..b35e75e 100644
--- a/drivers/gpu/drm/savage/savage_state.c
+++ b/drivers/gpu/drm/savage/savage_state.c@@ -22,8 +22,8 @@ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "savage_drm.h" +#include <drm/drmP.h> +#include <drm/savage_drm.h> #include "savage_drv.h" void savage_emit_clip_rect_s3d(drm_savage_private_t * dev_priv,
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index dd14cd1..8077b6d 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c@@ -27,11 +27,11 @@ #include <linux/module.h> -#include "drmP.h" -#include "sis_drm.h" +#include <drm/drmP.h> +#include <drm/sis_drm.h> #include "sis_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static struct pci_device_id pciidlist[] = { sisdrv_PCI_IDS
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index 573758b..13b527b 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h@@ -44,7 +44,7 @@ enum sis_family { SIS_CHIP_315 = 1, }; -#include "drm_mm.h" +#include <drm/drm_mm.h> #define SIS_BASE (dev_priv->mmio)
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index dd4a316..a4c5e75 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c@@ -31,8 +31,8 @@ * Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ -#include "drmP.h" -#include "sis_drm.h" +#include <drm/drmP.h> +#include <drm/sis_drm.h> #include "sis_drv.h" #include <video/sisfb.h>
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index 1613c78..1b0bd28 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c@@ -32,10 +32,10 @@ #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "tdfx_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static struct pci_device_id pciidlist[] = { tdfx_PCI_IDS
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c
index 4a87282..3302f99 100644
--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c
+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c@@ -31,11 +31,11 @@ #define pr_fmt(fmt) "[TTM] " fmt -#include "ttm/ttm_module.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_page_alloc.h> #ifdef TTM_HAS_AGP -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_placement.h> #include <linux/agp_backend.h> #include <linux/module.h> #include <linux/slab.h>
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 36f4b28..402ab69 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c@@ -30,9 +30,9 @@ #define pr_fmt(fmt) "[TTM] " fmt -#include "ttm/ttm_module.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> #include <linux/jiffies.h> #include <linux/slab.h> #include <linux/sched.h>
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
index 038e947..9212494 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c@@ -28,10 +28,10 @@ * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> */ -#include "ttm/ttm_module.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "drm_mm.h" +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/drm_mm.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/module.h>
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index f8187ea..2a4aa57 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c@@ -28,8 +28,8 @@ * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> */ -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> #include <linux/io.h> #include <linux/highmem.h> #include <linux/wait.h>
diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
index 3832fe1..1937069 100644
--- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c
+++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c@@ -25,9 +25,9 @@ * **************************************************************************/ -#include "ttm/ttm_execbuf_util.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_execbuf_util.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> #include <linux/wait.h> #include <linux/sched.h> #include <linux/module.h>
diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c
index 075daf4..3daa9a3 100644
--- a/drivers/gpu/drm/ttm/ttm_lock.c
+++ b/drivers/gpu/drm/ttm/ttm_lock.c@@ -28,8 +28,8 @@ * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> */ -#include "ttm/ttm_lock.h" -#include "ttm/ttm_module.h" +#include <drm/ttm/ttm_lock.h> +#include <drm/ttm/ttm_module.h> #include <linux/atomic.h> #include <linux/errno.h> #include <linux/wait.h>
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
index 23d2ecb..479c6b0 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c@@ -27,9 +27,9 @@ #define pr_fmt(fmt) "[TTM] " fmt -#include "ttm/ttm_memory.h" -#include "ttm/ttm_module.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/ttm/ttm_memory.h> +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_page_alloc.h> #include <linux/spinlock.h> #include <linux/sched.h> #include <linux/wait.h>
diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c
index 902d7cf..d7f92fe 100644
--- a/drivers/gpu/drm/ttm/ttm_module.c
+++ b/drivers/gpu/drm/ttm/ttm_module.c@@ -31,8 +31,8 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/sched.h> -#include "ttm/ttm_module.h" -#include "drm_sysfs.h" +#include <drm/ttm/ttm_module.h> +#include <drm/drm_sysfs.h> static DECLARE_WAIT_QUEUE_HEAD(exit_q); atomic_t device_released;
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c
index 68daca4..c785787 100644
--- a/drivers/gpu/drm/ttm/ttm_object.c
+++ b/drivers/gpu/drm/ttm/ttm_object.c@@ -51,8 +51,8 @@ #define pr_fmt(fmt) "[TTM] " fmt -#include "ttm/ttm_object.h" -#include "ttm/ttm_module.h" +#include <drm/ttm/ttm_object.h> +#include <drm/ttm/ttm_module.h> #include <linux/list.h> #include <linux/spinlock.h> #include <linux/slab.h>
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index ebc6fac..860dc48 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c@@ -45,8 +45,8 @@ #include <linux/atomic.h> -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_page_alloc.h> #ifdef TTM_HAS_AGP #include <asm/agp.h>
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index 4f9e548..d4aa5a8 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c@@ -47,8 +47,8 @@ #include <linux/atomic.h> #include <linux/device.h> #include <linux/kthread.h> -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_page_alloc.h> #ifdef TTM_HAS_AGP #include <asm/agp.h> #endif
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index fa09daf..82a529e 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c@@ -38,12 +38,12 @@ #include <linux/swap.h> #include <linux/slab.h> #include <linux/export.h> -#include "drm_cache.h" -#include "drm_mem_util.h" -#include "ttm/ttm_module.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/drm_cache.h> +#include <drm/drm_mem_util.h> +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_page_alloc.h> /** * Allocates storage for pointers to the pages that back the ttm.
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index ba055e9..9f6fbf6 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c@@ -10,10 +10,10 @@ * more details. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_edid.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_edid.h> +#include <drm/drm_crtc_helper.h> #include "udl_drv.h" /* dummy connector to just get EDID,
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 6e52069..f356987 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c@@ -7,8 +7,8 @@ */ #include <linux/module.h> -#include "drm_usb.h" -#include "drm_crtc_helper.h" +#include <drm/drm_usb.h> +#include <drm/drm_crtc_helper.h> #include "udl_drv.h" static struct drm_driver driver;
diff --git a/drivers/gpu/drm/udl/udl_encoder.c b/drivers/gpu/drm/udl/udl_encoder.c
index 56e75f0..a6fa51b 100644
--- a/drivers/gpu/drm/udl/udl_encoder.c
+++ b/drivers/gpu/drm/udl/udl_encoder.c@@ -10,9 +10,9 @@ * more details. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> #include "udl_drv.h" /* dummy encoder */
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index f7593dc..877df05 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c@@ -14,12 +14,12 @@ #include <linux/slab.h> #include <linux/fb.h> -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> #include "udl_drv.h" -#include "drm_fb_helper.h" +#include <drm/drm_fb_helper.h> #define DL_DEFIO_WRITE_DELAY 5 /* fb_deferred_io.delay in jiffies */
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 7bd65bd..404ddcc 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c@@ -6,7 +6,7 @@ * more details. */ -#include "drmP.h" +#include <drm/drmP.h> #include "udl_drv.h" #include <linux/shmem_fs.h> #include <linux/dma-buf.h>
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 4c2d836..1f6dbfd 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c@@ -10,7 +10,7 @@ * License v2. See the file COPYING in the main directory of this archive for * more details. */ -#include "drmP.h" +#include <drm/drmP.h> #include "udl_drv.h" /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index 0d78167..2764997 100644
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c@@ -11,9 +11,9 @@ * more details. */ -#include "drmP.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> #include "udl_drv.h" /*
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
index b9320e2..e963481 100644
--- a/drivers/gpu/drm/udl/udl_transfer.c
+++ b/drivers/gpu/drm/udl/udl_transfer.c@@ -15,7 +15,7 @@ #include <linux/fb.h> #include <linux/prefetch.h> -#include "drmP.h" +#include <drm/drmP.h> #include "udl_drv.h" #define MAX_CMD_PIXELS 255
diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c
index aa1dd55..13558f5 100644
--- a/drivers/gpu/drm/via/via_dma.c
+++ b/drivers/gpu/drm/via/via_dma.c@@ -34,8 +34,8 @@ * Thomas Hellstrom. */ -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" #include "via_3d_reg.h"
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 3e038a3..8b0f259 100644
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c@@ -34,8 +34,8 @@ * the same DMA mappings? */ -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" #include "via_dmablit.h"
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 02661f3..93e7ab1 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c@@ -24,11 +24,11 @@ #include <linux/module.h> -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" -#include "drm_pciids.h" +#include <drm/drm_pciids.h> static int via_driver_open(struct drm_device *dev, struct drm_file *file) {
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 88edacc..893a650 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h@@ -24,7 +24,7 @@ #ifndef _VIA_DRV_H_ #define _VIA_DRV_H_ -#include "drm_mm.h" +#include <drm/drm_mm.h> #define DRIVER_AUTHOR "Various" #define DRIVER_NAME "via"
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index 6f2638a..ac98964 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c@@ -35,8 +35,8 @@ * The refresh rate is also calculated for video playback sync purposes. */ -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" #define VIA_REG_INTERRUPT 0x200
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index c126182..c0f1cc7 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c@@ -21,8 +21,8 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index a3574d0..cc45afb 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c@@ -25,8 +25,8 @@ * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" #define VIA_MM_ALIGN_SHIFT 4
diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c
index 6cedb55..9dbc92b 100644
--- a/drivers/gpu/drm/via/via_verifier.c
+++ b/drivers/gpu/drm/via/via_verifier.c@@ -29,8 +29,8 @@ */ #include "via_3d_reg.h" -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_verifier.h" #include "via_drv.h"
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index 675d311..6569efa 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c@@ -25,8 +25,8 @@ * Video and XvMC related functions. */ -#include "drmP.h" -#include "via_drm.h" +#include <drm/drmP.h> +#include <drm/via_drm.h> #include "via_drv.h" void via_init_futex(drm_via_private_t *dev_priv)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
index 1e2c0fb..9826fbc 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c@@ -26,9 +26,9 @@ **************************************************************************/ #include "vmwgfx_drv.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_page_alloc.h" +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_page_alloc.h> static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index 3fa884d..3ce68a2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c@@ -25,9 +25,9 @@ * **************************************************************************/ -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_placement.h> -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index ee24d21..084d845 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c@@ -26,12 +26,12 @@ **************************************************************************/ #include <linux/module.h> -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h" -#include "ttm/ttm_placement.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_object.h" -#include "ttm/ttm_module.h" +#include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_object.h> +#include <drm/ttm/ttm_module.h> #define VMWGFX_DRIVER_NAME "vmwgfx" #define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index d0f2c07..8669198 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h@@ -29,15 +29,15 @@ #define _VMWGFX_DRV_H_ #include "vmwgfx_reg.h" -#include "drmP.h" -#include "vmwgfx_drm.h" -#include "drm_hashtab.h" -#include "linux/suspend.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_object.h" -#include "ttm/ttm_lock.h" -#include "ttm/ttm_execbuf_util.h" -#include "ttm/ttm_module.h" +#include <drm/drmP.h> +#include <drm/vmwgfx_drm.h> +#include <drm/drm_hashtab.h> +#include <linux/suspend.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_object.h> +#include <drm/ttm/ttm_lock.h> +#include <drm/ttm/ttm_execbuf_util.h> +#include <drm/ttm/ttm_module.h> #include "vmwgfx_fence.h" #define VMWGFX_DRIVER_DATE "20120209"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 4acced4..30654b4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c@@ -27,8 +27,8 @@ #include "vmwgfx_drv.h" #include "vmwgfx_reg.h" -#include "ttm/ttm_bo_api.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_placement.h> static int vmw_cmd_invalid(struct vmw_private *dev_priv, struct vmw_sw_context *sw_context,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 3c447bf..568dc0e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c@@ -28,10 +28,10 @@ #include <linux/export.h> -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_placement.h> #define VMW_DIRTY_DELAY (HZ / 30)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index f2fb8f1..fd409884 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c@@ -25,7 +25,7 @@ * **************************************************************************/ -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h" #define VMW_FENCE_WRAP (1 << 31)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index a0c2f12..3eb1486 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c@@ -26,8 +26,8 @@ **************************************************************************/ #include "vmwgfx_drv.h" -#include "drmP.h" -#include "ttm/ttm_placement.h" +#include <drm/drmP.h> +#include <drm/ttm/ttm_placement.h> bool vmw_fifo_have_3d(struct vmw_private *dev_priv) {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
index 21ee782..3751730 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c@@ -26,8 +26,8 @@ **************************************************************************/ #include "vmwgfx_drv.h" -#include "drmP.h" -#include "ttm/ttm_bo_driver.h" +#include <drm/drmP.h> +#include <drm/ttm/ttm_bo_driver.h> #define VMW_PPN_SIZE sizeof(unsigned long)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index 5f71715..c5c054a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c@@ -29,9 +29,9 @@ */ #include "vmwgfx_drv.h" -#include "ttm/ttm_module.h" -#include "ttm/ttm_bo_driver.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_module.h> +#include <drm/ttm/ttm_bo_driver.h> +#include <drm/ttm/ttm_placement.h> #include <linux/idr.h> #include <linux/spinlock.h> #include <linux/kernel.h>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 66917c6..b07ca2e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c@@ -26,7 +26,7 @@ **************************************************************************/ #include "vmwgfx_drv.h" -#include "vmwgfx_drm.h" +#include <drm/vmwgfx_drm.h> #include "vmwgfx_kms.h" int vmw_getparam_ioctl(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
index cabc95f..4640adb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c@@ -25,7 +25,7 @@ * **************************************************************************/ -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h" #define VMW_FENCE_WRAP (1 << 24)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index 8184bc5..6fa89c9 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h@@ -28,8 +28,8 @@ #ifndef VMWGFX_KMS_H_ #define VMWGFX_KMS_H_ -#include "drmP.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include "vmwgfx_drv.h" #define VMWGFX_NUM_DISPLAY_UNITS 8
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
index 14399ee..cb55b7b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c@@ -26,10 +26,10 @@ **************************************************************************/ -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h" -#include "ttm/ttm_placement.h" +#include <drm/ttm/ttm_placement.h> #include "svga_overlay.h" #include "svga_escape.h"
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 22bf9a2..d6700b8 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c@@ -26,10 +26,10 @@ **************************************************************************/ #include "vmwgfx_drv.h" -#include "vmwgfx_drm.h" -#include "ttm/ttm_object.h" -#include "ttm/ttm_placement.h" -#include "drmP.h" +#include <drm/vmwgfx_drm.h> +#include <drm/ttm/ttm_object.h> +#include <drm/ttm/ttm_placement.h> +#include <drm/drmP.h> struct vmw_user_context { struct ttm_base_object base;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
index d3c11f5..98d6bfb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c@@ -25,7 +25,7 @@ * **************************************************************************/ -#include "drmP.h" +#include <drm/drmP.h> #include "vmwgfx_drv.h" int vmw_mmap(struct file *filp, struct vm_area_struct *vma)