History

drm/nouveau: remove as much direct use of core headers as possible

Ben Skeggs committed 12 years ago

Commit fdb751e1 parent f45f55c23 files · +22 −59Browse files

Unified · Split

23 files
  1. drivers/gpu/drm/nouveau/dispnv04/disp.c +0 −5
  2. drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +0 −4
  3. drivers/gpu/drm/nouveau/nouveau_abi16.c +2 −5
  4. drivers/gpu/drm/nouveau/nouveau_agp.c +0 −2
  5. drivers/gpu/drm/nouveau/nouveau_bo.c +1 −1
  6. drivers/gpu/drm/nouveau/nouveau_chan.c +4 −3
  7. drivers/gpu/drm/nouveau/nouveau_connector.h +0 −4
  8. drivers/gpu/drm/nouveau/nouveau_display.c +2 −1
  9. drivers/gpu/drm/nouveau/nouveau_dma.c +0 −2
  10. drivers/gpu/drm/nouveau/nouveau_dp.c +0 −2
  11. drivers/gpu/drm/nouveau/nouveau_drm.c +2 −0
  12. drivers/gpu/drm/nouveau/nouveau_drm.h +1 −4
  13. drivers/gpu/drm/nouveau/nouveau_fbcon.c +0 −3
  14. drivers/gpu/drm/nouveau/nouveau_sysfs.c +3 −3
  15. drivers/gpu/drm/nouveau/nouveau_ttm.c +1 −0
  16. drivers/gpu/drm/nouveau/nv04_fbcon.c +0 −2
  17. drivers/gpu/drm/nouveau/nv10_fence.c +0 −3
  18. drivers/gpu/drm/nouveau/nv10_fence.h +0 −1
  19. drivers/gpu/drm/nouveau/nv17_fence.c +2 −2
  20. drivers/gpu/drm/nouveau/nv50_display.c +2 −2
  21. drivers/gpu/drm/nouveau/nv50_fence.c +2 −2
  22. drivers/gpu/drm/nouveau/nv84_fence.c +0 −4
  23. drivers/gpu/drm/nouveau/nvc0_fence.c +0 −4
drivers/gpu/drm/nouveau/dispnv04/disp.c+0−5
@@ -22,9 +22,6 @@ · 21 unmodified lines
2222 * Author: Ben Skeggs
2323 */
2424
25−#include <core/object.h>
26−#include <core/class.h>
27−
2825 #include <drm/drmP.h>
2926 #include <drm/drm_crtc_helper.h>
3027
@@ -34,8 +31,6 @@ · 3 unmodified lines
3431 #include "nouveau_encoder.h"
3532 #include "nouveau_connector.h"
3633
37−#include <subdev/i2c.h>
38−
3934 int
4035 nv04_display_early_init(struct drm_device *dev)
4136 {
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c+0−4
@@ -34,10 +34,6 @@ · 33 unmodified lines
3434 #include "hw.h"
3535 #include "tvnv17.h"
3636
37−#include <core/device.h>
38−
39−#include <subdev/bios/gpio.h>
40−
4137 MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
4238 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"
4339 "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"
drivers/gpu/drm/nouveau/nouveau_abi16.c+2−5
@@ -21,11 +21,8 @@ · 20 unmodified lines
2121 *
2222 */
2323
24−#include <core/object.h>
25−#include <core/client.h>
26−#include <core/device.h>
27−#include <core/class.h>
28−#include <core/mm.h>
24+#include <nvif/os.h>
25+#include <nvif/class.h>
2926
3027 #include "nouveau_drm.h"
3128 #include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nouveau_agp.c+0−2
@@ -1,7 +1,5 @@
11 #include <linux/module.h>
22
3−#include <core/device.h>
4−
53 #include "nouveau_drm.h"
64 #include "nouveau_agp.h"
75 #include "nouveau_reg.h"
drivers/gpu/drm/nouveau/nouveau_bo.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 * Jeremy Kolb <jkolb@brandeis.edu>
2828 */
2929
30−#include <core/engine.h>
30+#include <linux/dma-mapping.h>
3131 #include <linux/swiotlb.h>
3232
3333 #include "nouveau_drm.h"
drivers/gpu/drm/nouveau/nouveau_chan.c+4−3
@@ -22,10 +22,11 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs
2323 */
2424
25−#include <core/object.h>
25+#include <nvif/os.h>
26+#include <nvif/class.h>
27+
28+/*XXX*/
2629 #include <core/client.h>
27−#include <core/device.h>
28−#include <core/class.h>
2930
3031 #include "nouveau_drm.h"
3132 #include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nouveau_connector.h+0−4
@@ -31,10 +31,6 @@ · 30 unmodified lines
3131 #include <drm/drm_dp_helper.h>
3232 #include "nouveau_crtc.h"
3333
34−#include <core/event.h>
35−
36−#include <subdev/bios.h>
37−
3834 struct nouveau_i2c_port;
3935
4036 enum nouveau_underscan_type {
drivers/gpu/drm/nouveau/nouveau_display.c+2−1
@@ -27,6 +27,8 @@ · 26 unmodified lines
2727 #include <drm/drmP.h>
2828 #include <drm/drm_crtc_helper.h>
2929
30+#include <nvif/class.h>
31+
3032 #include "nouveau_fbcon.h"
3133 #include "dispnv04/hw.h"
3234 #include "nouveau_crtc.h"
@@ -37,7 +39,6 @@ · 4 unmodified lines
3739
3840 #include "nouveau_fence.h"
3941
40−#include <core/class.h>
4142 #include <nvif/event.h>
4243
4344 static int
drivers/gpu/drm/nouveau/nouveau_dma.c+0−2
@@ -24,8 +24,6 @@ · 23 unmodified lines
2424 *
2525 */
2626
27−#include <core/client.h>
28−
2927 #include "nouveau_drm.h"
3028 #include "nouveau_dma.h"
3129
drivers/gpu/drm/nouveau/nouveau_dp.c+0−2
@@ -30,8 +30,6 @@ · 29 unmodified lines
3030 #include "nouveau_encoder.h"
3131 #include "nouveau_crtc.h"
3232
33−#include <core/class.h>
34−
3533 static void
3634 nouveau_dp_probe_oui(struct drm_device *dev, struct nouveau_i2c_port *auxch,
3735 u8 *dpcd)
drivers/gpu/drm/nouveau/nouveau_drm.c+2−0
@@ -27,8 +27,10 @@ · 26 unmodified lines
2727 #include <linux/pci.h>
2828 #include <linux/pm_runtime.h>
2929 #include <linux/vga_switcheroo.h>
30+
3031 #include "drmP.h"
3132 #include "drm_crtc_helper.h"
33+
3234 #include <core/device.h>
3335 #include <core/gpuobj.h>
3436 #include <core/class.h>
drivers/gpu/drm/nouveau/nouveau_drm.h+1−4
@@ -25,13 +25,10 @@ · 24 unmodified lines
2525 * - fixes multiple bugs in flip completion events and timestamping
2626 */
2727
28−#include <core/client.h>
29−#include <core/event.h>
30−
3128 #include <nvif/client.h>
3229 #include <nvif/device.h>
3330
34−#include <subdev/vm.h>
31+#include <core/class.h>
3532
3633 #include <drmP.h>
3734 #include <drm/nouveau_drm.h>
drivers/gpu/drm/nouveau/nouveau_fbcon.c+0−3
@@ -51,9 +51,6 @@ · 50 unmodified lines
5151
5252 #include "nouveau_crtc.h"
5353
54−#include <core/client.h>
55−#include <core/device.h>
56−
5754 MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration");
5855 static int nouveau_nofbaccel = 0;
5956 module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400);
drivers/gpu/drm/nouveau/nouveau_sysfs.c+3−3
@@ -22,10 +22,10 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs <bskeggs@redhat.com>
2323 */
2424
25−#include "nouveau_sysfs.h"
25+#include <nvif/os.h>
26+#include <nvif/class.h>
2627
27−#include <core/object.h>
28−#include <core/class.h>
28+#include "nouveau_sysfs.h"
2929
3030 static inline struct drm_device *
3131 drm_device(struct device *d)
drivers/gpu/drm/nouveau/nouveau_ttm.c+1−0
@@ -203,6 +203,7 @@ const struct ttm_mem_type_manager_func nouveau_gart_manager = { · 202 unmodified lines
203203 nouveau_gart_manager_debug
204204 };
205205
206+/*XXX*/
206207 #include <core/subdev/vm/nv04.h>
207208 static int
208209 nv04_gart_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
drivers/gpu/drm/nouveau/nv04_fbcon.c+0−2
@@ -22,8 +22,6 @@ · 21 unmodified lines
2222 * DEALINGS IN THE SOFTWARE.
2323 */
2424
25−#include <core/object.h>
26−
2725 #include "nouveau_drm.h"
2826 #include "nouveau_dma.h"
2927 #include "nouveau_fbcon.h"
drivers/gpu/drm/nouveau/nv10_fence.c+0−3
@@ -22,9 +22,6 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs <bskeggs@redhat.com>
2323 */
2424
25−#include <core/object.h>
26−#include <core/class.h>
27−
2825 #include "nouveau_drm.h"
2926 #include "nouveau_dma.h"
3027 #include "nv10_fence.h"
drivers/gpu/drm/nouveau/nv10_fence.h+0−1
@@ -1,7 +1,6 @@
11 #ifndef __NV10_FENCE_H_
22 #define __NV10_FENCE_H_
33
4−#include <core/os.h>
54 #include "nouveau_fence.h"
65 #include "nouveau_bo.h"
76
drivers/gpu/drm/nouveau/nv17_fence.c+2−2
@@ -22,8 +22,8 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs <bskeggs@redhat.com>
2323 */
2424
25−#include <core/object.h>
26−#include <core/class.h>
25+#include <nvif/os.h>
26+#include <nvif/class.h>
2727
2828 #include "nouveau_drm.h"
2929 #include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nv50_display.c+2−2
@@ -28,6 +28,8 @@ · 27 unmodified lines
2828 #include <drm/drm_crtc_helper.h>
2929 #include <drm/drm_dp_helper.h>
3030
31+#include <nvif/class.h>
32+
3133 #include "nouveau_drm.h"
3234 #include "nouveau_dma.h"
3335 #include "nouveau_gem.h"
@@ -37,8 +39,6 @@ · 3 unmodified lines
3739 #include "nouveau_fence.h"
3840 #include "nv50_display.h"
3941
40−#include <core/class.h>
41−
4242 #define EVO_DMA_NR 9
4343
4444 #define EVO_MASTER (0x00)
drivers/gpu/drm/nouveau/nv50_fence.c+2−2
@@ -22,8 +22,8 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs <bskeggs@redhat.com>
2323 */
2424
25−#include <core/object.h>
26−#include <core/class.h>
25+#include <nvif/os.h>
26+#include <nvif/class.h>
2727
2828 #include "nouveau_drm.h"
2929 #include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nv84_fence.c+0−4
@@ -22,10 +22,6 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs
2323 */
2424
25−#include <core/object.h>
26−#include <core/client.h>
27−#include <core/class.h>
28−
2925 #include "nouveau_drm.h"
3026 #include "nouveau_dma.h"
3127 #include "nouveau_fence.h"
drivers/gpu/drm/nouveau/nvc0_fence.c+0−4
@@ -22,10 +22,6 @@ · 21 unmodified lines
2222 * Authors: Ben Skeggs
2323 */
2424
25−#include <core/object.h>
26−#include <core/client.h>
27−#include <core/class.h>
28−
2925 #include "nouveau_drm.h"
3026 #include "nouveau_dma.h"
3127 #include "nouveau_fence.h"