summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2022-06-01 13:46:29 +0300
committerDave Airlie <airlied@redhat.com>2022-07-27 02:05:48 +0300
commit7bcf89eed48f3fba8d0e2c19236e7dc547b6e037 (patch)
tree6bfdeef6898a18e3add05e91c566b638ad9c35c8 /drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
parent9a4514fbffda6083d9f7fba4882142686783cfe4 (diff)
downloadlinux-7bcf89eed48f3fba8d0e2c19236e7dc547b6e037.tar.xz
drm/nouveau/disp: split sor hda funcs out to their own struct
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
index 81c01a1bf92e..1708e0e3332e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
@@ -36,7 +36,7 @@
#include <nvif/clc37e.h>
#include <nvif/unpack.h>
-void
+static void
gv100_sor_hda_device_entry(struct nvkm_ior *ior, int head)
{
struct nvkm_device *device = ior->disp->engine.subdev.device;
@@ -45,6 +45,13 @@ gv100_sor_hda_device_entry(struct nvkm_ior *ior, int head)
nvkm_mask(device, 0x616528 + hoff, 0x00000070, head << 4);
}
+const struct nvkm_ior_func_hda
+gv100_sor_hda = {
+ .hpd = gf119_sor_hda_hpd,
+ .eld = gf119_sor_hda_eld,
+ .device_entry = gv100_sor_hda_device_entry,
+};
+
void
gv100_sor_dp_watermark(struct nvkm_ior *sor, int head, u8 watermark)
{
@@ -190,11 +197,7 @@ gv100_sor = {
.scdc = gm200_sor_hdmi_scdc,
},
.dp = &gv100_sor_dp,
- .hda = {
- .hpd = gf119_sor_hda_hpd,
- .eld = gf119_sor_hda_eld,
- .device_entry = gv100_sor_hda_device_entry,
- },
+ .hda = &gv100_sor_hda,
};
static int