drm/radeon: drop obsolete header files
Subsystems (3)
cover drm/radeon: drop obsolete header files
This patchset contains updates to two header files
in include/drm/.
The header files caused build errors due to missing dependencies. Fixed this so others will not be hit by the same.
The header file drm_os_linux.h is deprecated and should no longer be used.
For radeon it was a simple 1:1 replacement of the used macros + a adding missing include files.
The remaining patches perpare for and remove the use of drmP.h in the rest of the driver.
The patches was all build tested on various architectures, and as usual alpha resulted in a few extra build issues.
The patches are made on top of drm-misc-next, but applies clean to drm-next-5.3-wip branch of the agd5f git tree.
Sam
Sam Ravnborg (7):
drm: drm_crtc.h self-contained
drm: drm_debugfs.h self-contained drm/radeon: drop dependency on drm_os_linux.h drm/radeon: drop drmP.h from header files drm/radeon: prepare header files for drmP.h removal drm/radeon: drop use of drmP.h (1/2) drm/radeon: drop use of drmP.h (2/2)
drivers/gpu/drm/radeon/atom.c | 2 ++ drivers/gpu/drm/radeon/atom.h | 1 - drivers/gpu/drm/radeon/atombios_crtc.c | 7 +++-- drivers/gpu/drm/radeon/atombios_dp.c | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 14 ++++++---- drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- drivers/gpu/drm/radeon/btc_dpm.c | 16 ++++++----- drivers/gpu/drm/radeon/btc_dpm.h | 3 +++ drivers/gpu/drm/radeon/ci_dpm.c | 14 +++++----- drivers/gpu/drm/radeon/ci_dpm.h | 1 + drivers/gpu/drm/radeon/ci_smc.c | 2 +- drivers/gpu/drm/radeon/cik.c | 18 ++++++++----- drivers/gpu/drm/radeon/cik_sdma.c | 6 ++--- drivers/gpu/drm/radeon/clearstate_cayman.h | 2 ++ drivers/gpu/drm/radeon/clearstate_ci.h | 2 ++ drivers/gpu/drm/radeon/clearstate_si.h | 2 ++ drivers/gpu/drm/radeon/cypress_dpm.c | 11 ++++---- drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 16 ++++++----- drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- drivers/gpu/drm/radeon/kv_dpm.c | 10 ++++--- drivers/gpu/drm/radeon/kv_smc.c | 2 +- drivers/gpu/drm/radeon/ni.c | 17 +++++++----- drivers/gpu/drm/radeon/ni_dma.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 16 ++++++----- drivers/gpu/drm/radeon/r100.c | 36 ++++++++++++++----------- drivers/gpu/drm/radeon/r100_track.h | 2 ++ drivers/gpu/drm/radeon/r200.c | 2 +- drivers/gpu/drm/radeon/r300.c | 18 ++++++++----- drivers/gpu/drm/radeon/r420.c | 16 +++++++---- drivers/gpu/drm/radeon/r520.c | 4 +-- drivers/gpu/drm/radeon/r600.c | 18 ++++++++----- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dma.c | 6 ++--- drivers/gpu/drm/radeon/r600_dpm.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.h | 2 ++ drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon_acpi.c | 13 +++++---- drivers/gpu/drm/radeon/radeon_agp.c | 8 ++++-- drivers/gpu/drm/radeon/radeon_asic.c | 10 ++++--- drivers/gpu/drm/radeon/radeon_atombios.c | 5 +++- drivers/gpu/drm/radeon/radeon_audio.c | 2 +- drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- drivers/gpu/drm/radeon/radeon_bios.c | 12 ++++++--- drivers/gpu/drm/radeon/radeon_clocks.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_combios.c | 5 +++- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_cs.c | 10 +++++-- drivers/gpu/drm/radeon/radeon_cursor.c | 4 ++- drivers/gpu/drm/radeon/radeon_device.c | 18 ++++++++----- drivers/gpu/drm/radeon/radeon_display.c | 21 +++++++++------ drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 6 +++-- drivers/gpu/drm/radeon/radeon_drv.c | 19 ++++++++----- drivers/gpu/drm/radeon/radeon_encoders.c | 5 +++- drivers/gpu/drm/radeon/radeon_fb.c | 13 ++++----- drivers/gpu/drm/radeon/radeon_fence.c | 16 +++++++---- drivers/gpu/drm/radeon/radeon_gart.c | 5 +++- drivers/gpu/drm/radeon/radeon_gem.c | 7 ++++- drivers/gpu/drm/radeon/radeon_i2c.c | 5 +++- drivers/gpu/drm/radeon/radeon_ib.c | 5 +++- drivers/gpu/drm/radeon/radeon_irq_kms.c | 14 +++++++--- drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++----- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 11 +++++--- drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 ++- drivers/gpu/drm/radeon/radeon_mn.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_pm.c | 17 +++++++----- drivers/gpu/drm/radeon/radeon_prime.c | 8 +++--- drivers/gpu/drm/radeon/radeon_ring.c | 6 ++++- drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/radeon/radeon_semaphore.c | 2 +- drivers/gpu/drm/radeon/radeon_sync.c | 2 +- drivers/gpu/drm/radeon/radeon_test.c | 2 +- drivers/gpu/drm/radeon/radeon_trace.h | 4 +-- drivers/gpu/drm/radeon/radeon_trace_points.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 26 +++++++++++------- drivers/gpu/drm/radeon/radeon_ucode.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- drivers/gpu/drm/radeon/radeon_vce.c | 4 +-- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- drivers/gpu/drm/radeon/rs400.c | 11 +++++--- drivers/gpu/drm/radeon/rs600.c | 13 ++++++--- drivers/gpu/drm/radeon/rs690.c | 6 +++-- drivers/gpu/drm/radeon/rs780_dpm.c | 12 +++++---- drivers/gpu/drm/radeon/rv515.c | 13 ++++++--- drivers/gpu/drm/radeon/rv6xx_dpm.c | 2 +- drivers/gpu/drm/radeon/rv730_dpm.c | 2 +- drivers/gpu/drm/radeon/rv740_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 12 ++++++--- drivers/gpu/drm/radeon/rv770_dma.c | 2 +- drivers/gpu/drm/radeon/rv770_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770_dpm.h | 1 + drivers/gpu/drm/radeon/rv770_smc.c | 2 +- drivers/gpu/drm/radeon/si.c | 16 ++++++----- drivers/gpu/drm/radeon/si_dma.c | 2 +- drivers/gpu/drm/radeon/si_dpm.c | 14 +++++----- drivers/gpu/drm/radeon/si_smc.c | 2 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 +- drivers/gpu/drm/radeon/sumo_dpm.h | 1 + drivers/gpu/drm/radeon/sumo_smc.c | 2 +- drivers/gpu/drm/radeon/trinity_dpm.c | 10 ++++--- drivers/gpu/drm/radeon/trinity_smc.c | 2 +- drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +-- drivers/gpu/drm/radeon/uvd_v2_2.c | 2 +- drivers/gpu/drm/radeon/uvd_v3_1.c | 2 +- drivers/gpu/drm/radeon/uvd_v4_2.c | 2 +- drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- drivers/gpu/drm/radeon/vce_v2_0.c | 2 +- include/drm/drm_crtc.h | 1 + include/drm/drm_debugfs.h | 2 ++ 115 files changed, 502 insertions(+), 285 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/7 drm: drm_crtc.h self-contained
While removing drmP.h from drm/radeon a few files ended up including drm_crtc.h as the first file.
This failed build due to a missing dependency in drm_crtc.h.
Add the missing include file.
--- include/drm/drm_crtc.h | 1 + 1 file changed, 1 insertion(+)
include/drm/drm_crtc.h +1 -0
@@ -39,6 +39,7 @@#include <drm/drm_framebuffer.h> #include <drm/drm_modes.h> #include <drm/drm_connector.h> +#include <drm/drm_device.h> #include <drm/drm_property.h> #include <drm/drm_bridge.h> #include <drm/drm_edid.h>
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 20190608080241.4958-1-sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org
PATCH 2/7 drm: drm_debugfs.h self-contained
While removing drmP.h from drm/radeon a few files ended up including drm_debugfs.h as the first file.
This failed build due to missing dependencies in drm_debugfs.h.
Add the missing include files.
--- include/drm/drm_debugfs.h | 2 ++ 1 file changed, 2 insertions(+)
include/drm/drm_debugfs.h +2 -0
@@ -32,6 +32,8 @@#ifndef _DRM_DEBUGFS_H_#define _DRM_DEBUGFS_H_ +#include <linux/types.h> +#include <linux/seq_file.h> /** * struct drm_info_list - debugfs info list entry *
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/7 drm/radeon: drop drmP.h from header files
In reply to a message not in the archiveTo ease conversion of .c files drop include of drmP.h from all header files.
And fix-up build errors caused by this.
--- drivers/gpu/drm/radeon/atom.c | 2 ++ drivers/gpu/drm/radeon/atom.h | 1 - drivers/gpu/drm/radeon/radeon_trace.h | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/atom.c +2 -0
@@ -25,8 +25,10 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/slab.h> +#include <asm/unaligned.h> +#include <drm/drm_device.h> #include <drm/drm_util.h> #define ATOM_DEBUG
drivers/gpu/drm/radeon/atom.h +0 -1
@@ -26,7 +26,6 @@#define ATOM_H #include <linux/types.h> -#include <drm/drmP.h> #define ATOM_BIOS_MAGIC 0xAA55#define ATOM_ATI_MAGIC_PTR 0x30
drivers/gpu/drm/radeon/radeon_trace.h +0 -2
@@ -6,8 +6,6 @@#include <linux/types.h> #include <linux/tracepoint.h> -#include <drm/drmP.h> -#undef TRACE_SYSTEM#define TRACE_SYSTEM radeon#define TRACE_INCLUDE_FILE radeon_trace
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 drm/radeon: prepare header files for drmP.h removal
In reply to a message not in the archiveWhile removing drmP.h from all .c files the list of header files are also sorted alphabetically. To allow this adjust the header files to pull in the dependencies they needed to allow this.
--- drivers/gpu/drm/radeon/btc_dpm.h | 3 +++ drivers/gpu/drm/radeon/ci_dpm.h | 1 + drivers/gpu/drm/radeon/clearstate_cayman.h | 2 ++ drivers/gpu/drm/radeon/clearstate_ci.h | 2 ++ drivers/gpu/drm/radeon/clearstate_si.h | 2 ++ drivers/gpu/drm/radeon/r100_track.h | 2 ++ drivers/gpu/drm/radeon/r600_dpm.h | 2 ++ drivers/gpu/drm/radeon/radeon_trace.h | 4 +++- drivers/gpu/drm/radeon/rv770_dpm.h | 1 + drivers/gpu/drm/radeon/sumo_dpm.h | 1 + 10 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/btc_dpm.h +3 -0
@@ -23,6 +23,9 @@#ifndef __BTC_DPM_H__#define __BTC_DPM_H__ +#include "radeon.h" +#include "rv770_dpm.h" +#define BTC_RLP_UVD_DFLT 20#define BTC_RMP_UVD_DFLT 50#define BTC_LHP_UVD_DFLT 50
drivers/gpu/drm/radeon/ci_dpm.h +1 -0
@@ -24,6 +24,7 @@#define __CI_DPM_H__#include "ppsmc.h" +#include "radeon.h" #define SMU__NUM_SCLK_DPM_STATE 8#define SMU__NUM_MCLK_DPM_LEVELS 6
drivers/gpu/drm/radeon/clearstate_cayman.h +2 -0
@@ -21,6 +21,8 @@* */ +#include "clearstate_defs.h" +static const u32 SECT_CONTEXT_def_1[] = {0x00000000 ,// DB_RENDER_CONTROL
drivers/gpu/drm/radeon/clearstate_ci.h +2 -0
@@ -21,6 +21,8 @@* */ +#include "clearstate_defs.h" +static const unsigned int ci_SECT_CONTEXT_def_1[] = {0x00000000 ,// DB_RENDER_CONTROL
drivers/gpu/drm/radeon/clearstate_si.h +2 -0
@@ -21,6 +21,8 @@* */ +#include "clearstate_defs.h" +static const u32 si_SECT_CONTEXT_def_1[] = {0x00000000 ,// DB_RENDER_CONTROL
drivers/gpu/drm/radeon/r100_track.h +2 -0
@@ -1,5 +1,7 @@/* SPDX-License-Identifier: MIT */ +#include "radeon.h" +#define R100_TRACK_MAX_TEXTURE 3#define R200_TRACK_MAX_TEXTURE 6#define R300_TRACK_MAX_TEXTURE 16
drivers/gpu/drm/radeon/r600_dpm.h +2 -0
@@ -23,6 +23,8 @@#ifndef __R600_DPM_H__#define __R600_DPM_H__ +#include "radeon.h" +#define R600_ASI_DFLT 10000#define R600_BSP_DFLT 0x41EB#define R600_BSU_DFLT 0x2
drivers/gpu/drm/radeon/radeon_trace.h +3 -1
@@ -3,8 +3,10 @@#define _RADEON_TRACE_H_#include <linux/stringify.h> -#include <linux/types.h> #include <linux/tracepoint.h> +#include <linux/types.h> + +#include <drm/drm_file.h> #undef TRACE_SYSTEM#define TRACE_SYSTEM radeon
drivers/gpu/drm/radeon/rv770_dpm.h +1 -0
@@ -23,6 +23,7 @@#ifndef __RV770_DPM_H__#define __RV770_DPM_H__ +#include "radeon.h" #include "rv770_smc.h" struct rv770_clock_registers {
drivers/gpu/drm/radeon/sumo_dpm.h +1 -0
@@ -24,6 +24,7 @@#define __SUMO_DPM_H__#include "atom.h" +#include "radeon.h" #define SUMO_MAX_HARDWARE_POWERLEVELS 5#define SUMO_PM_NUMBER_OF_TC 15
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/7 drm/radeon: drop use of drmP.h (1/2)
In reply to a message not in the archiveDrop use of drmP.h in all .c files named radeon*c.
To ease review a little drmP.h removal was divided in two commits.
--- drivers/gpu/drm/radeon/radeon_acpi.c | 13 ++++++---- drivers/gpu/drm/radeon/radeon_agp.c | 8 ++++-- drivers/gpu/drm/radeon/radeon_asic.c | 10 ++++--- drivers/gpu/drm/radeon/radeon_atombios.c | 5 +++- drivers/gpu/drm/radeon/radeon_audio.c | 2 +- drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- drivers/gpu/drm/radeon/radeon_bios.c | 12 ++++++--- drivers/gpu/drm/radeon/radeon_clocks.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_combios.c | 5 +++- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_cs.c | 10 +++++-- drivers/gpu/drm/radeon/radeon_cursor.c | 4 ++- drivers/gpu/drm/radeon/radeon_device.c | 18 ++++++++----- drivers/gpu/drm/radeon/radeon_display.c | 21 +++++++++------ drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 6 +++-- drivers/gpu/drm/radeon/radeon_drv.c | 19 +++++++++----- drivers/gpu/drm/radeon/radeon_encoders.c | 5 +++- drivers/gpu/drm/radeon/radeon_fb.c | 13 +++++----- drivers/gpu/drm/radeon/radeon_fence.c | 6 +++-- drivers/gpu/drm/radeon/radeon_gart.c | 5 +++- drivers/gpu/drm/radeon/radeon_gem.c | 7 ++++- drivers/gpu/drm/radeon/radeon_i2c.c | 5 +++- drivers/gpu/drm/radeon/radeon_ib.c | 5 +++- drivers/gpu/drm/radeon/radeon_irq_kms.c | 14 +++++++--- drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++----- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 9 ++++--- .../gpu/drm/radeon/radeon_legacy_encoders.c | 11 +++++--- drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 ++- drivers/gpu/drm/radeon/radeon_mn.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_pm.c | 17 +++++++----- drivers/gpu/drm/radeon/radeon_prime.c | 8 +++--- drivers/gpu/drm/radeon/radeon_ring.c | 6 ++++- drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/radeon/radeon_semaphore.c | 2 +- drivers/gpu/drm/radeon/radeon_sync.c | 2 +- drivers/gpu/drm/radeon/radeon_test.c | 2 +- drivers/gpu/drm/radeon/radeon_trace_points.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 26 ++++++++++++------- drivers/gpu/drm/radeon/radeon_ucode.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- drivers/gpu/drm/radeon/radeon_vce.c | 2 +- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- 44 files changed, 223 insertions(+), 112 deletions(-)
drivers/gpu/drm/radeon/radeon_acpi.c +8 -5
@@ -21,18 +21,21 @@* */ -#include <linux/pci.h> #include <linux/acpi.h> -#include <linux/slab.h> -#include <linux/power_supply.h> +#include <linux/pci.h> #include <linux/pm_runtime.h> +#include <linux/power_supply.h> +#include <linux/slab.h> + +#include <acpi/acpi_bus.h> #include <acpi/video.h> -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_probe_helper.h> + +#include "atom.h" #include "radeon.h" #include "radeon_acpi.h" -#include "atom.h" #if defined(CONFIG_VGA_SWITCHEROO )bool radeon_atpx_dgpu_req_power_for_displays (void );
drivers/gpu/drm/radeon/radeon_agp.c +6 -2
@@ -24,10 +24,14 @@* Dave Airlie * Jerome Glisse <[email protected]> */ -#include <drm/drmP.h> -#include "radeon.h" + +#include <drm/drm_agpsupport.h> +#include <drm/drm_device.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "radeon.h" +#if IS_ENABLED (CONFIG_AGP ) struct radeon_agpmode_quirk {
drivers/gpu/drm/radeon/radeon_asic.c +6 -4
@@ -27,14 +27,16 @@*/ #include <linux/console.h> -#include <drm/drmP.h> +#include <linux/vgaarb.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> -#include <linux/vgaarb.h> -#include "radeon_reg.h" + +#include "atom.h" #include "radeon.h" #include "radeon_asic.h" -#include "atom.h" +#include "radeon_reg.h" /* * Registers accessors functions.
drivers/gpu/drm/radeon/radeon_atombios.c +4 -1
@@ -23,8 +23,11 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/radeon_audio.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/gcd.h> -#include <drm/drmP.h> +#include <drm/drm_crtc.h> #include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/radeon_benchmark.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Jerome Glisse */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h"
drivers/gpu/drm/radeon/radeon_bios.c +8 -4
@@ -25,13 +25,17 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> -#include "radeon_reg.h" -#include "radeon.h" -#include "atom.h" #include <linux/slab.h> #include <linux/acpi.h> + +#include <drm/drm_device.h> +#include <drm/drm_pci.h> + +#include "atom.h" +#include "radeon.h" +#include "radeon_reg.h" +/* * BIOS. */
drivers/gpu/drm/radeon/radeon_clocks.c +6 -3
@@ -25,12 +25,15 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> -#include "radeon_reg.h" + +#include "atom.h" #include "radeon.h" #include "radeon_asic.h" -#include "atom.h" +#include "radeon_reg.h" /* 10 khz */ uint32_t radeon_legacy_get_engine_clock (struct radeon_device *rdev)
drivers/gpu/drm/radeon/radeon_combios.c +4 -1
@@ -24,8 +24,11 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/radeon_connectors.c +1 -1
@@ -23,7 +23,7 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> +#include <drm/drm_edid.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h>
drivers/gpu/drm/radeon/radeon_cs.c +8 -2
@@ -24,11 +24,17 @@* Authors: * Jerome Glisse <[email protected]> */ +#include <linux/list_sort.h> -#include <drm/drmP.h> +#include <linux/uaccess.h> + +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> -#include "radeon_reg.h" +#include "radeon.h" +#include "radeon_reg.h" #include "radeon_trace.h" #define RADEON_CS_MAX_PRIORITY 32u
drivers/gpu/drm/radeon/radeon_cursor.c +3 -1
@@ -23,8 +23,10 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> + +#include <drm/drm_device.h> #include <drm/radeon_drm.h> +#include "radeon.h" static void radeon_lock_cursor (struct drm_crtc *crtc,bool lock)
drivers/gpu/drm/radeon/radeon_device.c +12 -6
@@ -25,17 +25,23 @@* Alex Deucher * Jerome Glisse */ +#include <linux/console.h> +#include <linux/efi.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> -#include <drm/drmP.h> +#include <linux/vga_switcheroo.h> +#include <linux/vgaarb.h> + +#include <drm/drm_cache.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_cache.h> #include <drm/radeon_drm.h> -#include <linux/pm_runtime.h> -#include <linux/vgaarb.h> -#include <linux/vga_switcheroo.h> -#include <linux/efi.h> +#include "radeon_reg.h" #include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/radeon_display.c +13 -8
@@ -23,22 +23,27 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> -#include <drm/radeon_drm.h> -#include "radeon.h" -#include "atom.h" +#include <linux/pm_runtime.h> +#include <linux/gcd.h> +#include <asm/div64.h> -#include <linux/pm_runtime.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_edid.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_pci.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_edid.h> +#include <drm/drm_vblank.h> +#include <drm/radeon_drm.h> -#include <linux/gcd.h> +#include "atom.h" +#include "radeon.h" static void avivo_crtc_load_lut (struct drm_crtc *crtc) {
drivers/gpu/drm/radeon/radeon_dp_auxch.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Dave Airlie */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "nid.h"
drivers/gpu/drm/radeon/radeon_dp_mst.c +4 -2
@@ -1,13 +1,15 @@// SPDX-License-Identifier: MIT -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> #include <drm/drm_dp_mst_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_file.h> #include <drm/drm_probe_helper.h> -#include "radeon.h" #include "atom.h" #include "ni_reg.h" +#include "radeon.h" static struct radeon_encoder *radeon_dp_create_fake_mst_encoder (struct radeon_connector *connector);
drivers/gpu/drm/radeon/radeon_drv.c +12 -7
@@ -29,21 +29,26 @@* OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm/drmP.h> -#include <drm/radeon_drm.h> -#include "radeon_drv.h" -#include <drm/drm_pciids.h> +#include <linux/compat.h> #include <linux/console.h> #include <linux/module.h> #include <linux/pm_runtime.h> #include <linux/vga_switcheroo.h> -#include <linux/compat.h> -#include <drm/drm_gem.h> -#include <drm/drm_fb_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_gem.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_pci.h> +#include <drm/drm_pciids.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include <drm/radeon_drm.h> + +#include "radeon_drv.h" /* * KMS wrapper.
drivers/gpu/drm/radeon/radeon_encoders.c +4 -1
@@ -23,9 +23,12 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_device.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/radeon_fb.c +7 -6
@@ -23,19 +23,20 @@* Authors: * David Airlie */ +#include <linux/module.h> -#include <linux/slab.h> #include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <linux/vga_switcheroo.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/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_pci.h> +#include <drm/radeon_drm.h> -#include <linux/vga_switcheroo.h> +#include "radeon.h" /* object hierarchy - * this contains a helper + a radeon fb
drivers/gpu/drm/radeon/radeon_fence.c +4 -2
@@ -37,10 +37,12 @@#include <linux/slab.h> #include <linux/wait.h> -#include <drm/drmP.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> -#include "radeon_reg.h" #include "radeon.h" +#include "radeon_reg.h" #include "radeon_trace.h" /*
drivers/gpu/drm/radeon/radeon_gart.c +4 -1
@@ -25,7 +25,10 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> + +#include <linux/vmalloc.h> + +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> #ifdef CONFIG_X86 #include <asm/set_memory.h>
drivers/gpu/drm/radeon/radeon_gem.c +6 -1
@@ -25,8 +25,13 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "radeon.h" void radeon_gem_object_free (struct drm_gem_object *gobj)
drivers/gpu/drm/radeon/radeon_i2c.c +4 -1
@@ -23,11 +23,14 @@* Authors: Dave Airlie * Alex Deucher */ +#include <linux/export.h> -#include <drm/drmP.h> +#include <drm/drm_device.h> #include <drm/drm_edid.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/radeon_ib.c +4 -1
@@ -26,7 +26,10 @@* Jerome Glisse * Christian König */ -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_file.h> +#include "radeon.h" /*
drivers/gpu/drm/radeon/radeon_irq_kms.c +10 -4
@@ -25,15 +25,21 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> + +#include <linux/pm_runtime.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_device.h> +#include <drm/drm_irq.h> +#include <drm/drm_pci.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include <drm/radeon_drm.h> -#include "radeon_reg.h" -#include "radeon.h" +#include "atom.h" +#include "radeon.h" +#include "radeon_reg.h" -#include <linux/pm_runtime.h> #define RADEON_WAIT_IDLE_TIMEOUT 200
drivers/gpu/drm/radeon/radeon_kms.c +11 -6
@@ -25,15 +25,20 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> + +#include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <linux/uaccess.h> +#include <linux/vga_switcheroo.h> +#include <drm/drm_fb_helper.h> -#include "radeon.h" +#include <drm/drm_file.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> -#include "radeon_asic.h" -#include <linux/vga_switcheroo.h> -#include <linux/slab.h> -#include <linux/pm_runtime.h> +#include "radeon.h" +#include "radeon_asic.h" #if defined(CONFIG_VGA_SWITCHEROO )bool radeon_has_atpx (void );
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +6 -3
@@ -23,13 +23,16 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> -#include <drm/radeon_drm.h> #include <drm/drm_fixed.h> -#include "radeon.h" +#include <drm/drm_fourcc.h> +#include <drm/drm_vblank.h> +#include <drm/radeon_drm.h> +#include "atom.h" +#include "radeon.h" static void radeon_overscan_setup (struct drm_crtc *crtc,struct drm_display_mode *mode)
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +8 -3
@@ -23,14 +23,19 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> -#include <drm/drm_util.h> + +#include <linux/backlight.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> +#include <drm/drm_util.h> #include <drm/radeon_drm.h> +#include "radeon.h" #include "radeon_asic.h" #include "atom.h" -#include <linux/backlight.h> #ifdef CONFIG_PMAC_BACKLIGHT #include <asm/backlight.h> #endif
drivers/gpu/drm/radeon/radeon_legacy_tv.c +3 -1
@@ -1,6 +1,8 @@// SPDX-License-Identifier: MIT -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_device.h> +#include "radeon.h" /*
drivers/gpu/drm/radeon/radeon_mn.c +1 -1
@@ -31,7 +31,7 @@#include <linux/firmware.h> #include <linux/module.h> #include <linux/mmu_notifier.h> -#include <drm/drmP.h> +#include <drm/drm.h> #include "radeon.h"
drivers/gpu/drm/radeon/radeon_object.c +6 -3
@@ -29,15 +29,18 @@* Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> * Dave Airlie */ + +#include <linux/io.h> #include <linux/list.h> #include <linux/slab.h> -#include <drm/drmP.h> -#include <drm/radeon_drm.h> +#include <drm/drm_cache.h> +#include <drm/drm_prime.h> +#include <drm/radeon_drm.h> +#include "radeon.h" #include "radeon_trace.h" -int radeon_ttm_init (struct radeon_device *rdev);void radeon_ttm_fini (struct radeon_device *rdev);static void radeon_bo_clear_surface_reg (struct radeon_bo *bo);
drivers/gpu/drm/radeon/radeon_pm.c +11 -6
@@ -20,14 +20,19 @@* Authors: Rafał Miłecki <[email protected]> * Alex Deucher <[email protected]> */ -#include <drm/drmP.h> -#include "radeon.h" -#include "avivod.h" + +#include <linux/hwmon-sysfs.h> +#include <linux/hwmon.h> +#include <linux/power_supply.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> +#include "atom.h" +#include "avivod.h" #include "r600_dpm.h" -#include <linux/power_supply.h> -#include <linux/hwmon.h> -#include <linux/hwmon-sysfs.h> +#include "radeon.h" #define RADEON_IDLE_LOOP_MS 100#define RADEON_RECLOCK_DELAY_MS 200
drivers/gpu/drm/radeon/radeon_prime.c +5 -3
@@ -23,12 +23,14 @@* * Authors: Alex Deucher */ -#include <drm/drmP.h> -#include "radeon.h" -#include <drm/radeon_drm.h> #include <linux/dma-buf.h> +#include <drm/drm_prime.h> +#include <drm/radeon_drm.h> + +#include "radeon.h" +struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct radeon_bo *bo =gem_to_radeon_bo (obj);
drivers/gpu/drm/radeon/radeon_ring.c +5 -1
@@ -26,7 +26,11 @@* Jerome Glisse * Christian König */ -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include "radeon.h" /*
drivers/gpu/drm/radeon/radeon_sa.c +1 -1
@@ -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 <drm/drmP.h> +#include "radeon.h" static void radeon_sa_bo_remove_locked (struct radeon_sa_bo *sa_bo);
drivers/gpu/drm/radeon/radeon_semaphore.c +1 -1
@@ -27,7 +27,7 @@* Authors: * Christian König <[email protected]> */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_trace.h"
drivers/gpu/drm/radeon/radeon_sync.c +1 -1
@@ -28,7 +28,7 @@* Christian König <[email protected]> */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_trace.h"
drivers/gpu/drm/radeon/radeon_test.c +1 -1
@@ -22,7 +22,7 @@* * Authors: Michel Dänzer */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h"
drivers/gpu/drm/radeon/radeon_trace_points.c +1 -1
@@ -2,7 +2,7 @@/* Copyright Red Hat Inc 2010. * Author : Dave Airlie <[email protected]> */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h"
drivers/gpu/drm/radeon/radeon_ttm.c +17 -9
@@ -29,19 +29,27 @@* Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> * Dave Airlie */ + +#include <linux/dma-mapping.h> +#include <linux/pagemap.h> +#include <linux/seq_file.h> +#include <linux/slab.h> +#include <linux/swap.h> +#include <linux/swiotlb.h> + +#include <drm/drm_agpsupport.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> +#include <drm/drm_prime.h> +#include <drm/radeon_drm.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_module.h> #include <drm/ttm/ttm_page_alloc.h> -#include <drm/drmP.h> -#include <drm/radeon_drm.h> -#include <linux/seq_file.h> -#include <linux/slab.h> -#include <linux/swiotlb.h> -#include <linux/swap.h> -#include <linux/pagemap.h> -#include <linux/debugfs.h> +#include <drm/ttm/ttm_placement.h> +#include "radeon_reg.h" #include "radeon.h"
drivers/gpu/drm/radeon/radeon_ucode.c +1 -1
@@ -24,7 +24,7 @@#include <linux/firmware.h> #include <linux/slab.h> #include <linux/module.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_ucode.h"
drivers/gpu/drm/radeon/radeon_uvd.c +1 -1
@@ -30,7 +30,7 @@#include <linux/firmware.h> #include <linux/module.h> -#include <drm/drmP.h> +#include <drm/drm.h> #include "radeon.h"
drivers/gpu/drm/radeon/radeon_vce.c +1 -1
@@ -27,7 +27,7 @@#include <linux/firmware.h> #include <linux/module.h> -#include <drm/drmP.h> +#include <drm/drm.h> #include "radeon.h"
drivers/gpu/drm/radeon/radeon_vm.c +1 -1
@@ -25,7 +25,7 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_trace.h"
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byQuoted 11 lines · Sam Ravnborg
This patchset contains updates to two header files
ininclude/drm/.
The header files caused build errors due to missing dependencies. Fixed this so others will not be hit by the same.The header file
drm_os_linux.his deprecated and should no longer be used.
For radeon it was a simple 1:1 replacement of the used macros + a adding missing include files.
Quoted 8 lines
The remaining patches perpare for and remove the use of
drmP.hin the rest of the driver.The patches was all build tested on various architectures, and as usual alpha resulted in a few extra build issues.
The patches are made on top of drm-misc-next, but applies clean to drm-next-5.3-wip branch of the agd5f git tree.
Series is:
Feel free to take it through drm-misc if you want, otherwise, let me know and I'll take it through my tree.
Alex
Quoted 130 lines
Sam
Sam Ravnborg (7):
drm:drm_crtc.hself-contained
drm:drm_debugfs.hself-contained drm/radeon: drop dependency ondrm_os_linux.hdrm/radeon: dropdrmP.hfrom header files drm/radeon: prepare header files fordrmP.hremoval drm/radeon: drop use ofdrmP.h(1/2) drm/radeon: drop use ofdrmP.h(2/2)drivers/gpu/drm/radeon/atom.c | 2 ++ drivers/gpu/drm/radeon/atom.h | 1 - drivers/gpu/drm/radeon/atombios_crtc.c | 7 +++-- drivers/gpu/drm/radeon/atombios_dp.c | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 14 ++++++---- drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- drivers/gpu/drm/radeon/btc_dpm.c | 16 ++++++----- drivers/gpu/drm/radeon/btc_dpm.h | 3 +++ drivers/gpu/drm/radeon/ci_dpm.c | 14 +++++----- drivers/gpu/drm/radeon/ci_dpm.h | 1 + drivers/gpu/drm/radeon/ci_smc.c | 2 +- drivers/gpu/drm/radeon/cik.c | 18 ++++++++----- drivers/gpu/drm/radeon/cik_sdma.c | 6 ++--- drivers/gpu/drm/radeon/clearstate_cayman.h | 2 ++ drivers/gpu/drm/radeon/clearstate_ci.h | 2 ++ drivers/gpu/drm/radeon/clearstate_si.h | 2 ++ drivers/gpu/drm/radeon/cypress_dpm.c | 11 ++++---- drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 16 ++++++----- drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- drivers/gpu/drm/radeon/kv_dpm.c | 10 ++++--- drivers/gpu/drm/radeon/kv_smc.c | 2 +- drivers/gpu/drm/radeon/ni.c | 17 +++++++----- drivers/gpu/drm/radeon/ni_dma.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 16 ++++++----- drivers/gpu/drm/radeon/r100.c | 36 ++++++++++++++----------- drivers/gpu/drm/radeon/r100_track.h | 2 ++ drivers/gpu/drm/radeon/r200.c | 2 +- drivers/gpu/drm/radeon/r300.c | 18 ++++++++----- drivers/gpu/drm/radeon/r420.c | 16 +++++++---- drivers/gpu/drm/radeon/r520.c | 4 +-- drivers/gpu/drm/radeon/r600.c | 18 ++++++++----- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dma.c | 6 ++--- drivers/gpu/drm/radeon/r600_dpm.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.h | 2 ++ drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon_acpi.c | 13 +++++---- drivers/gpu/drm/radeon/radeon_agp.c | 8 ++++-- drivers/gpu/drm/radeon/radeon_asic.c | 10 ++++--- drivers/gpu/drm/radeon/radeon_atombios.c | 5 +++- drivers/gpu/drm/radeon/radeon_audio.c | 2 +- drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- drivers/gpu/drm/radeon/radeon_bios.c | 12 ++++++--- drivers/gpu/drm/radeon/radeon_clocks.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_combios.c | 5 +++- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_cs.c | 10 +++++-- drivers/gpu/drm/radeon/radeon_cursor.c | 4 ++- drivers/gpu/drm/radeon/radeon_device.c | 18 ++++++++----- drivers/gpu/drm/radeon/radeon_display.c | 21 +++++++++------ drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 6 +++-- drivers/gpu/drm/radeon/radeon_drv.c | 19 ++++++++----- drivers/gpu/drm/radeon/radeon_encoders.c | 5 +++- drivers/gpu/drm/radeon/radeon_fb.c | 13 ++++----- drivers/gpu/drm/radeon/radeon_fence.c | 16 +++++++---- drivers/gpu/drm/radeon/radeon_gart.c | 5 +++- drivers/gpu/drm/radeon/radeon_gem.c | 7 ++++- drivers/gpu/drm/radeon/radeon_i2c.c | 5 +++- drivers/gpu/drm/radeon/radeon_ib.c | 5 +++- drivers/gpu/drm/radeon/radeon_irq_kms.c | 14 +++++++--- drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++----- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 11 +++++--- drivers/gpu/drm/radeon/radeon_legacy_tv.c | 4 ++- drivers/gpu/drm/radeon/radeon_mn.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_pm.c | 17 +++++++----- drivers/gpu/drm/radeon/radeon_prime.c | 8 +++--- drivers/gpu/drm/radeon/radeon_ring.c | 6 ++++- drivers/gpu/drm/radeon/radeon_sa.c | 2 +- drivers/gpu/drm/radeon/radeon_semaphore.c | 2 +- drivers/gpu/drm/radeon/radeon_sync.c | 2 +- drivers/gpu/drm/radeon/radeon_test.c | 2 +- drivers/gpu/drm/radeon/radeon_trace.h | 4 +-- drivers/gpu/drm/radeon/radeon_trace_points.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 26 +++++++++++------- drivers/gpu/drm/radeon/radeon_ucode.c | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- drivers/gpu/drm/radeon/radeon_vce.c | 4 +-- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- drivers/gpu/drm/radeon/rs400.c | 11 +++++--- drivers/gpu/drm/radeon/rs600.c | 13 ++++++--- drivers/gpu/drm/radeon/rs690.c | 6 +++-- drivers/gpu/drm/radeon/rs780_dpm.c | 12 +++++---- drivers/gpu/drm/radeon/rv515.c | 13 ++++++--- drivers/gpu/drm/radeon/rv6xx_dpm.c | 2 +- drivers/gpu/drm/radeon/rv730_dpm.c | 2 +- drivers/gpu/drm/radeon/rv740_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 12 ++++++--- drivers/gpu/drm/radeon/rv770_dma.c | 2 +- drivers/gpu/drm/radeon/rv770_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770_dpm.h | 1 + drivers/gpu/drm/radeon/rv770_smc.c | 2 +- drivers/gpu/drm/radeon/si.c | 16 ++++++----- drivers/gpu/drm/radeon/si_dma.c | 2 +- drivers/gpu/drm/radeon/si_dpm.c | 14 +++++----- drivers/gpu/drm/radeon/si_smc.c | 2 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 +- drivers/gpu/drm/radeon/sumo_dpm.h | 1 + drivers/gpu/drm/radeon/sumo_smc.c | 2 +- drivers/gpu/drm/radeon/trinity_dpm.c | 10 ++++--- drivers/gpu/drm/radeon/trinity_smc.c | 2 +- drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +-- drivers/gpu/drm/radeon/uvd_v2_2.c | 2 +- drivers/gpu/drm/radeon/uvd_v3_1.c | 2 +- drivers/gpu/drm/radeon/uvd_v4_2.c | 2 +- drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- drivers/gpu/drm/radeon/vce_v2_0.c | 2 +- include/drm/drm_crtc.h | 1 + include/drm/drm_debugfs.h | 2 ++ 115 files changed, 502 insertions(+), 285 deletions(-)
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sam Ravnborg
AppliedHi Alex.
Quoted 6 lines
Series is:
Reviewed-by Alex Deucher <[email protected]>Feel free to take it through drm-misc if you want, otherwise, let me know and I'll take it through my tree.
Applied to drm-misc-next.
I had accidently left a few empty lines that checkpatch complained about. I fixed these when I applied the patches.
Will push it after iy passes my final pre-push build tests.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/7 drm/radeon: drop dependency on drm_os_linux.h
In reply to Sam RavnborgThe drm_os_linux.h header file is deprecated.
Drop all uses of symbols from this file.
All macros are just opencoded.
A few adjustments to include files was required as the obsolete drm_os_linux.h included these headers.
--- drivers/gpu/drm/radeon/cik.c | 4 ++-- drivers/gpu/drm/radeon/cik_sdma.c | 4 ++-- drivers/gpu/drm/radeon/r100.c | 10 +++++----- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/r600_dma.c | 4 ++-- drivers/gpu/drm/radeon/radeon_fence.c | 10 +++++++--- drivers/gpu/drm/radeon/radeon_vce.c | 2 +- drivers/gpu/drm/radeon/rs400.c | 4 ++-- drivers/gpu/drm/radeon/rs600.c | 3 +++ drivers/gpu/drm/radeon/rv515.c | 2 +- drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- 13 files changed, 30 insertions(+), 23 deletions(-)
drivers/gpu/drm/radeon/cik.c +2 -2
@@ -3480,7 +3480,7 @@ int cik_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =RREG32 (scratch);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ring test on %d succeeded in %d usecs\n" , ring->idx, i);
@@ -3825,7 +3825,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =RREG32 (scratch);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ib test on ring %d succeeded in %u usecs\n" , ib.fence->ring, i);
drivers/gpu/drm/radeon/cik_sdma.c +2 -2
@@ -677,7 +677,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev, tmp =le32_to_cpu (rdev->wb.wb[index/4 ]);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {
@@ -751,7 +751,7 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =le32_to_cpu (rdev->wb.wb[index/4 ]);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ib test on ring %d succeeded in %u usecs\n" , ib.fence->ring, i);
drivers/gpu/drm/radeon/r100.c +5 -5
@@ -2470,7 +2470,7 @@ static int r100_rbbm_fifo_wait_for_entry(struct radeon_device *rdev, unsigned n)if (tmp >= n) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
@@ -2488,7 +2488,7 @@ int r100_gui_wait_for_idle(struct radeon_device *rdev)if (!(tmp &RADEON_RBBM_ACTIVE )) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
@@ -2504,7 +2504,7 @@ int r100_mc_wait_for_idle(struct radeon_device *rdev)if (tmp &RADEON_MC_IDLE ) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
@@ -3669,7 +3669,7 @@ int r100_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)if (tmp ==0xDEADBEEF ) {break ; } -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ring test succeeded in %d usecs\n" , i);
@@ -3746,7 +3746,7 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)if (tmp ==0xDEADBEEF ) {break ; } -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ib test succeeded in %u usecs\n" , i);
drivers/gpu/drm/radeon/r300.c +1 -1
@@ -350,7 +350,7 @@ int r300_mc_wait_for_idle(struct radeon_device *rdev)if (tmp &R300_MC_IDLE ) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
drivers/gpu/drm/radeon/r520.c +1 -1
@@ -44,7 +44,7 @@ int r520_mc_wait_for_idle(struct radeon_device *rdev)if (tmp &R520_MC_STATUS_IDLE ) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
drivers/gpu/drm/radeon/r600.c +2 -2
@@ -2840,7 +2840,7 @@ int r600_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =RREG32 (scratch);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ring test on %d succeeded in %d usecs\n" , ring->idx, i);
@@ -3433,7 +3433,7 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =RREG32 (scratch);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ib test on ring %d succeeded in %u usecs\n" , ib.fence->ring, i);
drivers/gpu/drm/radeon/r600_dma.c +2 -2
@@ -261,7 +261,7 @@ int r600_dma_ring_test(struct radeon_device *rdev, tmp =le32_to_cpu (rdev->wb.wb[index/4 ]);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {
@@ -382,7 +382,7 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =le32_to_cpu (rdev->wb.wb[index/4 ]);if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {DRM_INFO ("ib test on ring %d succeeded in %u usecs\n" , ib.fence->ring, i);
drivers/gpu/drm/radeon/radeon_fence.c +7 -3
@@ -28,13 +28,17 @@* Jerome Glisse <[email protected]> * Dave Airlie */ -#include <linux/seq_file.h> +#include <linux/atomic.h> -#include <linux/wait.h> +#include <linux/firmware.h> #include <linux/kref.h> +#include <linux/sched/signal.h> +#include <linux/seq_file.h> #include <linux/slab.h> -#include <linux/firmware.h> +#include <linux/wait.h> +#include <drm/drmP.h> +#include "radeon_reg.h" #include "radeon.h" #include "radeon_trace.h"
drivers/gpu/drm/radeon/radeon_vce.c +1 -1
@@ -771,7 +771,7 @@ int radeon_vce_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)for (i =0 ; i < rdev->usec_timeout; i++) {if (vce_v1_0_get_rptr (rdev, ring) != rptr)break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {
drivers/gpu/drm/radeon/rs400.c +2 -2
@@ -67,7 +67,7 @@ void rs400_gart_tlb_flush(struct radeon_device *rdev) tmp =RREG32_MC (RS480_GART_CACHE_CNTRL );if ((tmp &RS480_GART_CACHE_INVALIDATE ) ==0 )break ; -DRM_UDELAY (1 ); +udelay (1 ); timeout--; }while (timeout >0 );WREG32_MC (RS480_GART_CACHE_CNTRL ,0 );
@@ -245,7 +245,7 @@ int rs400_mc_wait_for_idle(struct radeon_device *rdev)if (tmp &RADEON_MC_IDLE ) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
drivers/gpu/drm/radeon/rs600.c +3 -0
@@ -35,6 +35,9 @@* close to the one of the R600 family (R600 likely being an evolution * of the RS600 GART block). */ + +#include <linux/io-64-nonatomic-lo-hi.h> +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h"
drivers/gpu/drm/radeon/rv515.c +1 -1
@@ -138,7 +138,7 @@ int rv515_mc_wait_for_idle(struct radeon_device *rdev)if (tmp &MC_STATUS_IDLE ) {return 0 ; } -DRM_UDELAY (1 ); +udelay (1 ); }return -1 ; }
drivers/gpu/drm/radeon/uvd_v1_0.c +1 -1
@@ -438,7 +438,7 @@ int uvd_v1_0_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) tmp =RREG32 (UVD_CONTEXT_ID );if (tmp ==0xDEADBEEF )break ; -DRM_UDELAY (1 ); +udelay (1 ); }if (i < rdev->usec_timeout) {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 7/7 drm/radeon: drop use of drmP.h (2/2)
In reply to Sam RavnborgDrop use of drmP.h in remaining .c files.
To ease review a little the drmP.h removal was divided in two commits.
--- drivers/gpu/drm/radeon/atombios_crtc.c | 7 ++++-- drivers/gpu/drm/radeon/atombios_dp.c | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 14 +++++++----- drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- drivers/gpu/drm/radeon/btc_dpm.c | 16 +++++++------ drivers/gpu/drm/radeon/ci_dpm.c | 14 +++++++----- drivers/gpu/drm/radeon/ci_smc.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 +++++++----- drivers/gpu/drm/radeon/cik_sdma.c | 2 +- drivers/gpu/drm/radeon/cypress_dpm.c | 11 ++++----- drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 16 ++++++++----- drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/evergreen_dma.c | 2 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +- drivers/gpu/drm/radeon/kv_dpm.c | 10 +++++---- drivers/gpu/drm/radeon/kv_smc.c | 2 +- drivers/gpu/drm/radeon/ni.c | 17 ++++++++------ drivers/gpu/drm/radeon/ni_dma.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 16 +++++++------ drivers/gpu/drm/radeon/r100.c | 26 +++++++++++++--------- drivers/gpu/drm/radeon/r200.c | 2 +- drivers/gpu/drm/radeon/r300.c | 16 ++++++++----- drivers/gpu/drm/radeon/r420.c | 16 ++++++++----- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 14 ++++++++---- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dma.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 2 +- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/rs400.c | 7 +++++- drivers/gpu/drm/radeon/rs600.c | 10 +++++---- drivers/gpu/drm/radeon/rs690.c | 6 +++-- drivers/gpu/drm/radeon/rs780_dpm.c | 12 +++++----- drivers/gpu/drm/radeon/rv515.c | 11 ++++++--- drivers/gpu/drm/radeon/rv6xx_dpm.c | 2 +- drivers/gpu/drm/radeon/rv730_dpm.c | 2 +- drivers/gpu/drm/radeon/rv740_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 12 ++++++---- drivers/gpu/drm/radeon/rv770_dma.c | 2 +- drivers/gpu/drm/radeon/rv770_dpm.c | 2 +- drivers/gpu/drm/radeon/rv770_smc.c | 2 +- drivers/gpu/drm/radeon/si.c | 16 ++++++++----- drivers/gpu/drm/radeon/si_dma.c | 2 +- drivers/gpu/drm/radeon/si_dpm.c | 14 +++++++----- drivers/gpu/drm/radeon/si_smc.c | 2 +- drivers/gpu/drm/radeon/sumo_dpm.c | 2 +- drivers/gpu/drm/radeon/sumo_smc.c | 2 +- drivers/gpu/drm/radeon/trinity_dpm.c | 10 +++++---- drivers/gpu/drm/radeon/trinity_smc.c | 2 +- drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- drivers/gpu/drm/radeon/uvd_v2_2.c | 2 +- drivers/gpu/drm/radeon/uvd_v3_1.c | 2 +- drivers/gpu/drm/radeon/uvd_v4_2.c | 2 +- drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- drivers/gpu/drm/radeon/vce_v2_0.c | 2 +- 57 files changed, 226 insertions(+), 147 deletions(-)
drivers/gpu/drm/radeon/atombios_crtc.c +5 -2
@@ -23,11 +23,14 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> -#include <drm/radeon_drm.h> #include <drm/drm_fixed.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_vblank.h> +#include <drm/radeon_drm.h> +#include "radeon.h" #include "atom.h" #include "atom-bits.h"
drivers/gpu/drm/radeon/atombios_dp.c +1 -1
@@ -24,7 +24,7 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h"
drivers/gpu/drm/radeon/atombios_encoders.c +9 -5
@@ -23,15 +23,19 @@* Authors: Dave Airlie * Alex Deucher */ -#include <drm/drmP.h> + +#include <linux/backlight.h> +#include <linux/dmi.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> + +#include "atom.h" #include "radeon.h" -#include "radeon_audio.h" #include "radeon_asic.h" -#include "atom.h" -#include <linux/backlight.h> -#include <linux/dmi.h> +#include "radeon_audio.h" extern int atom_debug;
drivers/gpu/drm/radeon/atombios_i2c.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher * */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "atom.h"
drivers/gpu/drm/radeon/btc_dpm.c +9 -7
@@ -22,15 +22,17 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> -#include "radeon.h" -#include "radeon_asic.h" +#include <linux/seq_file.h> + +#include <drm/drm_pci.h> + +#include "atom.h" +#include "btc_dpm.h" #include "btcd.h" -#include "r600_dpm.h" #include "cypress_dpm.h" -#include "btc_dpm.h" -#include "atom.h" -#include <linux/seq_file.h> +#include "r600_dpm.h" +#include "radeon.h" +#include "radeon_asic.h" #define MC_CG_ARB_FREQ_F0 0x0a#define MC_CG_ARB_FREQ_F1 0x0b
drivers/gpu/drm/radeon/ci_dpm.c +8 -6
@@ -22,15 +22,17 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include <linux/seq_file.h> + +#include <drm/drm_pci.h> + +#include "atom.h" +#include "ci_dpm.h" +#include "cikd.h" +#include "r600_dpm.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_ucode.h" -#include "cikd.h" -#include "r600_dpm.h" -#include "ci_dpm.h" -#include "atom.h" -#include <linux/seq_file.h> #define MC_CG_ARB_FREQ_F0 0x0a#define MC_CG_ARB_FREQ_F1 0x0b
drivers/gpu/drm/radeon/ci_smc.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "cikd.h" #include "ppsmc.h"
drivers/gpu/drm/radeon/cik.c +9 -5
@@ -21,18 +21,22 @@* * Authors: Alex Deucher */ +#include <linux/firmware.h> #include <linux/slab.h> #include <linux/module.h> -#include <drm/drmP.h> + +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> + +#include "atom.h" +#include "cik_blit_shaders.h" +#include "cikd.h" +#include "clearstate_ci.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" -#include "cikd.h" -#include "atom.h" -#include "cik_blit_shaders.h" #include "radeon_ucode.h" -#include "clearstate_ci.h" #define SH_MEM_CONFIG_GFX_DEFAULT \ ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
drivers/gpu/drm/radeon/cik_sdma.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_ucode.h" #include "radeon_asic.h"
drivers/gpu/drm/radeon/cypress_dpm.c +6 -5
@@ -22,13 +22,14 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> -#include "radeon.h" -#include "radeon_asic.h" +#include <drm/drm_pci.h> + +#include "atom.h" +#include "cypress_dpm.h" #include "evergreend.h" #include "r600_dpm.h" -#include "cypress_dpm.h" -#include "atom.h" +#include "radeon.h" +#include "radeon_asic.h" #define SMC_RAM_END 0x8000
drivers/gpu/drm/radeon/dce3_1_afmt.c +1 -1
@@ -21,7 +21,7 @@* OTHER DEALINGS IN THE SOFTWARE. */ #include <linux/hdmi.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h"
drivers/gpu/drm/radeon/dce6_afmt.c +1 -1
@@ -21,7 +21,7 @@* */ #include <linux/hdmi.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_audio.h" #include "sid.h"
drivers/gpu/drm/radeon/evergreen.c +10 -6
@@ -21,18 +21,22 @@* * Authors: Alex Deucher */ +#include <linux/firmware.h> #include <linux/slab.h> -#include <drm/drmP.h> -#include "radeon.h" -#include "radeon_asic.h" -#include "radeon_audio.h" + +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> #include <drm/radeon_drm.h> -#include "evergreend.h" +#include "atom.h" #include "avivod.h" -#include "evergreen_reg.h" #include "evergreen_blit_shaders.h" +#include "evergreen_reg.h" +#include "evergreend.h" +#include "radeon.h" +#include "radeon_asic.h" +#include "radeon_audio.h" #include "radeon_ucode.h" #define DC_HPDx_CONTROL (x) (DC_HPD1_CONTROL + (x * 0xc))
drivers/gpu/drm/radeon/evergreen_cs.c +1 -1
@@ -25,7 +25,7 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "evergreend.h"
drivers/gpu/drm/radeon/evergreen_dma.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "evergreend.h"
drivers/gpu/drm/radeon/evergreen_hdmi.c +1 -1
@@ -25,7 +25,7 @@* Rafał Miłecki */ #include <linux/hdmi.h> -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_asic.h"
drivers/gpu/drm/radeon/kv_dpm.c +6 -4
@@ -21,13 +21,15 @@* */ -#include <drm/drmP.h> -#include "radeon.h" +#include <linux/seq_file.h> + +#include <drm/drm_pci.h> +#include "cikd.h" -#include "r600_dpm.h" #include "kv_dpm.h" +#include "r600_dpm.h" +#include "radeon.h" #include "radeon_asic.h" -#include <linux/seq_file.h> #define KV_MAX_DEEPSLEEP_DIVIDER_ID 5#define KV_MINIMUM_ENGINE_CLOCK 800
drivers/gpu/drm/radeon/kv_smc.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "cikd.h" #include "kv_dpm.h"
drivers/gpu/drm/radeon/ni.c +10 -7
@@ -21,20 +21,23 @@* * Authors: Alex Deucher */ +#include <linux/firmware.h> #include <linux/slab.h> #include <linux/module.h> -#include <drm/drmP.h> -#include "radeon.h" -#include "radeon_asic.h" -#include "radeon_audio.h" + +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> -#include "nid.h" +#include "atom.h" -#include "ni_reg.h" #include "cayman_blit_shaders.h" -#include "radeon_ucode.h" #include "clearstate_cayman.h" +#include "ni_reg.h" +#include "nid.h" +#include "radeon.h" +#include "radeon_asic.h" +#include "radeon_audio.h" +#include "radeon_ucode.h" /* * Indirect registers accessor
drivers/gpu/drm/radeon/ni_dma.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h"
drivers/gpu/drm/radeon/ni_dpm.c +9 -7
@@ -21,16 +21,18 @@* */ -#include <drm/drmP.h> -#include "radeon.h" -#include "radeon_asic.h" -#include "nid.h" -#include "r600_dpm.h" -#include "ni_dpm.h" -#include "atom.h" #include <linux/math64.h> #include <linux/seq_file.h> +#include <drm/drm_pci.h> + +#include "atom.h" +#include "ni_dpm.h" +#include "nid.h" +#include "r600_dpm.h" +#include "radeon.h" +#include "radeon_asic.h" +#define MC_CG_ARB_FREQ_F0 0x0a#define MC_CG_ARB_FREQ_F1 0x0b#define MC_CG_ARB_FREQ_F2 0x0c
drivers/gpu/drm/radeon/r100.c +16 -10
@@ -25,24 +25,30 @@* Alex Deucher * Jerome Glisse */ +#include <linux/seq_file.h> #include <linux/slab.h> -#include <drm/drmP.h> +#include <linux/firmware.h> +#include <linux/module.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> #include <drm/radeon_drm.h> -#include "radeon_reg.h" + +#include "atom.h" +#include "r100_reg_safe.h" +#include "r100d.h" #include "radeon.h" #include "radeon_asic.h" -#include "r100d.h" +#include "radeon_reg.h" +#include "rn50_reg_safe.h" #include "rs100d.h" #include "rv200d.h" #include "rv250d.h" -#include "atom.h" - -#include <linux/firmware.h> -#include <linux/module.h> - -#include "r100_reg_safe.h" -#include "rn50_reg_safe.h" /* Firmware Names */ #define FIRMWARE_R100 "radeon/R100_cp.bin"
drivers/gpu/drm/radeon/r200.c +1 -1
@@ -25,7 +25,7 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon_reg.h" #include "radeon.h"
drivers/gpu/drm/radeon/r300.c +11 -5
@@ -25,19 +25,25 @@* Alex Deucher * Jerome Glisse */ +#include <linux/seq_file.h> #include <linux/slab.h> -#include <drm/drmP.h> +#include <drm/drm.h> #include <drm/drm_crtc_helper.h> -#include "radeon_reg.h" -#include "radeon.h" -#include "radeon_asic.h" +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> #include <drm/radeon_drm.h> +#include "r100_track.h" +#include "r300_reg_safe.h" #include "r300d.h" +#include "radeon.h" +#include "radeon_asic.h" +#include "radeon_reg.h" #include "rv350d.h" -#include "r300_reg_safe.h" /* This files gather functions specifics to: r300,r350,rv350,rv370,rv380 *
drivers/gpu/drm/radeon/r420.c +11 -5
@@ -25,16 +25,22 @@* Alex Deucher * Jerome Glisse */ +#include <linux/seq_file.h> #include <linux/slab.h> -#include <drm/drmP.h> -#include "radeon_reg.h" -#include "radeon.h" -#include "radeon_asic.h" + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include <drm/drm_pci.h> +#include "atom.h" #include "r100d.h" -#include "r420d.h" #include "r420_reg_safe.h" +#include "r420d.h" +#include "radeon.h" +#include "radeon_asic.h" +#include "radeon_reg.h" void r420_pm_init_profile (struct radeon_device *rdev) {
drivers/gpu/drm/radeon/r520.c +1 -1
@@ -25,7 +25,7 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "atom.h"
drivers/gpu/drm/radeon/r600.c +10 -4
@@ -25,19 +25,25 @@* Alex Deucher * Jerome Glisse */ +#include <linux/slab.h> #include <linux/seq_file.h> #include <linux/firmware.h> #include <linux/module.h> -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> #include <drm/radeon_drm.h> + +#include "atom.h" +#include "avivod.h" +#include "r600d.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" #include "radeon_mode.h" -#include "r600d.h" -#include "atom.h" -#include "avivod.h" #include "radeon_ucode.h" /* Firmware Names */
drivers/gpu/drm/radeon/r600_cs.c +1 -1
@@ -26,7 +26,7 @@* Jerome Glisse */ #include <linux/kernel.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "r600d.h"
drivers/gpu/drm/radeon/r600_dma.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "r600d.h"
drivers/gpu/drm/radeon/r600_dpm.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "r600d.h"
drivers/gpu/drm/radeon/r600_hdmi.c +1 -1
@@ -25,7 +25,7 @@*/ #include <linux/hdmi.h> #include <linux/gcd.h> -#include <drm/drmP.h> +#include <drm/radeon_drm.h> #include "radeon.h" #include "radeon_asic.h"
drivers/gpu/drm/radeon/rs400.c +6 -1
@@ -25,9 +25,14 @@* Alex Deucher * Jerome Glisse */ +#include <linux/seq_file.h> #include <linux/slab.h> -#include <drm/drmP.h> + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> +#include "radeon.h" #include "radeon_asic.h" #include "rs400d.h"
drivers/gpu/drm/radeon/rs600.c +6 -4
@@ -38,14 +38,16 @@#include <linux/io-64-nonatomic-lo-hi.h> -#include <drm/drmP.h> +#include <drm/drm_device.h> +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> + +#include "atom.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" -#include "atom.h" -#include "rs600d.h" -#include "rs600_reg_safe.h" +#include "rs600d.h" static void rs600_gpu_init (struct radeon_device *rdev);int rs600_mc_wait_for_idle (struct radeon_device *rdev);
drivers/gpu/drm/radeon/rs690.c +4 -2
@@ -25,11 +25,13 @@* Alex Deucher * Jerome Glisse */ -#include <drm/drmP.h> + +#include <drm/drm_pci.h> + +#include "atom.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" -#include "atom.h" #include "rs690d.h" int rs690_mc_wait_for_idle (struct radeon_device *rdev)
drivers/gpu/drm/radeon/rs780_dpm.c +7 -5
@@ -22,14 +22,16 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include <linux/seq_file.h> + +#include <drm/drm_pci.h> + +#include "atom.h" +#include "r600_dpm.h" #include "radeon.h" #include "radeon_asic.h" -#include "rs780d.h" -#include "r600_dpm.h" #include "rs780_dpm.h" -#include "atom.h" -#include <linux/seq_file.h> +#include "rs780d.h" static struct igp_ps *rs780_get_ps (struct radeon_ps *rps) {
drivers/gpu/drm/radeon/rv515.c +8 -3
@@ -25,14 +25,19 @@* Alex Deucher * Jerome Glisse */ +#include <linux/seq_file.h> #include <linux/slab.h> -#include <drm/drmP.h> -#include "rv515d.h" + +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_file.h> + +#include "atom.h" #include "radeon.h" #include "radeon_asic.h" -#include "atom.h" #include "rv515_reg_safe.h" +#include "rv515d.h" /* This files gather functions specifics to: rv515 */ static int rv515_debugfs_pipes_info_init (struct radeon_device *rdev);
drivers/gpu/drm/radeon/rv6xx_dpm.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "rv6xxd.h"
drivers/gpu/drm/radeon/rv730_dpm.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "rv730d.h" #include "r600_dpm.h"
drivers/gpu/drm/radeon/rv740_dpm.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "rv740d.h" #include "r600_dpm.h"
drivers/gpu/drm/radeon/rv770.c +8 -4
@@ -25,16 +25,20 @@* Alex Deucher * Jerome Glisse */ +#include <linux/firmware.h> #include <linux/slab.h> -#include <drm/drmP.h> + +#include <drm/drm_device.h> +#include <drm/drm_pci.h> +#include <drm/radeon_drm.h> + +#include "atom.h" +#include "avivod.h" #include "radeon.h" #include "radeon_asic.h" #include "radeon_audio.h" -#include <drm/radeon_drm.h> #include "rv770d.h" -#include "atom.h" -#include "avivod.h" #define R700_PFP_UCODE_SIZE 848#define R700_PM4_UCODE_SIZE 1360
drivers/gpu/drm/radeon/rv770_dma.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "rv770d.h"
drivers/gpu/drm/radeon/rv770_dpm.c +1 -1
@@ -22,7 +22,7 @@* Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "rv770d.h"
drivers/gpu/drm/radeon/rv770_smc.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "rv770d.h" #include "rv770_dpm.h"
drivers/gpu/drm/radeon/si.c +10 -6
@@ -21,19 +21,23 @@* * Authors: Alex Deucher */ +#include <linux/firmware.h> #include <linux/slab.h> #include <linux/module.h> -#include <drm/drmP.h> -#include "radeon.h" -#include "radeon_asic.h" -#include "radeon_audio.h" + +#include <drm/drm_pci.h> +#include <drm/drm_vblank.h> #include <drm/radeon_drm.h> -#include "sid.h" +#include "atom.h" -#include "si_blit_shaders.h" #include "clearstate_si.h" +#include "radeon.h" +#include "radeon_asic.h" +#include "radeon_audio.h" #include "radeon_ucode.h" +#include "si_blit_shaders.h" +#include "sid.h" MODULE_FIRMWARE ("radeon/TAHITI_pfp.bin" );
drivers/gpu/drm/radeon/si_dma.c +1 -1
@@ -21,7 +21,7 @@* * Authors: Alex Deucher */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h"
drivers/gpu/drm/radeon/si_dpm.c +8 -6
@@ -21,15 +21,17 @@* */ -#include <drm/drmP.h> +#include <linux/math64.h> +#include <linux/seq_file.h> + +#include <drm/drm_pci.h> + +#include "atom.h" +#include "r600_dpm.h" #include "radeon.h" #include "radeon_asic.h" -#include "sid.h" -#include "r600_dpm.h" #include "si_dpm.h" -#include "atom.h" -#include <linux/math64.h> -#include <linux/seq_file.h> +#include "sid.h" #define MC_CG_ARB_FREQ_F0 0x0a#define MC_CG_ARB_FREQ_F1 0x0b
drivers/gpu/drm/radeon/si_smc.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "sid.h" #include "ppsmc.h"
drivers/gpu/drm/radeon/sumo_dpm.c +1 -1
@@ -21,7 +21,7 @@* */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "sumod.h"
drivers/gpu/drm/radeon/sumo_smc.c +1 -1
@@ -21,7 +21,7 @@* */ -#include <drm/drmP.h> +#include "radeon.h" #include "sumod.h" #include "sumo_dpm.h"
drivers/gpu/drm/radeon/trinity_dpm.c +6 -4
@@ -21,13 +21,15 @@* */ -#include <drm/drmP.h> +#include <linux/seq_file.h> + +#include <drm/drm_pci.h> + +#include "r600_dpm.h" #include "radeon.h" #include "radeon_asic.h" -#include "trinityd.h" -#include "r600_dpm.h" #include "trinity_dpm.h" -#include <linux/seq_file.h> +#include "trinityd.h" #define TRINITY_MAX_DEEPSLEEP_DIVIDER_ID 5#define TRINITY_MINIMUM_ENGINE_CLOCK 800
drivers/gpu/drm/radeon/trinity_smc.c +1 -1
@@ -21,7 +21,7 @@* */ -#include <drm/drmP.h> +#include "radeon.h" #include "trinityd.h" #include "trinity_dpm.h"
drivers/gpu/drm/radeon/uvd_v1_0.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "r600d.h"
drivers/gpu/drm/radeon/uvd_v2_2.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "rv770d.h"
drivers/gpu/drm/radeon/uvd_v3_1.c +1 -1
@@ -22,7 +22,7 @@* Authors: Christian König <[email protected]> */ -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "nid.h"
drivers/gpu/drm/radeon/uvd_v4_2.c +1 -1
@@ -23,7 +23,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "cikd.h"
drivers/gpu/drm/radeon/vce_v1_0.c +1 -1
@@ -26,7 +26,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "sid.h"
drivers/gpu/drm/radeon/vce_v2_0.c +1 -1
@@ -26,7 +26,7 @@*/ #include <linux/firmware.h> -#include <drm/drmP.h> +#include "radeon.h" #include "radeon_asic.h" #include "cikd.h"
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel