Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/gpu/drm/nouveau/dispnv04/disp.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -22,9 +22,6 @@ 
 * Author: Ben Skeggs

 * Author: Ben Skeggs

 */

 */





#include <core/object.h>

#include <core/class.h>



#include <drm/drmP.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_crtc_helper.h>
@@ -34,8 +31,6 @@ 
#include "nouveau_encoder.h"

#include "nouveau_encoder.h"

#include "nouveau_connector.h"

#include "nouveau_connector.h"





#include <subdev/i2c.h>



int

int

nv04_display_early_init(struct drm_device *dev)

nv04_display_early_init(struct drm_device *dev)

{

{

drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -34,10 +34,6 @@ 
#include "hw.h"

#include "hw.h"

#include "tvnv17.h"

#include "tvnv17.h"





#include <core/device.h>



#include <subdev/bios/gpio.h>



MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"

MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"

		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"

		 "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n"

		 "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"

		 "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n"

drivers/gpu/drm/nouveau/nouveau_abi16.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -21,11 +21,8 @@ 
 *

 *

 */

 */





#include <core/object.h>

#include <nvif/os.h>

#include <core/client.h>

#include <nvif/class.h>

#include <core/device.h>

#include <core/class.h>

#include <core/mm.h>





#include "nouveau_drm.h"

#include "nouveau_drm.h"

#include "nouveau_dma.h"

#include "nouveau_dma.h"

drivers/gpu/drm/nouveau/nouveau_agp.c

+0 −2
Original line number Original line Diff line number Diff line 
#include <linux/module.h>

#include <linux/module.h>





#include <core/device.h>



#include "nouveau_drm.h"

#include "nouveau_drm.h"

#include "nouveau_agp.h"

#include "nouveau_agp.h"

#include "nouveau_reg.h"

#include "nouveau_reg.h"

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ 
 *	    Jeremy Kolb  <jkolb@brandeis.edu>

 *	    Jeremy Kolb  <jkolb@brandeis.edu>

 */

 */





#include <core/engine.h>

#include <linux/dma-mapping.h>

#include <linux/swiotlb.h>

#include <linux/swiotlb.h>





#include "nouveau_drm.h"

#include "nouveau_drm.h"