Commit 515de6b2 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nv10/kms: add plane support for nv10-nv40 



Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8aa816b0

drivers/gpu/drm/nouveau/core/engine/disp/nv04.c

+9 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ nv04_disp_intr(struct nouveau_subdev *subdev) 
	struct nv04_disp_priv *priv = (void *)subdev;

	u32 crtc0 = nv_rd32(priv, 0x600100);

	u32 crtc1 = nv_rd32(priv, 0x602100);

	u32 pvideo;



	if (crtc0 & 0x00000001) {

		nouveau_event_trigger(priv->base.vblank, 0);
@@ -69,6 +70,14 @@ nv04_disp_intr(struct nouveau_subdev *subdev) 
		nouveau_event_trigger(priv->base.vblank, 1);

		nv_wr32(priv, 0x602100, 0x00000001);

	}



	if (nv_device(priv)->chipset >= 0x10 &&

	    nv_device(priv)->chipset <= 0x40) {

		pvideo = nv_rd32(priv, 0x8100);

		if (pvideo & ~0x11)

			nv_info(priv, "PVIDEO intr: %08x\n", pvideo);

		nv_wr32(priv, 0x8100, pvideo);

	}

}



static int

drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ nv04_mc_intr[] = { 
	{ 0x00000001, NVDEV_ENGINE_MPEG },	/* NV17- MPEG/ME */

	{ 0x00000100, NVDEV_ENGINE_FIFO },

	{ 0x00001000, NVDEV_ENGINE_GR },

	{ 0x00010000, NVDEV_ENGINE_DISP },

	{ 0x00020000, NVDEV_ENGINE_VP },	/* NV40- */

	{ 0x00100000, NVDEV_SUBDEV_TIMER },

	{ 0x01000000, NVDEV_ENGINE_DISP },	/* NV04- PCRTC0 */

drivers/gpu/drm/nouveau/dispnv04/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ nouveau-y += dispnv04/dac.o 
nouveau-y += dispnv04/dfp.o

nouveau-y += dispnv04/disp.o

nouveau-y += dispnv04/hw.o

nouveau-y += dispnv04/overlay.o

nouveau-y += dispnv04/tvmodesnv17.o

nouveau-y += dispnv04/tvnv04.o

nouveau-y += dispnv04/tvnv17.o

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

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ nv04_display_create(struct drm_device *dev) 
		func->save(encoder);

	}



	nouveau_overlay_init(dev);



	return 0;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ int nv04_tv_create(struct drm_connector *, struct dcb_output *); 
/* nv17_tv.c */

int nv17_tv_create(struct drm_connector *, struct dcb_output *);



/* overlay.c */

void nouveau_overlay_init(struct drm_device *dev);



static inline bool

nv_two_heads(struct drm_device *dev)

{