diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 16:59:35 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 07:04:57 +0300 |
| commit | e8ccc96dd5f4baa1deb21b6d3b2c4a07bcf62254 (patch) | |
| tree | 220c4800b9e31b9b9851731ed902d9d3e4499b07 /drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | |
| parent | 409b9e54727e700ab8dd15a1e29226eda1e04cdb (diff) | |
| download | linux-e8ccc96dd5f4baa1deb21b6d3b2c4a07bcf62254.tar.xz | |
drm/nouveau/disp/gf119-: port OR DP VCPI control to nvkm_ior
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c index c3dbfd26ace8..b313beda00d7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c @@ -41,10 +41,10 @@ gf119_sor_dp_audio(struct nvkm_ior *sor, int head, bool enable) } void -gf119_sor_dp_vcpi(struct nvkm_output_dp *outp, int head, u8 slot, - u8 slot_nr, u16 pbn, u16 aligned) +gf119_sor_dp_vcpi(struct nvkm_ior *sor, int head, + u8 slot, u8 slot_nr, u16 pbn, u16 aligned) { - struct nvkm_device *device = outp->base.disp->engine.subdev.device; + struct nvkm_device *device = sor->disp->engine.subdev.device; const u32 hoff = head * 0x800; nvkm_mask(device, 0x616588 + hoff, 0x00003f3f, (slot_nr << 8) | slot); @@ -102,7 +102,6 @@ gf119_sor_dp_links(struct nvkm_ior *sor, struct nvkm_i2c_aux *aux) static const struct nvkm_output_dp_func gf119_sor_dp_func = { - .vcpi = gf119_sor_dp_vcpi, }; int @@ -147,6 +146,7 @@ gf119_sor = { .links = gf119_sor_dp_links, .power = g94_sor_dp_power, .pattern = gf119_sor_dp_pattern, + .vcpi = gf119_sor_dp_vcpi, .audio = gf119_sor_dp_audio, }, .hda = { |