mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 04:34:11 +08:00
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: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
b9a3140ce8
commit
1a64634255
@ -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
|
||||
|
10
drivers/gpu/drm/nouveau/dispnv04/Makefile
Normal file
10
drivers/gpu/drm/nouveau/dispnv04/Makefile
Normal file
@ -0,0 +1,10 @@
|
||||
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
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_reg.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "hw.h"
|
||||
|
||||
/****************************************************************************\
|
||||
* *
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include "nouveau_encoder.h"
|
||||
#include "nouveau_connector.h"
|
||||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "hw.h"
|
||||
#include "nvreg.h"
|
||||
|
||||
#include <subdev/bios/gpio.h>
|
@ -32,7 +32,7 @@
|
||||
#include "nouveau_encoder.h"
|
||||
#include "nouveau_connector.h"
|
||||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "hw.h"
|
||||
#include "nvreg.h"
|
||||
|
||||
#include <drm/i2c/sil164.h>
|
@ -30,7 +30,7 @@
|
||||
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_reg.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "hw.h"
|
||||
#include "nouveau_encoder.h"
|
||||
#include "nouveau_connector.h"
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "hw.h"
|
||||
|
||||
#include <subdev/bios/pll.h>
|
||||
#include <subdev/clock.h>
|
@ -24,7 +24,8 @@
|
||||
#define __NOUVEAU_HW_H__
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include "nv04_display.h"
|
||||
#include "disp.h"
|
||||
#include "nvreg.h"
|
||||
|
||||
#include <subdev/bios/pll.h>
|
||||
|
@ -29,8 +29,8 @@
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_encoder.h"
|
||||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "nv17_tv.h"
|
||||
#include "hw.h"
|
||||
#include "tvnv17.h"
|
||||
|
||||
char *nv17_tv_norm_names[NUM_TV_NORMS] = {
|
||||
[TV_NORM_PAL] = "PAL",
|
@ -30,7 +30,7 @@
|
||||
#include "nouveau_encoder.h"
|
||||
#include "nouveau_connector.h"
|
||||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "hw.h"
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
|
||||
#include <drm/i2c/ch7006.h>
|
@ -31,8 +31,8 @@
|
||||
#include "nouveau_encoder.h"
|
||||
#include "nouveau_connector.h"
|
||||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "nv17_tv.h"
|
||||
#include "hw.h"
|
||||
#include "tvnv17.h"
|
||||
|
||||
#include <core/device.h>
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_reg.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "dispnv04/hw.h"
|
||||
#include "nouveau_encoder.h"
|
||||
|
||||
#include <linux/io-mapping.h>
|
||||
|
@ -24,8 +24,6 @@
|
||||
#ifndef __NOUVEAU_DISPBIOS_H__
|
||||
#define __NOUVEAU_DISPBIOS_H__
|
||||
|
||||
#include "nvreg.h"
|
||||
|
||||
#define DCB_MAX_NUM_ENTRIES 16
|
||||
#define DCB_MAX_NUM_I2C_ENTRIES 16
|
||||
#define DCB_MAX_NUM_GPIO_ENTRIES 32
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#include "nouveau_reg.h"
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "dispnv04/hw.h"
|
||||
#include "nouveau_acpi.h"
|
||||
|
||||
#include "nouveau_display.h"
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
|
||||
#include "nouveau_fbcon.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "dispnv04/hw.h"
|
||||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_dma.h"
|
||||
#include "nouveau_gem.h"
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include <subdev/bios/dcb.h>
|
||||
|
||||
#include <drm/drm_encoder_slave.h>
|
||||
#include "nv04_display.h"
|
||||
#include "dispnv04/disp.h"
|
||||
|
||||
#define NV_DPMS_CLEARED 0x80
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <drm/drmP.h>
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_reg.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "dispnv04/hw.h"
|
||||
#include "nouveau_pm.h"
|
||||
|
||||
#include <subdev/bios/pll.h>
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_bios.h"
|
||||
#include "nouveau_pm.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "dispnv04/hw.h"
|
||||
|
||||
#include <subdev/bios/pll.h>
|
||||
#include <subdev/clock.h>
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <drm/drmP.h>
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_bios.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "dispnv04/hw.h"
|
||||
#include "nouveau_pm.h"
|
||||
#include "nouveau_hwsq.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user