Commit fdb751ef authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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


Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f45f55c4
......@@ -22,9 +22,6 @@
* Author: Ben Skeggs
*/
#include <core/object.h>
#include <core/class.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
......@@ -34,8 +31,6 @@
#include "nouveau_encoder.h"
#include "nouveau_connector.h"
#include <subdev/i2c.h>
int
nv04_display_early_init(struct drm_device *dev)
{
......
......@@ -34,10 +34,6 @@
#include "hw.h"
#include "tvnv17.h"
#include <core/device.h>
#include <subdev/bios/gpio.h>
MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
"\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"
"\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"
......
......@@ -21,11 +21,8 @@
*
*/
#include <core/object.h>
#include <core/client.h>
#include <core/device.h>
#include <core/class.h>
#include <core/mm.h>
#include <nvif/os.h>
#include <nvif/class.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
......
#include <linux/module.h>
#include <core/device.h>
#include "nouveau_drm.h"
#include "nouveau_agp.h"
#include "nouveau_reg.h"
......
......@@ -27,7 +27,7 @@
* Jeremy Kolb <jkolb@brandeis.edu>
*/
#include <core/engine.h>
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
#include "nouveau_drm.h"
......
......@@ -22,10 +22,11 @@
* Authors: Ben Skeggs
*/
#include <core/object.h>
#include <nvif/os.h>
#include <nvif/class.h>
/*XXX*/
#include <core/client.h>
#include <core/device.h>
#include <core/class.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
......
......@@ -31,10 +31,6 @@
#include <drm/drm_dp_helper.h>
#include "nouveau_crtc.h"
#include <core/event.h>
#include <subdev/bios.h>
struct nouveau_i2c_port;
enum nouveau_underscan_type {
......
......@@ -27,6 +27,8 @@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include <nvif/class.h>
#include "nouveau_fbcon.h"
#include "dispnv04/hw.h"
#include "nouveau_crtc.h"
......@@ -37,7 +39,6 @@
#include "nouveau_fence.h"
#include <core/class.h>
#include <nvif/event.h>
static int
......
......@@ -24,8 +24,6 @@
*
*/
#include <core/client.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
......
......@@ -30,8 +30,6 @@
#include "nouveau_encoder.h"
#include "nouveau_crtc.h"
#include <core/class.h>
static void
nouveau_dp_probe_oui(struct drm_device *dev, struct nouveau_i2c_port *auxch,
u8 *dpcd)
......
......@@ -27,8 +27,10 @@
#include <linux/pci.h>
#include <linux/pm_runtime.h>
#include <linux/vga_switcheroo.h>
#include "drmP.h"
#include "drm_crtc_helper.h"
#include <core/device.h>
#include <core/gpuobj.h>
#include <core/class.h>
......
......@@ -25,13 +25,10 @@
* - fixes multiple bugs in flip completion events and timestamping
*/
#include <core/client.h>
#include <core/event.h>
#include <nvif/client.h>
#include <nvif/device.h>
#include <subdev/vm.h>
#include <core/class.h>
#include <drmP.h>
#include <drm/nouveau_drm.h>
......
......@@ -51,9 +51,6 @@
#include "nouveau_crtc.h"
#include <core/client.h>
#include <core/device.h>
MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration");
static int nouveau_nofbaccel = 0;
module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400);
......
......@@ -22,10 +22,10 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include "nouveau_sysfs.h"
#include <nvif/os.h>
#include <nvif/class.h>
#include <core/object.h>
#include <core/class.h>
#include "nouveau_sysfs.h"
static inline struct drm_device *
drm_device(struct device *d)
......
......@@ -203,6 +203,7 @@ const struct ttm_mem_type_manager_func nouveau_gart_manager = {
nouveau_gart_manager_debug
};
/*XXX*/
#include <core/subdev/vm/nv04.h>
static int
nv04_gart_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)
......
......@@ -22,8 +22,6 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <core/object.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
#include "nouveau_fbcon.h"
......
......@@ -22,9 +22,6 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include <core/object.h>
#include <core/class.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
#include "nv10_fence.h"
......
#ifndef __NV10_FENCE_H_
#define __NV10_FENCE_H_
#include <core/os.h>
#include "nouveau_fence.h"
#include "nouveau_bo.h"
......
......@@ -22,8 +22,8 @@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include <core/object.h>
#include <core/class.h>
#include <nvif/os.h>
#include <nvif/class.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
......
......@@ -28,6 +28,8 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_dp_helper.h>
#include <nvif/class.h>
#include "nouveau_drm.h"
#include "nouveau_dma.h"
#include "nouveau_gem.h"
......@@ -37,8 +39,6 @@
#include "nouveau_fence.h"
#include "nv50_display.h"
#include <core/class.h>
#define EVO_DMA_NR 9
#define EVO_MASTER (0x00)
......
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