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

Commit b3c9c022 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp: fork off some new hw-specific implementations 



Upcoming commits make supervisor handling share code between the NV50
and GF119 implementations.  Because of this, and a few other cleanups,
we need to allow some additional customisation.

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

drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -24,7 +24,9 @@ int nv50_disp_new(struct nvkm_device *, int, struct nvkm_disp **); 
int g84_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int g84_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gt200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gt200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int g94_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int g94_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int mcp77_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gt215_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gt215_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int mcp89_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gf119_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gf119_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gk104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gk104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1257,7 +1257,7 @@ nvaa_chipset = { 
	.therm = g84_therm_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,

	.volt = nv40_volt_new,

	.disp = g94_disp_new,

	.disp = mcp77_disp_new,

	.dma = nv50_dma_new,

	.dma = nv50_dma_new,

	.fifo = g84_fifo_new,

	.fifo = g84_fifo_new,

	.gr = gt200_gr_new,

	.gr = gt200_gr_new,
@@ -1289,7 +1289,7 @@ nvac_chipset = { 
	.therm = g84_therm_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,

	.volt = nv40_volt_new,

	.disp = g94_disp_new,

	.disp = mcp77_disp_new,

	.dma = nv50_dma_new,

	.dma = nv50_dma_new,

	.fifo = g84_fifo_new,

	.fifo = g84_fifo_new,

	.gr = mcp79_gr_new,

	.gr = mcp79_gr_new,
@@ -1323,7 +1323,7 @@ nvaf_chipset = { 
	.timer = nv41_timer_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,

	.volt = nv40_volt_new,

	.ce[0] = gt215_ce_new,

	.ce[0] = gt215_ce_new,

	.disp = gt215_disp_new,

	.disp = mcp89_disp_new,

	.dma = nv50_dma_new,

	.dma = nv50_dma_new,

	.fifo = g84_fifo_new,

	.fifo = g84_fifo_new,

	.gr = mcp89_gr_new,

	.gr = mcp89_gr_new,

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+8 −0
Original line number Original line Diff line number Diff line
@@ -4,7 +4,9 @@ nvkm-y += nvkm/engine/disp/nv50.o 
nvkm-y += nvkm/engine/disp/g84.o

nvkm-y += nvkm/engine/disp/g84.o

nvkm-y += nvkm/engine/disp/g94.o

nvkm-y += nvkm/engine/disp/g94.o

nvkm-y += nvkm/engine/disp/gt200.o

nvkm-y += nvkm/engine/disp/gt200.o

nvkm-y += nvkm/engine/disp/mcp77.o

nvkm-y += nvkm/engine/disp/gt215.o

nvkm-y += nvkm/engine/disp/gt215.o

nvkm-y += nvkm/engine/disp/mcp89.o

nvkm-y += nvkm/engine/disp/gf119.o

nvkm-y += nvkm/engine/disp/gf119.o

nvkm-y += nvkm/engine/disp/gk104.o

nvkm-y += nvkm/engine/disp/gk104.o

nvkm-y += nvkm/engine/disp/gk110.o

nvkm-y += nvkm/engine/disp/gk110.o
@@ -21,10 +23,16 @@ nvkm-y += nvkm/engine/disp/headgf119.o 




nvkm-y += nvkm/engine/disp/ior.o

nvkm-y += nvkm/engine/disp/ior.o

nvkm-y += nvkm/engine/disp/dacnv50.o

nvkm-y += nvkm/engine/disp/dacnv50.o

nvkm-y += nvkm/engine/disp/dacgf119.o

nvkm-y += nvkm/engine/disp/piornv50.o

nvkm-y += nvkm/engine/disp/piornv50.o

nvkm-y += nvkm/engine/disp/sornv50.o

nvkm-y += nvkm/engine/disp/sornv50.o

nvkm-y += nvkm/engine/disp/sorg84.o

nvkm-y += nvkm/engine/disp/sorg94.o

nvkm-y += nvkm/engine/disp/sorg94.o

nvkm-y += nvkm/engine/disp/sormcp77.o

nvkm-y += nvkm/engine/disp/sorgt215.o

nvkm-y += nvkm/engine/disp/sormcp89.o

nvkm-y += nvkm/engine/disp/sorgf119.o

nvkm-y += nvkm/engine/disp/sorgf119.o

nvkm-y += nvkm/engine/disp/sorgk104.o

nvkm-y += nvkm/engine/disp/sorgm107.o

nvkm-y += nvkm/engine/disp/sorgm107.o

nvkm-y += nvkm/engine/disp/sorgm200.o

nvkm-y += nvkm/engine/disp/sorgm200.o

drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2017 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include "ior.h"



static const struct nvkm_ior_func

gf119_dac = {

};



int

gf119_dac_new(struct nvkm_disp *disp, int id)

{

	return nvkm_ior_new_(&gf119_dac, disp, DAC, id);

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ g84_disp = { 
	.dac.power = nv50_dac_power,

	.dac.power = nv50_dac_power,

	.dac.sense = nv50_dac_sense,

	.dac.sense = nv50_dac_sense,

	.sor.nr = 2,

	.sor.nr = 2,

	.sor.new = nv50_sor_new,

	.sor.new = g84_sor_new,

	.sor.power = nv50_sor_power,

	.sor.power = nv50_sor_power,

	.sor.hdmi = g84_hdmi_ctrl,

	.sor.hdmi = g84_hdmi_ctrl,

	.pior.nr = 3,

	.pior.nr = 3,