diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 23:59:35 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 14:04:56 +1000 |
| commit | a1de2b522fef9fd725f2edb6989af68b8749acf5 (patch) | |
| tree | cd02cf2fa35da76cc7ff3dde4a54e110bc412278 /drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | |
| parent | a3e81117ce0bcec293352558613e35065659da10 (diff) | |
drm/nouveau/disp/g94-: port OR DP training pattern control to nvkm_ior
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c index 569ed247bc1c..5b45c3ee4e59 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c @@ -81,13 +81,12 @@ g94_sor_dp_drv_ctl(struct nvkm_output_dp *outp, int ln, int vs, int pe, int pc) return 0; } -static int -g94_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern) +void +g94_sor_dp_pattern(struct nvkm_ior *sor, int pattern) { - struct nvkm_device *device = outp->base.disp->engine.subdev.device; - const u32 loff = g94_sor_loff(outp); + struct nvkm_device *device = sor->disp->engine.subdev.device; + const u32 loff = nv50_sor_link(sor); nvkm_mask(device, 0x61c10c + loff, 0x0f000000, pattern << 24); - return 0; } void @@ -131,7 +130,6 @@ g94_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux) static const struct nvkm_output_dp_func g94_sor_dp_func = { - .pattern = g94_sor_dp_pattern, .drv_ctl = g94_sor_dp_drv_ctl, }; @@ -299,6 +297,7 @@ g94_sor = { .lanes = { 2, 1, 0, 3}, .links = g94_sor_dp_links, .power = g94_sor_dp_power, + .pattern = g94_sor_dp_pattern, }, }; |