Commit 4fc4dca8 authored by Sam Ravnborg's avatar Sam Ravnborg

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: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarAlex 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
parent c366be54
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/vector.h" #include "include/vector.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "ObjectID.h" #include "ObjectID.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dce_calcs.h" #include "dce_calcs.h"
#include "dc.h" #include "dc.h"
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* Authors: AMD * Authors: AMD
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dc.h" #include "dc.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dm_helpers.h" #include "dm_helpers.h"
#include "gpio_service_interface.h" #include "gpio_service_interface.h"
......
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
* Authors: AMD * Authors: AMD
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "resource.h" #include "resource.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dm_helpers.h" #include "dm_helpers.h"
#include "core_types.h" #include "core_types.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dc.h" #include "dc.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/mm.h>
/* DC interface (public) */ /* DC interface (public) */
#include "dm_services.h" #include "dm_services.h"
#include "dc.h" #include "dc.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "reg_helper.h" #include "reg_helper.h"
#include "dce_audio.h" #include "dce_audio.h"
#include "dce/dce_11_0_d.h" #include "dce/dce_11_0_d.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "core_types.h" #include "core_types.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dce_clk_mgr.h" #include "dce_clk_mgr.h"
#include "reg_helper.h" #include "reg_helper.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "core_types.h" #include "core_types.h"
#include "link_encoder.h" #include "link_encoder.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dce_ipp.h" #include "dce_ipp.h"
#include "reg_helper.h" #include "reg_helper.h"
#include "dm_services.h" #include "dm_services.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "reg_helper.h" #include "reg_helper.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "basics/conversion.h" #include "basics/conversion.h"
......
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
* Authors: AMD * Authors: AMD
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "link_encoder.h" #include "link_encoder.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "link_encoder.h" #include "link_encoder.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "link_encoder.h" #include "link_encoder.h"
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dce/dce_8_0_d.h" #include "dce/dce_8_0_d.h"
#include "dce/dce_8_0_sh_mask.h" #include "dce/dce_8_0_sh_mask.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dcn10_clk_mgr.h" #include "dcn10_clk_mgr.h"
#include "reg_helper.h" #include "reg_helper.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dcn10_ipp.h" #include "dcn10_ipp.h"
#include "reg_helper.h" #include "reg_helper.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "reg_helper.h" #include "reg_helper.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dcn10_opp.h" #include "dcn10_opp.h"
#include "reg_helper.h" #include "reg_helper.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dc.h" #include "dc.h"
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
* Pre-requisites: headers required by header of this unit * Pre-requisites: headers required by header of this unit
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/gpio_interface.h" #include "include/gpio_interface.h"
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
* Pre-requisites: headers required by header of this unit * Pre-requisites: headers required by header of this unit
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/gpio_interface.h" #include "include/gpio_interface.h"
#include "include/gpio_service_interface.h" #include "include/gpio_service_interface.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
/* /*
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/gpio_types.h" #include "include/gpio_types.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/logger_interface.h" #include "include/logger_interface.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/logger_interface.h" #include "include/logger_interface.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/logger_interface.h" #include "include/logger_interface.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/logger_interface.h" #include "include/logger_interface.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "include/irq_service_interface.h" #include "include/irq_service_interface.h"
......
...@@ -26,11 +26,13 @@ ...@@ -26,11 +26,13 @@
#ifndef _OS_TYPES_H_ #ifndef _OS_TYPES_H_
#define _OS_TYPES_H_ #define _OS_TYPES_H_
#include <asm/byteorder.h> #include <linux/kgdb.h>
#include <linux/kref.h>
#include <linux/types.h> #include <linux/types.h>
#include <drm/drmP.h>
#include <linux/kref.h> #include <asm/byteorder.h>
#include <drm/drm_print.h>
#include "cgs_common.h" #include "cgs_common.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dm_services_types.h" #include "dm_services_types.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "virtual_stream_encoder.h" #include "virtual_stream_encoder.h"
......
...@@ -23,6 +23,9 @@ ...@@ -23,6 +23,9 @@
* *
*/ */
#include <linux/mm.h>
#include <linux/slab.h>
#include "dc.h" #include "dc.h"
#include "opp.h" #include "opp.h"
#include "color_gamma.h" #include "color_gamma.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include <linux/slab.h>
#include "dm_services.h" #include "dm_services.h"
#include "dc.h" #include "dc.h"
#include "mod_freesync.h" #include "mod_freesync.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment