diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2023-09-19 17:56:21 -0400 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2023-09-19 18:22:10 -0400 |
| commit | 0bd4e9f7dcd17003b7274b0608bf6575c6a07b88 (patch) | |
| tree | 3e16645e49f732e80fea9d732057f21b81c2af9f /drivers | |
| parent | e9c9b5b942550bc0f77de3a8c47ea75ff4c0161e (diff) | |
| download | linux-stable-0bd4e9f7dcd17003b7274b0608bf6575c6a07b88.tar.gz linux-stable-0bd4e9f7dcd17003b7274b0608bf6575c6a07b88.tar.bz2 linux-stable-0bd4e9f7dcd17003b7274b0608bf6575c6a07b88.zip | |
drm/nouveau/disp: move dp aux pwr method to HAL
- preparation for GSP-RM
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Danilo Krummrich <me@dakr.org>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-27-lyude@redhat.com
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c index 0e6e38800376..99fe7ef07a44 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c @@ -41,6 +41,14 @@ */ #define AMPERE_IED_HACK(disp) ((disp)->engine.subdev.device->card_type >= GA100) +static int +nvkm_dp_aux_pwr(struct nvkm_outp *outp, bool pu) +{ + outp->dp.enabled = pu; + nvkm_dp_enable(outp, outp->dp.enabled); + return 0; +} + struct lt_state { struct nvkm_outp *outp; @@ -814,6 +822,7 @@ nvkm_dp_func = { .disable = nvkm_dp_disable, .bl.get = nvkm_outp_bl_get, .bl.set = nvkm_outp_bl_set, + .dp.aux_pwr = nvkm_dp_aux_pwr, }; int diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h index 38b6b43a9f20..513794a278a9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h @@ -104,6 +104,10 @@ struct nvkm_outp_func { int (*get)(struct nvkm_outp *); int (*set)(struct nvkm_outp *, int level); } bl; + + struct { + int (*aux_pwr)(struct nvkm_outp *, bool pu); + } dp; }; #define OUTP_MSG(o,l,f,a...) do { \ diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c index 7574f2200644..6ca364e953bd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c @@ -75,10 +75,10 @@ nvkm_uoutp_mthd_dp_aux_pwr(struct nvkm_outp *outp, void *argv, u32 argc) if (argc != sizeof(args->v0) || args->v0.version != 0) return -ENOSYS; + if (!outp->func->dp.aux_pwr) + return -EINVAL; - outp->dp.enabled = !!args->v0.state; - nvkm_dp_enable(outp, outp->dp.enabled); - return 0; + return outp->func->dp.aux_pwr(outp, !!args->v0.state); } static int |