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

Commit 1a646342 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv04/disp: hide all the cruft away in its own little hole 



It'd be pretty awesome if someone would care enough to port this all
properly to a class interface, perhaps submitting a command stream to
the core via a sw object on PFIFO (emulating how EVO works basically,
and also what nvidia have done forever..)..

But, this seems unlikely given how old this hardware is now, so, lets
just hide it away.

There's a heap of other bits and pieces laying around that are still
tangled.  I'll (re)move them in pieces.

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

drivers/gpu/drm/nouveau/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -225,9 +225,7 @@ nouveau-y += nouveau_connector.o nouveau_dp.o 
nouveau-y += nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o



# drm/kms/nv04:nv50

nouveau-y += nouveau_hw.o nouveau_calc.o

nouveau-y += nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o

nouveau-y += nv04_crtc.o nv04_display.o nv04_cursor.o

include $(src)/dispnv04/Makefile



# drm/kms/nv50-

nouveau-y += nv50_display.o

drivers/gpu/drm/nouveau/dispnv04/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
nouveau-y += dispnv04/arb.o

nouveau-y += dispnv04/crtc.o

nouveau-y += dispnv04/cursor.o

nouveau-y += dispnv04/dac.o

nouveau-y += dispnv04/dfp.o

nouveau-y += dispnv04/disp.o

nouveau-y += dispnv04/hw.o

nouveau-y += dispnv04/tvmodesnv17.o

nouveau-y += dispnv04/tvnv04.o

nouveau-y += dispnv04/tvnv17.o

drivers/gpu/drm/nouveau/nouveau_calc.c→drivers/gpu/drm/nouveau/dispnv04/arb.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include "nouveau_drm.h"

#include "nouveau_reg.h"

#include "nouveau_hw.h"

#include "hw.h"



/****************************************************************************\

*                                                                            *

drivers/gpu/drm/nouveau/nv04_crtc.c→drivers/gpu/drm/nouveau/dispnv04/crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ 
#include "nouveau_encoder.h"

#include "nouveau_connector.h"

#include "nouveau_crtc.h"

#include "nouveau_hw.h"

#include "hw.h"

#include "nvreg.h"

#include "nouveau_fbcon.h"

#include "nv04_display.h"

#include "disp.h"



#include <subdev/bios/pll.h>

#include <subdev/clock.h>
@@ -1070,4 +1070,3 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num) 


	return 0;

}

drivers/gpu/drm/nouveau/nv04_cursor.c→drivers/gpu/drm/nouveau/dispnv04/cursor.c

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include "nouveau_drm.h"

#include "nouveau_reg.h"

#include "nouveau_crtc.h"

#include "nouveau_hw.h"

#include "hw.h"



static void

nv04_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
@@ -68,4 +68,3 @@ nv04_cursor_init(struct nouveau_crtc *crtc) 
	crtc->cursor.show = nv04_cursor_show;

	return 0;

}