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
22 * Author: Ben Skeggs22 * Author: Ben Skeggs
23 */23 */
24 24
25#include <core/object.h>
26#include <core/class.h>
27
28#include <drm/drmP.h>25#include <drm/drmP.h>
29#include <drm/drm_crtc_helper.h>26#include <drm/drm_crtc_helper.h>
30 27
@@ -34,8 +31,6 @@ · 3 unmodified lines
34#include "nouveau_encoder.h"31#include "nouveau_encoder.h"
35#include "nouveau_connector.h"32#include "nouveau_connector.h"
36 33
37#include <subdev/i2c.h>
38
39int34int
40nv04_display_early_init(struct drm_device *dev)35nv04_display_early_init(struct drm_device *dev)
41{36{
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c+0−4
@@ -34,10 +34,6 @@ · 33 unmodified lines
34#include "hw.h"34#include "hw.h"
35#include "tvnv17.h"35#include "tvnv17.h"
36 36
37#include <core/device.h>
38
39#include <subdev/bios/gpio.h>
40
41MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"37MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
42 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"38 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"
43 "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"39 "\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
21 *21 *
22 */22 */
23 23
24#include <core/object.h>24#include <nvif/os.h>
25#include <core/client.h>25#include <nvif/class.h>
26#include <core/device.h>
27#include <core/class.h>
28#include <core/mm.h>
29 26
30#include "nouveau_drm.h"27#include "nouveau_drm.h"
31#include "nouveau_dma.h"28#include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nouveau_agp.c+0−2
@@ -1,7 +1,5 @@
1#include <linux/module.h>1#include <linux/module.h>
2 2
3#include <core/device.h>
4
5#include "nouveau_drm.h"3#include "nouveau_drm.h"
6#include "nouveau_agp.h"4#include "nouveau_agp.h"
7#include "nouveau_reg.h"5#include "nouveau_reg.h"
drivers/gpu/drm/nouveau/nouveau_bo.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 * Jeremy Kolb <jkolb@brandeis.edu>27 * Jeremy Kolb <jkolb@brandeis.edu>
28 */28 */
29 29
30#include <core/engine.h>30#include <linux/dma-mapping.h>
31#include <linux/swiotlb.h>31#include <linux/swiotlb.h>
32 32
33#include "nouveau_drm.h"33#include "nouveau_drm.h"
drivers/gpu/drm/nouveau/nouveau_chan.c+4−3
@@ -22,10 +22,11 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs22 * Authors: Ben Skeggs
23 */23 */
24 24
25#include <core/object.h>25#include <nvif/os.h>
26#include <nvif/class.h>
27
28/*XXX*/
26#include <core/client.h>29#include <core/client.h>
27#include <core/device.h>
28#include <core/class.h>
29 30
30#include "nouveau_drm.h"31#include "nouveau_drm.h"
31#include "nouveau_dma.h"32#include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nouveau_connector.h+0−4
@@ -31,10 +31,6 @@ · 30 unmodified lines
31#include <drm/drm_dp_helper.h>31#include <drm/drm_dp_helper.h>
32#include "nouveau_crtc.h"32#include "nouveau_crtc.h"
33 33
34#include <core/event.h>
35
36#include <subdev/bios.h>
37
38struct nouveau_i2c_port;34struct nouveau_i2c_port;
39 35
40enum nouveau_underscan_type {36enum nouveau_underscan_type {
drivers/gpu/drm/nouveau/nouveau_display.c+2−1
@@ -27,6 +27,8 @@ · 26 unmodified lines
27#include <drm/drmP.h>27#include <drm/drmP.h>
28#include <drm/drm_crtc_helper.h>28#include <drm/drm_crtc_helper.h>
29 29
30#include <nvif/class.h>
31
30#include "nouveau_fbcon.h"32#include "nouveau_fbcon.h"
31#include "dispnv04/hw.h"33#include "dispnv04/hw.h"
32#include "nouveau_crtc.h"34#include "nouveau_crtc.h"
@@ -37,7 +39,6 @@ · 4 unmodified lines
37 39
38#include "nouveau_fence.h"40#include "nouveau_fence.h"
39 41
40#include <core/class.h>
41#include <nvif/event.h>42#include <nvif/event.h>
42 43
43static int44static int
drivers/gpu/drm/nouveau/nouveau_dma.c+0−2
@@ -24,8 +24,6 @@ · 23 unmodified lines
24 *24 *
25 */25 */
26 26
27#include <core/client.h>
28
29#include "nouveau_drm.h"27#include "nouveau_drm.h"
30#include "nouveau_dma.h"28#include "nouveau_dma.h"
31 29
drivers/gpu/drm/nouveau/nouveau_dp.c+0−2
@@ -30,8 +30,6 @@ · 29 unmodified lines
30#include "nouveau_encoder.h"30#include "nouveau_encoder.h"
31#include "nouveau_crtc.h"31#include "nouveau_crtc.h"
32 32
33#include <core/class.h>
34
35static void33static void
36nouveau_dp_probe_oui(struct drm_device *dev, struct nouveau_i2c_port *auxch,34nouveau_dp_probe_oui(struct drm_device *dev, struct nouveau_i2c_port *auxch,
37 u8 *dpcd)35 u8 *dpcd)
drivers/gpu/drm/nouveau/nouveau_drm.c+2−0
@@ -27,8 +27,10 @@ · 26 unmodified lines
27#include <linux/pci.h>27#include <linux/pci.h>
28#include <linux/pm_runtime.h>28#include <linux/pm_runtime.h>
29#include <linux/vga_switcheroo.h>29#include <linux/vga_switcheroo.h>
30
30#include "drmP.h"31#include "drmP.h"
31#include "drm_crtc_helper.h"32#include "drm_crtc_helper.h"
33
32#include <core/device.h>34#include <core/device.h>
33#include <core/gpuobj.h>35#include <core/gpuobj.h>
34#include <core/class.h>36#include <core/class.h>
drivers/gpu/drm/nouveau/nouveau_drm.h+1−4
@@ -25,13 +25,10 @@ · 24 unmodified lines
25 * - fixes multiple bugs in flip completion events and timestamping25 * - fixes multiple bugs in flip completion events and timestamping
26 */26 */
27 27
28#include <core/client.h>
29#include <core/event.h>
30
31#include <nvif/client.h>28#include <nvif/client.h>
32#include <nvif/device.h>29#include <nvif/device.h>
33 30
34#include <subdev/vm.h>31#include <core/class.h>
35 32
36#include <drmP.h>33#include <drmP.h>
37#include <drm/nouveau_drm.h>34#include <drm/nouveau_drm.h>
drivers/gpu/drm/nouveau/nouveau_fbcon.c+0−3
@@ -51,9 +51,6 @@ · 50 unmodified lines
51 51
52#include "nouveau_crtc.h"52#include "nouveau_crtc.h"
53 53
54#include <core/client.h>
55#include <core/device.h>
56
57MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration");54MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration");
58static int nouveau_nofbaccel = 0;55static int nouveau_nofbaccel = 0;
59module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400);56module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400);
drivers/gpu/drm/nouveau/nouveau_sysfs.c+3−3
@@ -22,10 +22,10 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs <bskeggs@redhat.com>22 * Authors: Ben Skeggs <bskeggs@redhat.com>
23 */23 */
24 24
25#include "nouveau_sysfs.h"25#include <nvif/os.h>
26#include <nvif/class.h>
26 27
27#include <core/object.h>28#include "nouveau_sysfs.h"
28#include <core/class.h>
29 29
30static inline struct drm_device *30static inline struct drm_device *
31drm_device(struct device *d)31drm_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
203 nouveau_gart_manager_debug203 nouveau_gart_manager_debug
204};204};
205 205
206/*XXX*/
206#include <core/subdev/vm/nv04.h>207#include <core/subdev/vm/nv04.h>
207static int208static int
208nv04_gart_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)209nv04_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
22 * DEALINGS IN THE SOFTWARE.22 * DEALINGS IN THE SOFTWARE.
23 */23 */
24 24
25#include <core/object.h>
26
27#include "nouveau_drm.h"25#include "nouveau_drm.h"
28#include "nouveau_dma.h"26#include "nouveau_dma.h"
29#include "nouveau_fbcon.h"27#include "nouveau_fbcon.h"
drivers/gpu/drm/nouveau/nv10_fence.c+0−3
@@ -22,9 +22,6 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs <bskeggs@redhat.com>22 * Authors: Ben Skeggs <bskeggs@redhat.com>
23 */23 */
24 24
25#include <core/object.h>
26#include <core/class.h>
27
28#include "nouveau_drm.h"25#include "nouveau_drm.h"
29#include "nouveau_dma.h"26#include "nouveau_dma.h"
30#include "nv10_fence.h"27#include "nv10_fence.h"
drivers/gpu/drm/nouveau/nv10_fence.h+0−1
@@ -1,7 +1,6 @@
1#ifndef __NV10_FENCE_H_1#ifndef __NV10_FENCE_H_
2#define __NV10_FENCE_H_2#define __NV10_FENCE_H_
3 3
4#include <core/os.h>
5#include "nouveau_fence.h"4#include "nouveau_fence.h"
6#include "nouveau_bo.h"5#include "nouveau_bo.h"
7 6
drivers/gpu/drm/nouveau/nv17_fence.c+2−2
@@ -22,8 +22,8 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs <bskeggs@redhat.com>22 * Authors: Ben Skeggs <bskeggs@redhat.com>
23 */23 */
24 24
25#include <core/object.h>25#include <nvif/os.h>
26#include <core/class.h>26#include <nvif/class.h>
27 27
28#include "nouveau_drm.h"28#include "nouveau_drm.h"
29#include "nouveau_dma.h"29#include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nv50_display.c+2−2
@@ -28,6 +28,8 @@ · 27 unmodified lines
28#include <drm/drm_crtc_helper.h>28#include <drm/drm_crtc_helper.h>
29#include <drm/drm_dp_helper.h>29#include <drm/drm_dp_helper.h>
30 30
31#include <nvif/class.h>
32
31#include "nouveau_drm.h"33#include "nouveau_drm.h"
32#include "nouveau_dma.h"34#include "nouveau_dma.h"
33#include "nouveau_gem.h"35#include "nouveau_gem.h"
@@ -37,8 +39,6 @@ · 3 unmodified lines
37#include "nouveau_fence.h"39#include "nouveau_fence.h"
38#include "nv50_display.h"40#include "nv50_display.h"
39 41
40#include <core/class.h>
41
42#define EVO_DMA_NR 942#define EVO_DMA_NR 9
43 43
44#define EVO_MASTER (0x00)44#define EVO_MASTER (0x00)
drivers/gpu/drm/nouveau/nv50_fence.c+2−2
@@ -22,8 +22,8 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs <bskeggs@redhat.com>22 * Authors: Ben Skeggs <bskeggs@redhat.com>
23 */23 */
24 24
25#include <core/object.h>25#include <nvif/os.h>
26#include <core/class.h>26#include <nvif/class.h>
27 27
28#include "nouveau_drm.h"28#include "nouveau_drm.h"
29#include "nouveau_dma.h"29#include "nouveau_dma.h"
drivers/gpu/drm/nouveau/nv84_fence.c+0−4
@@ -22,10 +22,6 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs22 * Authors: Ben Skeggs
23 */23 */
24 24
25#include <core/object.h>
26#include <core/client.h>
27#include <core/class.h>
28
29#include "nouveau_drm.h"25#include "nouveau_drm.h"
30#include "nouveau_dma.h"26#include "nouveau_dma.h"
31#include "nouveau_fence.h"27#include "nouveau_fence.h"
drivers/gpu/drm/nouveau/nvc0_fence.c+0−4
@@ -22,10 +22,6 @@ · 21 unmodified lines
22 * Authors: Ben Skeggs22 * Authors: Ben Skeggs
23 */23 */
24 24
25#include <core/object.h>
26#include <core/client.h>
27#include <core/class.h>
28
29#include "nouveau_drm.h"25#include "nouveau_drm.h"
30#include "nouveau_dma.h"26#include "nouveau_dma.h"
31#include "nouveau_fence.h"27#include "nouveau_fence.h"