From a3e81117ce0bcec293352558613e35065659da10 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 19 May 2017 23:59:35 +1000 Subject: [PATCH] drm/nouveau/disp/g94-: port OR DP link power control to nvkm_ior Git-commit: a3e81117ce0bcec293352558613e35065659da10 Patch-mainline: v4.13-rc1 References: bsc#1095094 Signed-off-by: Ben Skeggs Acked-by: Takashi Iwai --- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 2 - drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 2 - drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 2 + drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c | 7 ----- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 15 +++++------- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 2 - drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c | 1 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c | 2 - drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c | 24 -------------------- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c | 1 drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c | 1 drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c | 1 12 files changed, 17 insertions(+), 43 deletions(-) --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c @@ -249,7 +249,7 @@ nvkm_dp_train_links(struct nvkm_dp *dp) return 0; } - dp->func->lnk_pwr(dp, ior->dp.nr); + ior->func->dp.power(ior, ior->dp.nr); /* Set desired link configuration on the sink. */ sink[0] = ior->dp.bw; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h @@ -34,7 +34,6 @@ struct nvkm_dp { struct nvkm_output_dp_func { int (*pattern)(struct nvkm_output_dp *, int); - int (*lnk_pwr)(struct nvkm_output_dp *, int nr); int (*drv_ctl)(struct nvkm_output_dp *, int ln, int vs, int pe, int pc); void (*vcpi)(struct nvkm_output_dp *, int head, u8 start_slot, u8 num_slots, u16 pbn, u16 aligned_pbn); @@ -50,7 +49,6 @@ int nv50_pior_dp_new(struct nvkm_disp *, int g94_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *, struct nvkm_output **); -int g94_sor_dp_lnk_pwr(struct nvkm_dp *, int); int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *, struct nvkm_output **); --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h @@ -54,6 +54,7 @@ struct nvkm_ior_func { struct { u8 lanes[4]; int (*links)(struct nvkm_ior *, struct nvkm_i2c_aux *); + void (*power)(struct nvkm_ior *, int nr); } dp; }; @@ -82,6 +83,7 @@ void nv50_sor_power(struct nvkm_ior *, b void g94_sor_state(struct nvkm_ior *, struct nvkm_ior_state *); int g94_sor_dp_links(struct nvkm_ior *, struct nvkm_i2c_aux *); +void g94_sor_dp_power(struct nvkm_ior *, int); void gf119_sor_state(struct nvkm_ior *, struct nvkm_ior_state *); int gf119_sor_dp_links(struct nvkm_ior *, struct nvkm_i2c_aux *); --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c @@ -52,12 +52,6 @@ nv50_pior_output_dp_pattern(struct nvkm_ } static int -nv50_pior_output_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr) -{ - return 0; -} - -static int nv50_pior_dp_links(struct nvkm_ior *pior, struct nvkm_i2c_aux *aux) { int ret = nvkm_i2c_aux_lnk_ctl(aux, pior->dp.nr, pior->dp.bw, @@ -70,7 +64,6 @@ nv50_pior_dp_links(struct nvkm_ior *pior static const struct nvkm_output_dp_func nv50_pior_output_dp_func = { .pattern = nv50_pior_output_dp_pattern, - .lnk_pwr = nv50_pior_output_dp_lnk_pwr, }; int --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c @@ -90,16 +90,16 @@ g94_sor_dp_pattern(struct nvkm_output_dp return 0; } -int -g94_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr) +void +g94_sor_dp_power(struct nvkm_ior *sor, int nr) { - struct nvkm_device *device = outp->base.disp->engine.subdev.device; - const u32 soff = g94_sor_soff(outp); - const u32 loff = g94_sor_loff(outp); + struct nvkm_device *device = sor->disp->engine.subdev.device; + const u32 soff = nv50_ior_base(sor); + const u32 loff = nv50_sor_link(sor); u32 mask = 0, i; for (i = 0; i < nr; i++) - mask |= 1 << (g94_sor_dp_lane_map(device, i) >> 3); + mask |= 1 << sor->func->dp.lanes[i]; nvkm_mask(device, 0x61c130 + loff, 0x0000000f, mask); nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000); @@ -107,7 +107,6 @@ g94_sor_dp_lnk_pwr(struct nvkm_output_dp if (!(nvkm_rd32(device, 0x61c034 + soff) & 0x80000000)) break; ); - return 0; } int @@ -133,7 +132,6 @@ g94_sor_dp_links(struct nvkm_ior *sor, s static const struct nvkm_output_dp_func g94_sor_dp_func = { .pattern = g94_sor_dp_pattern, - .lnk_pwr = g94_sor_dp_lnk_pwr, .drv_ctl = g94_sor_dp_drv_ctl, }; @@ -300,6 +298,7 @@ g94_sor = { .dp = { .lanes = { 2, 1, 0, 3}, .links = g94_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c @@ -117,7 +117,6 @@ gf119_sor_dp_links(struct nvkm_ior *sor, static const struct nvkm_output_dp_func gf119_sor_dp_func = { .pattern = gf119_sor_dp_pattern, - .lnk_pwr = g94_sor_dp_lnk_pwr, .drv_ctl = gf119_sor_dp_drv_ctl, .vcpi = gf119_sor_dp_vcpi, }; @@ -162,6 +161,7 @@ gf119_sor = { .dp = { .lanes = { 2, 1, 0, 3 }, .links = gf119_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c @@ -31,6 +31,7 @@ gk104_sor = { .dp = { .lanes = { 2, 1, 0, 3 }, .links = gf119_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c @@ -40,7 +40,6 @@ gm107_sor_dp_pattern(struct nvkm_output_ static const struct nvkm_output_dp_func gm107_sor_dp_func = { .pattern = gm107_sor_dp_pattern, - .lnk_pwr = g94_sor_dp_lnk_pwr, .drv_ctl = gf119_sor_dp_drv_ctl, .vcpi = gf119_sor_dp_vcpi, }; @@ -62,6 +61,7 @@ gm107_sor = { .dp = { .lanes = { 0, 1, 2, 3 }, .links = gf119_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c @@ -24,8 +24,6 @@ #include "ior.h" #include "nv50.h" -#include - static inline u32 gm200_sor_soff(struct nvkm_output_dp *outp) { @@ -82,30 +80,9 @@ gm200_sor_dp_drv_ctl(struct nvkm_output_ return 0; } -static int -gm200_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr) -{ - struct nvkm_device *device = outp->base.disp->engine.subdev.device; - const u32 soff = gm200_sor_soff(outp); - const u32 loff = gm200_sor_loff(outp); - u32 mask = 0, i; - - for (i = 0; i < nr; i++) - mask |= 1 << (gm200_sor_dp_lane_map(device, i) >> 3); - - nvkm_mask(device, 0x61c130 + loff, 0x0000000f, mask); - nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000); - nvkm_msec(device, 2000, - if (!(nvkm_rd32(device, 0x61c034 + soff) & 0x80000000)) - break; - ); - return 0; -} - static const struct nvkm_output_dp_func gm200_sor_dp_func = { .pattern = gm107_sor_dp_pattern, - .lnk_pwr = gm200_sor_dp_lnk_pwr, .drv_ctl = gm200_sor_dp_drv_ctl, .vcpi = gf119_sor_dp_vcpi, }; @@ -139,6 +116,7 @@ gm200_sor = { .dp = { .lanes = { 0, 1, 2, 3 }, .links = gf119_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c @@ -31,6 +31,7 @@ gt215_sor = { .dp = { .lanes = { 2, 1, 0, 3 }, .links = g94_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c @@ -31,6 +31,7 @@ mcp77_sor = { .dp = { .lanes = { 2, 1, 0, 3}, .links = g94_sor_dp_links, + .power = g94_sor_dp_power, }, }; --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c @@ -31,6 +31,7 @@ mcp89_sor = { .dp = { .lanes = { 3, 2, 1, 0 }, .links = g94_sor_dp_links, + .power = g94_sor_dp_power, }, };