diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 20:46:33 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2022-11-09 08:22:02 +1000 |
| commit | f530bc60a30bee47ff51b7fb71511fdd058b774a (patch) | |
| tree | ae005aa9887ded2d1260c9ed56bd938a1bab450a /drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | |
| parent | 9793083f1dd9da8dda0ef68e90934dd7d112203b (diff) | |
| download | linux-f530bc60a30bee47ff51b7fb71511fdd058b774a.tar.bz2 | |
drm/nouveau/disp: move HDMI config into acquire + infoframe methods
v2:
- fix typo in sorhdmi/g84 struct initialiser (kbuild test robot)
v3:
- less convoluted flow control in nvkm_uoutp_mthd_acquire_tmds() (lyude)
v4:
- we don't support hdmi on original nv50, don't try
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c index 7489d0d7fce0..52099b75f52a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c @@ -105,10 +105,7 @@ ga102_sor = { .state = gv100_sor_state, .power = nv50_sor_power, .clock = ga102_sor_clock, - .hdmi = { - .ctrl = gv100_sor_hdmi_ctrl, - .scdc = gm200_sor_hdmi_scdc, - }, + .hdmi = &gv100_sor_hdmi, .dp = &ga102_sor_dp, .hda = &gv100_sor_hda, }; |