diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-06-10 13:47:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-06-10 13:47:13 +1000 |
| commit | c707b73f0cfb1acc94a20389aecde65e6385349b (patch) | |
| tree | be2d0069c38a87c4f2e6c4d3e7097d5ee672a3bb /drivers/gpu/drm/amd/display/dmub/dmub_srv.h | |
| parent | a2098e857b765bd39a9c67c81448f60d5c475846 (diff) | |
| parent | 2c1b1ac7084edf477309d27c02d9da7f79b33cec (diff) | |
| download | linux-c707b73f0cfb1acc94a20389aecde65e6385349b.tar.gz linux-c707b73f0cfb1acc94a20389aecde65e6385349b.tar.bz2 linux-c707b73f0cfb1acc94a20389aecde65e6385349b.zip | |
Merge tag 'amd-drm-next-5.14-2021-06-09' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-5.14-2021-06-09:
amdgpu:
- SR-IOV fixes
- Smartshift updates
- GPUVM TLB flush updates
- 16bpc fixed point display fix for DCE11
- BACO cleanups and core refactoring
- Aldebaran updates
- Initial Yellow Carp support
- RAS fixes
- PM API cleanup
- DC visual confirm updates
- DC DP MST fixes
- DC DML fixes
- Misc code cleanups and bug fixes
amdkfd:
- Initial Yellow Carp support
radeon:
- memcpy_to/from_io fixes
UAPI:
- Add Yellow Carp chip family id
Used internally in the kernel driver and by mesa
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210610031649.4006-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/dmub/dmub_srv.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h index ed58abc5b3f9..7634e8d94543 100644 --- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h +++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h @@ -73,6 +73,9 @@ extern "C" { /* Forward declarations */ struct dmub_srv; struct dmub_srv_common_regs; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 +struct dmub_srv_dcn31_regs; +#endif struct dmcub_trace_buf_entry; @@ -94,6 +97,9 @@ enum dmub_asic { DMUB_ASIC_DCN301, DMUB_ASIC_DCN302, DMUB_ASIC_DCN303, +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 + DMUB_ASIC_DCN31, +#endif DMUB_ASIC_MAX, }; @@ -232,6 +238,9 @@ struct dmub_srv_hw_params { uint32_t psp_version; bool load_inst_const; bool skip_panel_power_sequence; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 + bool disable_z10; +#endif }; /** @@ -364,6 +373,9 @@ struct dmub_srv { /* private: internal use only */ const struct dmub_srv_common_regs *regs; +#ifdef CONFIG_DRM_AMD_DC_DCN3_1 + const struct dmub_srv_dcn31_regs *regs_dcn31; +#endif struct dmub_srv_base_funcs funcs; struct dmub_srv_hw_funcs hw_funcs; |