diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2022-06-01 20:46:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-07-27 09:05:45 +1000 |
| commit | 7786fb366e598e984ee9307616b0c72979bd191c (patch) | |
| tree | 63671893de5534e4828b0450c509def817cf8041 /drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | |
| parent | 89ed996b888faaf11c69bb4cbc19f21475c9050e (diff) | |
drm/nouveau/disp: collapse nvkm_dp into nvkm_outp
There should be no changes to code here other than modifying the
dereferences.
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/outp.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h index ee028d30cfe7..8745d6a8139c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h @@ -2,9 +2,11 @@ #ifndef __NVKM_DISP_OUTP_H__ #define __NVKM_DISP_OUTP_H__ #include <engine/disp.h> +#include <core/notify.h> #include <subdev/bios.h> #include <subdev/bios/dcb.h> +#include <subdev/bios/dp.h> struct nvkm_outp { const struct nvkm_outp_func *func; @@ -23,6 +25,34 @@ struct nvkm_outp { #define NVKM_OUTP_USER 2 u8 acquired:2; struct nvkm_ior *ior; + + union { + struct { + struct nvbios_dpout info; + u8 version; + + struct nvkm_i2c_aux *aux; + + struct nvkm_notify hpd; + bool present; + u8 lttpr[6]; + u8 lttprs; + u8 dpcd[16]; + + struct { + int dpcd; /* -1, or index into SUPPORTED_LINK_RATES table */ + u32 rate; + } rate[8]; + int rates; + int links; + + struct mutex mutex; + struct { + atomic_t done; + bool mst; + } lt; + } dp; + }; }; int nvkm_outp_ctor(const struct nvkm_outp_func *, struct nvkm_disp *, |