korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 08:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/disp: remove hw-specific customisation of output paths

Browse Source 
All of the necessary hw-specific logic is now handled at the output
resource level, so all of this can go away.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-05-19 23:59:35 +10:00
parent e8ccc96dd5
commit 3c66c87dc9
28 changed files with 36 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
View File

@ -23,6 +23,7 @@
*/ */
#include "priv.h" #include "priv.h"
#include "conn.h" #include "conn.h"
#include "dp.h"
#include "head.h" #include "head.h"
#include "ior.h" #include "ior.h"
#include "outp.h" #include "outp.h"
@ -252,7 +253,8 @@ static int
nvkm_disp_oneinit(struct nvkm_engine *engine) nvkm_disp_oneinit(struct nvkm_engine *engine)
{ {
struct nvkm_disp *disp = nvkm_disp(engine); struct nvkm_disp *disp = nvkm_disp(engine);
struct nvkm_bios *bios = disp->engine.subdev.device->bios; struct nvkm_subdev *subdev = &disp->engine.subdev;
struct nvkm_bios *bios = subdev->device->bios;
struct nvkm_outp *outp, *outt, *pair; struct nvkm_outp *outp, *outt, *pair;
struct nvkm_conn *conn; struct nvkm_conn *conn;
struct nvkm_head *head; struct nvkm_head *head;
@ -265,52 +267,38 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
/* Create output path objects for each VBIOS display path. */ /* Create output path objects for each VBIOS display path. */
i = -1; i = -1;
while ((data = dcb_outp_parse(bios, ++i, &ver, &hdr, &dcbE))) { while ((data = dcb_outp_parse(bios, ++i, &ver, &hdr, &dcbE))) {
const struct nvkm_disp_func_outp *outps;
int (*ctor)(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_outp **);
if (dcbE.type == DCB_OUTPUT_UNUSED) if (dcbE.type == DCB_OUTPUT_UNUSED)
continue; continue;
if (dcbE.type == DCB_OUTPUT_EOL) if (dcbE.type == DCB_OUTPUT_EOL)
break; break;
outp = NULL; outp = NULL;
switch (dcbE.location) {
case 0: outps = &disp->func->outp.internal; break;
case 1: outps = &disp->func->outp.external; break;
default:
nvkm_warn(&disp->engine.subdev,
"dcb %d locn %d unknown\n", i, dcbE.location);
continue;
}
switch (dcbE.type) { switch (dcbE.type) {
case DCB_OUTPUT_ANALOG: ctor = outps->crt ; break; case DCB_OUTPUT_ANALOG:
case DCB_OUTPUT_TV : ctor = outps->tv ; break; case DCB_OUTPUT_TV:
case DCB_OUTPUT_TMDS : ctor = outps->tmds; break; case DCB_OUTPUT_TMDS:
case DCB_OUTPUT_LVDS : ctor = outps->lvds; break; case DCB_OUTPUT_LVDS:
case DCB_OUTPUT_DP : ctor = outps->dp ; break; ret = nvkm_outp_new(disp, i, &dcbE, &outp);
break;
case DCB_OUTPUT_DP:
ret = nvkm_dp_new(disp, i, &dcbE, &outp);
break;
default: default:
nvkm_warn(&disp->engine.subdev, nvkm_warn(subdev, "dcb %d type %d unknown\n",
"dcb %d type %d unknown\n", i, dcbE.type); i, dcbE.type);
continue; continue;
} }
if (ctor)
ret = ctor(disp, i, &dcbE, &outp);
else
ret = -ENODEV;
if (ret) { if (ret) {
if (ret == -ENODEV) { if (outp) {
nvkm_debug(&disp->engine.subdev, if (ret != -ENODEV)
"dcb %d %d/%d not supported\n", OUTP_ERR(outp, "ctor failed: %d", ret);
i, dcbE.location, dcbE.type); else
OUTP_DBG(outp, "not supported");
nvkm_outp_del(&outp);
continue; continue;
} }
nvkm_error(&disp->engine.subdev, nvkm_error(subdev, "failed to create outp %d\n", i);
"failed to create outp %d\n", i);
nvkm_outp_del(&outp);
continue; continue;
} }

13
drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
View File

@ -22,22 +22,9 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "ior.h" #include "ior.h"
#include "outp.h"
#include <subdev/timer.h> #include <subdev/timer.h>
static const struct nvkm_output_func
nv50_dac_output_func = {
};
int
nv50_dac_output_new(struct nvkm_disp *disp, int index,
struct dcb_output *dcbE, struct nvkm_output **poutp)
{
return nvkm_output_new_(&nv50_dac_output_func, disp,
index, dcbE, poutp);
}
int int
nv50_dac_sense(struct nvkm_ior *dac, u32 loadval) nv50_dac_sense(struct nvkm_ior *dac, u32 loadval)
{ {

10
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
View File

@ -580,7 +580,7 @@ nvkm_dp_ctor(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
dp->aux = aux; dp->aux = aux;
if (!dp->aux) { if (!dp->aux) {
OUTP_ERR(&dp->outp, "no aux"); OUTP_ERR(&dp->outp, "no aux");
return -ENODEV; return -EINVAL;
} }
/* bios data is not optional */ /* bios data is not optional */
@ -589,7 +589,7 @@ nvkm_dp_ctor(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
&hdr, &cnt, &len, &dp->info); &hdr, &cnt, &len, &dp->info);
if (!data) { if (!data) {
OUTP_ERR(&dp->outp, "no bios dp data"); OUTP_ERR(&dp->outp, "no bios dp data");
return -ENODEV; return -EINVAL;
} }
OUTP_DBG(&dp->outp, "bios dp %02x %02x %02x %02x", OUTP_DBG(&dp->outp, "bios dp %02x %02x %02x %02x",
@ -616,9 +616,8 @@ nvkm_dp_ctor(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
} }
int int
nvkm_output_dp_new_(const struct nvkm_output_dp_func *func, nvkm_dp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
struct nvkm_disp *disp, int index, struct dcb_output *dcbE, struct nvkm_outp **poutp)
struct nvkm_outp **poutp)
{ {
struct nvkm_i2c *i2c = disp->engine.subdev.device->i2c; struct nvkm_i2c *i2c = disp->engine.subdev.device->i2c;
struct nvkm_i2c_aux *aux; struct nvkm_i2c_aux *aux;
@ -631,7 +630,6 @@ nvkm_output_dp_new_(const struct nvkm_output_dp_func *func,
if (!(dp = kzalloc(sizeof(*dp), GFP_KERNEL))) if (!(dp = kzalloc(sizeof(*dp), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
dp->func = func;
*poutp = &dp->outp; *poutp = &dp->outp;
return nvkm_dp_ctor(disp, index, dcbE, aux, dp); return nvkm_dp_ctor(disp, index, dcbE, aux, dp);

23
drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
View File

@ -8,7 +8,6 @@
#include <subdev/bios/dp.h> #include <subdev/bios/dp.h>
struct nvkm_dp { struct nvkm_dp {
const struct nvkm_output_dp_func *func;
union { union {
struct nvkm_outp base; struct nvkm_outp base;
struct nvkm_outp outp; struct nvkm_outp outp;
@ -32,28 +31,10 @@ struct nvkm_dp {
#define nvkm_output_dp nvkm_dp #define nvkm_output_dp nvkm_dp
struct nvkm_output_dp_func {
};
int nvkm_output_dp_train(struct nvkm_output *, u32 rate); int nvkm_output_dp_train(struct nvkm_output *, u32 rate);
int nvkm_output_dp_new_(const struct nvkm_output_dp_func *, struct nvkm_disp *, int nvkm_dp_new(struct nvkm_disp *, int index, struct dcb_output *,
int index, struct dcb_output *, struct nvkm_output **); struct nvkm_outp **);
int nv50_pior_dp_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
int g94_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
int gm107_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
int gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
/* DPCD Receiver Capabilities */ /* DPCD Receiver Capabilities */
#define DPCD_RC00_DPCD_REV 0x00000 #define DPCD_RC00_DPCD_REV 0x00000

5
drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
View File

@ -33,11 +33,6 @@ g84_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &g84_disp_root_oclass, .root = &g84_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 2, .new = g84_sor_new }, .sor = { .nr = 2, .new = g84_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

6
drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
View File

@ -33,12 +33,6 @@ g94_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &g94_disp_root_oclass, .root = &g94_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = g94_sor_dp_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 4, .new = g94_sor_new }, .sor = { .nr = 4, .new = g94_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
View File

@ -502,10 +502,6 @@ gf119_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gf119_disp_root_oclass, .root = &gf119_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gf119_sor_dp_new,
.dac = { .nr = 3, .new = gf119_dac_new }, .dac = { .nr = 3, .new = gf119_dac_new },
.sor = { .nr = 4, .new = gf119_sor_new }, .sor = { .nr = 4, .new = gf119_sor_new },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
View File

@ -34,10 +34,6 @@ gk104_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gk104_disp_root_oclass, .root = &gk104_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gf119_sor_dp_new,
.dac = { .nr = 3, .new = gf119_dac_new }, .dac = { .nr = 3, .new = gf119_dac_new },
.sor = { .nr = 4, .new = gk104_sor_new }, .sor = { .nr = 4, .new = gk104_sor_new },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c
View File

@ -34,10 +34,6 @@ gk110_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gk110_disp_root_oclass, .root = &gk110_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gf119_sor_dp_new,
.dac = { .nr = 3, .new = gf119_dac_new }, .dac = { .nr = 3, .new = gf119_dac_new },
.sor = { .nr = 4, .new = gk104_sor_new }, .sor = { .nr = 4, .new = gk104_sor_new },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
View File

@ -34,10 +34,6 @@ gm107_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gm107_disp_root_oclass, .root = &gm107_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gm107_sor_dp_new,
.dac = { .nr = 3, .new = gf119_dac_new }, .dac = { .nr = 3, .new = gf119_dac_new },
.sor = { .nr = 4, .new = gm107_sor_new }, .sor = { .nr = 4, .new = gm107_sor_new },
}; };

4
drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c
View File

@ -34,10 +34,6 @@ gm200_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gm200_disp_root_oclass, .root = &gm200_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gm200_sor_dp_new,
.dac = { .nr = 3, .new = gf119_dac_new }, .dac = { .nr = 3, .new = gf119_dac_new },
.sor.nr = 4, .sor.nr = 4,
.sor.new = gm200_sor_new, .sor.new = gm200_sor_new,

3
drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c
View File

@ -34,9 +34,6 @@ gp100_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gp100_disp_root_oclass, .root = &gp100_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gm200_sor_dp_new,
.sor.nr = 4, .sor.nr = 4,
.sor.new = gm200_sor_new, .sor.new = gm200_sor_new,
.sor.magic = gm200_sor_magic, .sor.magic = gm200_sor_magic,

3
drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c
View File

@ -60,9 +60,6 @@ gp102_disp = {
.super = gf119_disp_super, .super = gf119_disp_super,
.root = &gp102_disp_root_oclass, .root = &gp102_disp_root_oclass,
.head.new = gf119_head_new, .head.new = gf119_head_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = gm200_sor_dp_new,
.sor.nr = 4, .sor.nr = 4,
.sor.new = gm200_sor_new, .sor.new = gm200_sor_new,
.sor.magic = gm200_sor_magic, .sor.magic = gm200_sor_magic,

5
drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
View File

@ -33,11 +33,6 @@ gt200_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &gt200_disp_root_oclass, .root = &gt200_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 2, .new = g84_sor_new }, .sor = { .nr = 2, .new = g84_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

6
drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
View File

@ -33,12 +33,6 @@ gt215_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &gt215_disp_root_oclass, .root = &gt215_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = g94_sor_dp_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 4, .new = gt215_sor_new }, .sor = { .nr = 4, .new = gt215_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

6
drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
View File

@ -31,12 +31,6 @@ mcp77_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &g94_disp_root_oclass, .root = &g94_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = g94_sor_dp_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 4, .new = mcp77_sor_new }, .sor = { .nr = 4, .new = mcp77_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

6
drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
View File

@ -31,12 +31,6 @@ mcp89_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &gt215_disp_root_oclass, .root = &gt215_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.internal.dp = g94_sor_dp_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 4, .new = mcp89_sor_new }, .sor = { .nr = 4, .new = mcp89_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

68
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
View File

@ -42,63 +42,6 @@ nv50_disp_root_(struct nvkm_disp *base)
return nv50_disp(base)->func->root; return nv50_disp(base)->func->root;
} }
static int
nv50_disp_outp_internal_crt_(struct nvkm_disp *base, int index,
struct dcb_output *dcb, struct nvkm_output **poutp)
{
struct nv50_disp *disp = nv50_disp(base);
return disp->func->outp.internal.crt(base, index, dcb, poutp);
}
static int
nv50_disp_outp_internal_tmds_(struct nvkm_disp *base, int index,
struct dcb_output *dcb,
struct nvkm_output **poutp)
{
struct nv50_disp *disp = nv50_disp(base);
return disp->func->outp.internal.tmds(base, index, dcb, poutp);
}
static int
nv50_disp_outp_internal_lvds_(struct nvkm_disp *base, int index,
struct dcb_output *dcb,
struct nvkm_output **poutp)
{
struct nv50_disp *disp = nv50_disp(base);
return disp->func->outp.internal.lvds(base, index, dcb, poutp);
}
static int
nv50_disp_outp_internal_dp_(struct nvkm_disp *base, int index,
struct dcb_output *dcb, struct nvkm_output **poutp)
{
struct nv50_disp *disp = nv50_disp(base);
if (disp->func->outp.internal.dp)
return disp->func->outp.internal.dp(base, index, dcb, poutp);
return -ENODEV;
}
static int
nv50_disp_outp_external_tmds_(struct nvkm_disp *base, int index,
struct dcb_output *dcb,
struct nvkm_output **poutp)
{
struct nv50_disp *disp = nv50_disp(base);
if (disp->func->outp.external.tmds)
return disp->func->outp.external.tmds(base, index, dcb, poutp);
return -ENODEV;
}
static int
nv50_disp_outp_external_dp_(struct nvkm_disp *base, int index,
struct dcb_output *dcb, struct nvkm_output **poutp)
{
struct nv50_disp *disp = nv50_disp(base);
if (disp->func->outp.external.dp)
return disp->func->outp.external.dp(base, index, dcb, poutp);
return -ENODEV;
}
static void static void
nv50_disp_intr_(struct nvkm_disp *base) nv50_disp_intr_(struct nvkm_disp *base)
{ {
@ -121,12 +64,6 @@ nv50_disp_ = {
.dtor = nv50_disp_dtor_, .dtor = nv50_disp_dtor_,
.intr = nv50_disp_intr_, .intr = nv50_disp_intr_,
.root = nv50_disp_root_, .root = nv50_disp_root_,
.outp.internal.crt = nv50_disp_outp_internal_crt_,
.outp.internal.tmds = nv50_disp_outp_internal_tmds_,
.outp.internal.lvds = nv50_disp_outp_internal_lvds_,
.outp.internal.dp = nv50_disp_outp_internal_dp_,
.outp.external.tmds = nv50_disp_outp_external_tmds_,
.outp.external.dp = nv50_disp_outp_external_dp_,
}; };
int int
@ -839,11 +776,6 @@ nv50_disp = {
.super = nv50_disp_super, .super = nv50_disp_super,
.root = &nv50_disp_root_oclass, .root = &nv50_disp_root_oclass,
.head.new = nv50_head_new, .head.new = nv50_head_new,
.outp.internal.crt = nv50_dac_output_new,
.outp.internal.tmds = nv50_sor_output_new,
.outp.internal.lvds = nv50_sor_output_new,
.outp.external.tmds = nv50_pior_output_new,
.outp.external.dp = nv50_pior_dp_new,
.dac = { .nr = 3, .new = nv50_dac_new }, .dac = { .nr = 3, .new = nv50_dac_new },
.sor = { .nr = 2, .new = nv50_sor_new }, .sor = { .nr = 2, .new = nv50_sor_new },
.pior = { .nr = 3, .new = nv50_pior_new }, .pior = { .nr = 3, .new = nv50_pior_new },

18
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
View File

@ -32,19 +32,6 @@ int nv50_disp_new_(const struct nv50_disp_func *, struct nvkm_device *,
int gf119_disp_new_(const struct nv50_disp_func *, struct nvkm_device *, int gf119_disp_new_(const struct nv50_disp_func *, struct nvkm_device *,
int index, struct nvkm_disp **); int index, struct nvkm_disp **);
struct nv50_disp_func_outp {
int (* crt)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (* tv)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (*tmds)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (*lvds)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (* dp)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
};
struct nv50_disp_func { struct nv50_disp_func {
void (*intr)(struct nv50_disp *); void (*intr)(struct nv50_disp *);
void (*intr_error)(struct nv50_disp *, int chid); void (*intr_error)(struct nv50_disp *, int chid);
@ -58,11 +45,6 @@ struct nv50_disp_func {
int (*new)(struct nvkm_disp *, int id); int (*new)(struct nvkm_disp *, int id);
} head; } head;
struct {
const struct nv50_disp_func_outp internal;
const struct nv50_disp_func_outp external;
} outp;
struct { struct {
int nr; int nr;
int (*new)(struct nvkm_disp *, int id); int (*new)(struct nvkm_disp *, int id);

11
drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
View File

@ -142,12 +142,15 @@ nvkm_outp_ctor(const struct nvkm_outp_func *func, struct nvkm_disp *disp,
return 0; return 0;
} }
static const struct nvkm_outp_func
nvkm_outp = {
};
int int
nvkm_outp_new_(const struct nvkm_outp_func *func, nvkm_outp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
struct nvkm_disp *disp, int index, struct dcb_output *dcbE, struct nvkm_outp **poutp)
struct nvkm_outp **poutp)
{ {
if (!(*poutp = kzalloc(sizeof(**poutp), GFP_KERNEL))) if (!(*poutp = kzalloc(sizeof(**poutp), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
return nvkm_outp_ctor(func, disp, index, dcbE, *poutp); return nvkm_outp_ctor(&nvkm_outp, disp, index, dcbE, *poutp);
} }

12
drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h
View File

@ -23,6 +23,8 @@ struct nvkm_outp {
int nvkm_outp_ctor(const struct nvkm_outp_func *, struct nvkm_disp *, int nvkm_outp_ctor(const struct nvkm_outp_func *, struct nvkm_disp *,
int index, struct dcb_output *, struct nvkm_outp *); int index, struct dcb_output *, struct nvkm_outp *);
int nvkm_outp_new(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_outp **);
void nvkm_outp_del(struct nvkm_outp **); void nvkm_outp_del(struct nvkm_outp **);
void nvkm_outp_init(struct nvkm_outp *); void nvkm_outp_init(struct nvkm_outp *);
void nvkm_outp_fini(struct nvkm_outp *); void nvkm_outp_fini(struct nvkm_outp *);
@ -37,16 +39,6 @@ struct nvkm_outp_func {
#define nvkm_output_func nvkm_outp_func #define nvkm_output_func nvkm_outp_func
#define nvkm_output_new_ nvkm_outp_new_ #define nvkm_output_new_ nvkm_outp_new_
int nvkm_outp_new_(const struct nvkm_outp_func *, struct nvkm_disp *,
int index, struct dcb_output *, struct nvkm_output **);
int nv50_dac_output_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
int nv50_sor_output_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
int nv50_pior_output_new(struct nvkm_disp *, int, struct dcb_output *,
struct nvkm_output **);
void gm200_sor_magic(struct nvkm_output *outp); void gm200_sor_magic(struct nvkm_output *outp);
#define OUTP_MSG(o,l,f,a...) do { \ #define OUTP_MSG(o,l,f,a...) do { \

31
drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
View File

@ -22,29 +22,10 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "ior.h" #include "ior.h"
#include "dp.h"
#include <subdev/i2c.h> #include <subdev/i2c.h>
#include <subdev/timer.h> #include <subdev/timer.h>
/******************************************************************************
* TMDS
*****************************************************************************/
static const struct nvkm_output_func
nv50_pior_output_func = {
};
int
nv50_pior_output_new(struct nvkm_disp *disp, int index,
struct dcb_output *dcbE, struct nvkm_output **poutp)
{
return nvkm_output_new_(&nv50_pior_output_func, disp,
index, dcbE, poutp);
}
/******************************************************************************
* DisplayPort
*****************************************************************************/
static int static int
nv50_pior_dp_links(struct nvkm_ior *pior, struct nvkm_i2c_aux *aux) nv50_pior_dp_links(struct nvkm_ior *pior, struct nvkm_i2c_aux *aux)
{ {
@ -55,18 +36,6 @@ nv50_pior_dp_links(struct nvkm_ior *pior, struct nvkm_i2c_aux *aux)
return 1; return 1;
} }
static const struct nvkm_output_dp_func
nv50_pior_output_dp_func = {
};
int
nv50_pior_dp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
struct nvkm_output **poutp)
{
return nvkm_output_dp_new_(&nv50_pior_output_dp_func, disp,
index, dcbE, poutp);
}
static void static void
nv50_pior_power_wait(struct nvkm_device *device, u32 poff) nv50_pior_power_wait(struct nvkm_device *device, u32 poff)
{ {

18
drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h
View File

@ -9,29 +9,11 @@ int nvkm_disp_new_(const struct nvkm_disp_func *, struct nvkm_device *,
int index, struct nvkm_disp **); int index, struct nvkm_disp **);
void nvkm_disp_vblank(struct nvkm_disp *, int head); void nvkm_disp_vblank(struct nvkm_disp *, int head);
struct nvkm_disp_func_outp {
int (* crt)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (* tv)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (*tmds)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (*lvds)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
int (* dp)(struct nvkm_disp *, int index, struct dcb_output *,
struct nvkm_output **);
};
struct nvkm_disp_func { struct nvkm_disp_func {
void *(*dtor)(struct nvkm_disp *); void *(*dtor)(struct nvkm_disp *);
void (*intr)(struct nvkm_disp *); void (*intr)(struct nvkm_disp *);
const struct nvkm_disp_oclass *(*root)(struct nvkm_disp *); const struct nvkm_disp_oclass *(*root)(struct nvkm_disp *);
struct {
const struct nvkm_disp_func_outp internal;
const struct nvkm_disp_func_outp external;
} outp;
}; };
int nvkm_disp_ntfy(struct nvkm_object *, u32, struct nvkm_event **); int nvkm_disp_ntfy(struct nvkm_object *, u32, struct nvkm_event **);

11
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c
View File

@ -91,17 +91,6 @@ g94_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux)
return 0; return 0;
} }
static const struct nvkm_output_dp_func
g94_sor_dp_func = {
};
int
g94_sor_dp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
struct nvkm_output **poutp)
{
return nvkm_output_dp_new_(&g94_sor_dp_func, disp, index, dcbE, poutp);
}
static bool static bool
nv50_disp_dptmds_war(struct nvkm_device *device) nv50_disp_dptmds_war(struct nvkm_device *device)
{ {

12
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
View File

@ -22,7 +22,6 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "ior.h" #include "ior.h"
#include "nv50.h"
#include <subdev/timer.h> #include <subdev/timer.h>
@ -100,17 +99,6 @@ gf119_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux)
return 0; return 0;
} }
static const struct nvkm_output_dp_func
gf119_sor_dp_func = {
};
int
gf119_sor_dp_new(struct nvkm_disp *disp, int index,
struct dcb_output *dcbE, struct nvkm_output **poutp)
{
return nvkm_output_dp_new_(&gf119_sor_dp_func, disp, index, dcbE, poutp);
}
void void
gf119_sor_state(struct nvkm_ior *sor, struct nvkm_ior_state *state) gf119_sor_state(struct nvkm_ior *sor, struct nvkm_ior_state *state)
{ {

12
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
View File

@ -22,7 +22,6 @@
* Authors: Ben Skeggs <bskeggs@redhat.com> * Authors: Ben Skeggs <bskeggs@redhat.com>
*/ */
#include "ior.h" #include "ior.h"
#include "nv50.h"
void void
gm107_sor_dp_pattern(struct nvkm_ior *sor, int pattern) gm107_sor_dp_pattern(struct nvkm_ior *sor, int pattern)
@ -36,17 +35,6 @@ gm107_sor_dp_pattern(struct nvkm_ior *sor, int pattern)
nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data); nvkm_mask(device, 0x61c12c + soff, 0x0f0f0f0f, data);
} }
static const struct nvkm_output_dp_func
gm107_sor_dp_func = {
};
int
gm107_sor_dp_new(struct nvkm_disp *disp, int index,
struct dcb_output *dcbE, struct nvkm_output **poutp)
{
return nvkm_output_dp_new_(&gm107_sor_dp_func, disp, index, dcbE, poutp);
}
static const struct nvkm_ior_func static const struct nvkm_ior_func
gm107_sor = { gm107_sor = {
.state = gf119_sor_state, .state = gf119_sor_state,

12
drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
View File

@ -22,7 +22,6 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "ior.h" #include "ior.h"
#include "nv50.h"
static void static void
gm200_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu) gm200_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu)
@ -46,17 +45,6 @@ gm200_sor_dp_drive(struct nvkm_ior *sor, int ln, int pc, int dc, int pe, int pu)
nvkm_wr32(device, 0x61c13c + loff, data[3] | (pc << shift)); nvkm_wr32(device, 0x61c13c + loff, data[3] | (pc << shift));
} }
static const struct nvkm_output_dp_func
gm200_sor_dp_func = {
};
int
gm200_sor_dp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
struct nvkm_output **poutp)
{
return nvkm_output_dp_new_(&gm200_sor_dp_func, disp, index, dcbE, poutp);
}
void void
gm200_sor_magic(struct nvkm_output *outp) gm200_sor_magic(struct nvkm_output *outp)
{ {

13
drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
View File

@ -22,22 +22,9 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include "ior.h" #include "ior.h"
#include "outp.h"
#include <subdev/timer.h> #include <subdev/timer.h>
static const struct nvkm_output_func
nv50_sor_output_func = {
};
int
nv50_sor_output_new(struct nvkm_disp *disp, int index,
struct dcb_output *dcbE, struct nvkm_output **poutp)
{
return nvkm_output_new_(&nv50_sor_output_func, disp,
index, dcbE, poutp);
}
static void static void
nv50_sor_power_wait(struct nvkm_device *device, u32 soff) nv50_sor_power_wait(struct nvkm_device *device, u32 soff)
{ {