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

drm/amd: drop use of drmp.h in os_types.h

Drop use of the deprecated drmP.h from display/dc/os_types.h

Fix all fallout after this change.
Most of the fixes was adding a missing include of vmalloc.h.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190609220757.10862-4-sam@ravnborg.org

+87 -4
+2
drivers/gpu/drm/amd/display/dc/basics/vector.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "include/vector.h" 28 30
+2
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "ObjectID.h"
+2
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dce_calcs.h" 28 30 #include "dc.h"
+2
drivers/gpu/drm/amd/display/dc/core/dc.c
··· 22 22 * Authors: AMD 23 23 */ 24 24 25 + #include <linux/slab.h> 26 + 25 27 #include "dm_services.h" 26 28 27 29 #include "dc.h"
+3
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 22 22 * Authors: AMD 23 23 * 24 24 */ 25 + 26 + #include <linux/slab.h> 27 + 25 28 #include "dm_services.h" 26 29 27 30 #include "resource.h"
+2
drivers/gpu/drm/amd/display/dc/core/dc_sink.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dm_helpers.h" 28 30 #include "core_types.h"
+1
drivers/gpu/drm/amd/display/dc/core/dc_stream.c
··· 24 24 */ 25 25 26 26 #include <linux/delay.h> 27 + #include <linux/slab.h> 27 28 28 29 #include "dm_services.h" 29 30 #include "dc.h"
+2
drivers/gpu/drm/amd/display/dc/core/dc_surface.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/mm.h> 27 + 26 28 /* DC interface (public) */ 27 29 #include "dm_services.h" 28 30 #include "dc.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "reg_helper.h" 27 29 #include "dce_audio.h" 28 30 #include "dce/dce_11_0_d.h"
+1
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
··· 24 24 */ 25 25 26 26 #include <linux/delay.h> 27 + #include <linux/slab.h> 27 28 28 29 #include "dm_services.h" 29 30 #include "core_types.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dce_clk_mgr.h" 27 29 28 30 #include "reg_helper.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30
+1
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
··· 24 24 */ 25 25 26 26 #include <linux/delay.h> 27 + #include <linux/slab.h> 27 28 28 29 #include "core_types.h" 29 30 #include "link_encoder.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dce_ipp.h" 27 29 #include "reg_helper.h" 28 30 #include "dm_services.h"
+2
drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "basics/conversion.h" 28 30
+3
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
··· 22 22 * Authors: AMD 23 23 * 24 24 */ 25 + 26 + #include <linux/slab.h> 27 + 25 28 #include "dm_services.h" 26 29 27 30 #include "link_encoder.h"
+1
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
··· 24 24 */ 25 25 26 26 #include <linux/delay.h> 27 + #include <linux/slab.h> 27 28 28 29 #include "dm_services.h" 29 30
+2
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "link_encoder.h"
+1
drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
··· 24 24 */ 25 25 26 26 #include <linux/delay.h> 27 + #include <linux/slab.h> 27 28 28 29 #include "dm_services.h" 29 30
+2
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "link_encoder.h"
+2
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
··· 24 24 * 25 25 */ 26 26 27 + #include <linux/slab.h> 28 + 27 29 #include "dm_services.h" 28 30 29 31
+2
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dce/dce_8_0_d.h" 27 29 #include "dce/dce_8_0_sh_mask.h" 28 30
+2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dcn10_clk_mgr.h" 27 29 28 30 #include "reg_helper.h"
+2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dcn10_ipp.h" 28 30 #include "reg_helper.h"
+2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dcn10_opp.h" 28 30 #include "reg_helper.h"
+2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dc.h" 28 30
+2
drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
··· 27 27 * Pre-requisites: headers required by header of this unit 28 28 */ 29 29 30 + #include <linux/slab.h> 31 + 30 32 #include "dm_services.h" 31 33 32 34 #include "include/gpio_interface.h"
+2
drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
··· 27 27 * Pre-requisites: headers required by header of this unit 28 28 */ 29 29 30 + #include <linux/slab.h> 31 + 30 32 #include "dm_services.h" 31 33 #include "include/gpio_interface.h" 32 34 #include "include/gpio_service_interface.h"
+1
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
··· 24 24 */ 25 25 26 26 #include <linux/delay.h> 27 + #include <linux/slab.h> 27 28 28 29 #include "dm_services.h" 29 30
+2
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 /*
+2
drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/gpio_types.h"
+2
drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/logger_interface.h"
+2
drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/logger_interface.h"
+2
drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/logger_interface.h"
+2
drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/logger_interface.h"
+2
drivers/gpu/drm/amd/display/dc/irq/irq_service.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 28 30 #include "include/irq_service_interface.h"
+6 -4
drivers/gpu/drm/amd/display/dc/os_types.h
··· 26 26 #ifndef _OS_TYPES_H_ 27 27 #define _OS_TYPES_H_ 28 28 29 - #include <asm/byteorder.h> 30 - #include <linux/types.h> 31 - #include <drm/drmP.h> 32 - 29 + #include <linux/kgdb.h> 33 30 #include <linux/kref.h> 31 + #include <linux/types.h> 32 + 33 + #include <asm/byteorder.h> 34 + 35 + #include <drm/drm_print.h> 34 36 35 37 #include "cgs_common.h" 36 38
+2
drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "virtual_stream_encoder.h" 28 30
+3
drivers/gpu/drm/amd/display/modules/color/color_gamma.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/mm.h> 27 + #include <linux/slab.h> 28 + 26 29 #include "dc.h" 27 30 #include "opp.h" 28 31 #include "color_gamma.h"
+2
drivers/gpu/drm/amd/display/modules/freesync/freesync.c
··· 23 23 * 24 24 */ 25 25 26 + #include <linux/slab.h> 27 + 26 28 #include "dm_services.h" 27 29 #include "dc.h" 28 30 #include "mod_freesync.h"