Commit 0ad72863 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: port to nvif client/device/objects 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 967e7bde

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ nouveau-y += nouveau_drm.o nouveau_chan.o nouveau_dma.o nouveau_fence.o 
nouveau-y += nouveau_vga.o nouveau_agp.o

nouveau-y += nouveau_ttm.o nouveau_sgdma.o nouveau_bo.o nouveau_gem.o

nouveau-y += nouveau_prime.o nouveau_abi16.o

nouveau-y += nouveau_nvif.o

nouveau-y += nv04_fence.o nv10_fence.o nv17_fence.o

nouveau-y += nv50_fence.o nv84_fence.o nvc0_fence.o

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

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ nv04_display_create(struct drm_device *dev) 
	if (!disp)

		return -ENOMEM;



	nvif_object_map(nvif_object(&drm->device));



	nouveau_display(dev)->priv = disp;

	nouveau_display(dev)->dtor = nv04_display_destroy;

	nouveau_display(dev)->init = nv04_display_init;
@@ -144,6 +146,7 @@ void 
nv04_display_destroy(struct drm_device *dev)

{

	struct nv04_display *disp = nv04_display(dev);

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct drm_encoder *encoder;

	struct drm_crtc *crtc;
@@ -170,6 +173,8 @@ nv04_display_destroy(struct drm_device *dev) 


	nouveau_display(dev)->priv = NULL;

	kfree(disp);



	nvif_object_unmap(nvif_object(&drm->device));

}



int

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

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ 
#include "hw.h"



#include <subdev/bios/pll.h>

#include <subdev/fb.h>

#include <subdev/clock.h>

#include <subdev/timer.h>



#define CHIPSET_NFORCE 0x01a0

#define CHIPSET_NFORCE2 0x01f0

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

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 


#include <drm/i2c/ch7006.h>



#include <subdev/i2c.h>



static struct nouveau_i2c_board_info nv04_tv_encoder_info[] = {

	{

		{

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

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <core/device.h>



#include <subdev/bios/gpio.h>

#include <subdev/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"