Commit a971558c authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs

drm/nouveau/disp: keep track of high-speed state, program into clock

The register programmed by the clock method needs to contain a different
setting for the link speed as well as special divider settings.
Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4834e050
...@@ -31,4 +31,6 @@ gm200_hdmi_scdc(struct nvkm_ior *ior, int head, u8 scdc) ...@@ -31,4 +31,6 @@ gm200_hdmi_scdc(struct nvkm_ior *ior, int head, u8 scdc)
const u32 ctrl = scdc & 0x3; const u32 ctrl = scdc & 0x3;
nvkm_mask(device, 0x61c5bc + hoff, 0x00000003, ctrl); nvkm_mask(device, 0x61c5bc + hoff, 0x00000003, ctrl);
ior->tmds.high_speed = !!(scdc & 0x2);
} }
...@@ -41,6 +41,11 @@ struct nvkm_ior { ...@@ -41,6 +41,11 @@ struct nvkm_ior {
u8 nr; u8 nr;
u8 bw; u8 bw;
} dp; } dp;
/* Armed TMDS state. */
struct {
bool high_speed;
} tmds;
}; };
struct nvkm_ior_func { struct nvkm_ior_func {
......
...@@ -120,13 +120,16 @@ void ...@@ -120,13 +120,16 @@ void
gf119_sor_clock(struct nvkm_ior *sor) gf119_sor_clock(struct nvkm_ior *sor)
{ {
struct nvkm_device *device = sor->disp->engine.subdev.device; struct nvkm_device *device = sor->disp->engine.subdev.device;
const int div = sor->asy.link == 3;
const u32 soff = nv50_ior_base(sor); const u32 soff = nv50_ior_base(sor);
u32 div1 = sor->asy.link == 3;
u32 div2 = sor->asy.link == 3;
if (sor->asy.proto == TMDS) { if (sor->asy.proto == TMDS) {
/* NFI why, but this sets DP_LINK_BW_2_7 when using TMDS. */ const u32 speed = sor->tmds.high_speed ? 0x14 : 0x0a;
nvkm_mask(device, 0x612300 + soff, 0x007c0000, 0x0a << 18); nvkm_mask(device, 0x612300 + soff, 0x007c0000, speed << 18);
if (sor->tmds.high_speed)
div2 = 1;
} }
nvkm_mask(device, 0x612300 + soff, 0x00000707, (div << 8) | div); nvkm_mask(device, 0x612300 + soff, 0x00000707, (div2 << 8) | div1);
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment