]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amd: drop use of drmp.h in os_types.h
authorSam Ravnborg <sam@ravnborg.org>
Sun, 9 Jun 2019 22:07:50 +0000 (00:07 +0200)
committerSam Ravnborg <sam@ravnborg.org>
Mon, 10 Jun 2019 20:59:45 +0000 (22:59 +0200)
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
44 files changed:
drivers/gpu/drm/amd/display/dc/basics/vector.c
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
drivers/gpu/drm/amd/display/dc/core/dc.c
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
drivers/gpu/drm/amd/display/dc/core/dc_sink.c
drivers/gpu/drm/amd/display/dc/core/dc_stream.c
drivers/gpu/drm/amd/display/dc/core/dc_surface.c
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
drivers/gpu/drm/amd/display/dc/irq/irq_service.c
drivers/gpu/drm/amd/display/dc/os_types.h
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c
drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
drivers/gpu/drm/amd/display/modules/color/color_gamma.c
drivers/gpu/drm/amd/display/modules/freesync/freesync.c

index d28e9cf0e961df9c4ea8089a54d21df50c0bb6f1..8f93d25f91ee2ba9c757517af2f961de846d3690 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "include/vector.h"
 
index fd5266a58297d566247a8dbc9835f01cdcfbf6a7..5e1b849684a6890ea059a6baabb8d9d5cdf14e9e 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "ObjectID.h"
index f3aa7b53d2aa81b857eaeede8496d91af5b2e228..7108d51a9c5bd93ad61192164909d132f2b5f5ed 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dce_calcs.h"
 #include "dc.h"
index 18c775a950cc3582261d176597d7ab0b9eff8383..03dec40de361797bb5168711ce5ab41c2fda57a2 100644 (file)
@@ -22,6 +22,8 @@
  * Authors: AMD
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "dc.h"
index f02092a0dc76a176efb4e68b0569857dc18d69e1..eecc631ca4f82092c8a942a14972acd030f17ce1 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dm_helpers.h"
 #include "gpio_service_interface.h"
index eac7186e4f0841fdb771dd722b59dc7e819afb16..5ad1c62e9e4d77b93e008035cb1335aa71efc202 100644 (file)
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "resource.h"
index 9971b515c3eb3d81f95a0b6d9bee85e7f29b2267..5cbfdf1c4b1180484c48643cbc3ce76b80cccbf5 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dm_helpers.h"
 #include "core_types.h"
index 1dc3492f02a1d0be0296d90b13de0980ff42c063..7a46cc4414d26d55f1829eb29468a8e1488d9943 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 #include "dc.h"
index a5e86f9b148f4bf77afa6a57a2dcb71d6c7aa128..87b3b03c3556518b2ce839a8110d810ccf82b124 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/mm.h>
+
 /* DC interface (public) */
 #include "dm_services.h"
 #include "dc.h"
index 7f6d724686f1adc7255c244568d140565b3a8fd3..9b078a71de2e209f1f1f1904757e645f4f7dbc86 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "reg_helper.h"
 #include "dce_audio.h"
 #include "dce/dce_11_0_d.h"
index 0863719b0c85bf9d39cb56e9f61e0b42212b6065..f2295e780031776dbae473f6dc2fecd357747670 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 #include "core_types.h"
index 9636863807384af1c3bf41b839227fa82ea78cde..29d69dfc98488778936bf0d55c5c0d8a30078f8f 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce_clk_mgr.h"
 
 #include "reg_helper.h"
index f70437aae8e08538492bd2a2b430c2375a96d279..58864fca3da77b1c698b2770b3ea52eea35a32c0 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 
index a8c2cf260c84fc68c4c32de8deeb580369bb861a..9c701ab2dbfda263c38c4a78bf1de2dec6cb42a7 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "core_types.h"
 #include "link_encoder.h"
index 5d9506b3d46bfb272613181a1b3af5fc209b9de5..ce30dbf579d4fd0f4f2e06bbd177d6268c4c7f5b 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce_ipp.h"
 #include "reg_helper.h"
 #include "dm_services.h"
index 1037d2a72f3fb17d3dbdce27853d3c4d18cb8104..8527cce81c6fb8f315d7d88f7cfa2ea0fa43bc5a 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "reg_helper.h"
 
index 87093894ea9e73f8e4a4b1f46787b6a30a2bcb5a..51081d9ae3fb7c3a02af69d8450d2e160e401e61 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "basics/conversion.h"
 
index e938bf9986d38fa4e2e91243a1d93363d8407ccc..870bda57dc29b3fcc4a08455126912cb93260c32 100644 (file)
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "link_encoder.h"
index 12083bb8ef025b81138f92cf8f6e6738ac703995..72b580a4eb856830b278cd917e56f3cd36453ae9 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 
index dcd04e9ea76bda85bc44db181cbf62ae163966c6..4d9f219738bba26df2df1bc143d8047f258cb550 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "link_encoder.h"
index f9819df1d3e2f1ba0b9509d55909fe63acaba061..51cb45d8b9ab34444a9cb1e5d0e4418836d80b8c 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 
index a480b15f688591603dc5ad0212cfa8603232b019..1bfff440e807e0f10444ccd9317364c81b24ed3a 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "link_encoder.h"
index 6d49c7143c672f995f59f741be9d6c1c35780eb6..c2fae5150bccea12375168f154707dddc9104861 100644 (file)
@@ -24,6 +24,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 
index 27d0cc39496386a15db49e334c8c17919af58b02..83c4cc8516c1afb88e4c2f694b95a739a5b0f354 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce/dce_8_0_d.h"
 #include "dce/dce_8_0_sh_mask.h"
 
index 2b2de1d913c97ddcec23c76f804d5f94c5d559bf..98028fbf67f1c51e3340c4e318bb3a5f1ed54cce 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dcn10_clk_mgr.h"
 
 #include "reg_helper.h"
index 08db1e6b51668aef2fb88dc391b48b88ae30d9a0..0e0c6850247da2f999aeafaa3aca994ab8dd449e 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dcn10_ipp.h"
 #include "reg_helper.h"
index 102d968a8cd3643ff347fb4a531e4fe76518dd47..0df729492db306124dbeac374adc301703529026 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "reg_helper.h"
 
index ab958cff3b7601a0c2dbe187ddb443af6800643c..cec69cecf521a234fb9d66ea6122f944ddd4cfc9 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dcn10_opp.h"
 #include "reg_helper.h"
index 7eccb54c421d9090c9fdbc5a0b45f8c1cf4b7454..6b97d45c6ebf50a3402830969fdb3d582783de30 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dc.h"
 
index cf76ea2d9f5aac8454455302fc201f799f04fec5..d03b38e80d9b3e71d041a7bf340340f0faafb4cd 100644 (file)
@@ -27,6 +27,8 @@
  * Pre-requisites: headers required by header of this unit
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/gpio_interface.h"
index 3c63a3c04dbb34bcdba32015bc39d2cb9ae68926..a7fab44f66b666dc5d64d3a64a95f2894a15bb3e 100644 (file)
@@ -27,6 +27,8 @@
  * Pre-requisites: headers required by header of this unit
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "include/gpio_interface.h"
 #include "include/gpio_service_interface.h"
index 8ebeabad7bb75e6aa85bb31fe057b680666e5f9a..240cdd8d968940b4a076a600317e57881f10471f 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 
index c2028c4744a6446ff9bb0b3d5b838262f8d6e35e..a97972ebd4b7c2313548a7fa0680fec708b75529 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 /*
index 784feccc5853af4d322f2a3177df43ed06e934f4..5e11d748e6f32995fd7423e20dd8ce1be2a3c4e4 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/gpio_types.h"
index 86987f5e8bd54df411be95a33ef0cf65693acd73..1a581c4643458d95643da3c6bba7cba695dc6b1f 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
index 750ba0ab41062e8ac46b6ec5f9c3b3249849917e..15380336cb515b8af615265b0f2c7485e6c7ec7a 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
index de218fe84a4330eb3cbff0dccc20f611282dd37d..281fee8ad1e54cac6885a682650fb48a9b6f3a80 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
index 10ac6deff5ff8dfdd16d1fd136386812354a38bb..ebf483e3f098bd01d6274fafd7051a870d2ffca7 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
index 604bea01fc13ee5eea9840d238d0fbcc98eec113..0878550a8178eb7b8af65ab13428b4a84c8f37d8 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/irq_service_interface.h"
index c0d9f332baedc10d71e701b5f19e254d8b7af40d..30ec80ac6fc8149882dcadd38287e2694405f6f1 100644 (file)
 #ifndef _OS_TYPES_H_
 #define _OS_TYPES_H_
 
-#include <asm/byteorder.h>
+#include <linux/kgdb.h>
+#include <linux/kref.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"
 
index 1c079ba37c3006cd7f51c49ea74599575ed46e05..3464b2d5b89afa1d90dec9bb83ead082c1ba9986 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dm_services_types.h"
 
index fdcf9e66d852fc3605b771c937c1714f0b388a8c..484047155aaed023d6aadd586f311857e0bea758 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "virtual_stream_encoder.h"
 
index a1055413bade66242a6637389deece2c9aba1695..67001fca688b87465fdca7a8dcf6a7265d6e55be 100644 (file)
@@ -23,6 +23,9 @@
  *
  */
 
+#include <linux/mm.h>
+#include <linux/slab.h>
+
 #include "dc.h"
 #include "opp.h"
 #include "color_gamma.h"
index 19b1eaebe48400601e3b402a0df878fd4b6787a1..7c20171a3b6daf97e00ff8287cb0b289eb1df4d4 100644 (file)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dc.h"
 #include "mod_freesync.h"