diff options
author | Dave Airlie <airlied@redhat.com> | 2022-01-07 14:13:40 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-01-07 14:13:40 +1000 |
commit | 3fcb2531073d29aad26a2fdb323a3c8c1c4307af (patch) | |
tree | ff61ba66171c7cfbfa5d0146ec23d4e74748ff76 /drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h | |
parent | 51a1809d7fcd03d74ad0f1294af559f2729aae42 (diff) | |
parent | cb6846fbb83b574c85c2a80211b402a6347b60b1 (diff) |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.17-merged
Trial merge with correct nouveau_fence.c fix
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h index 6905ef1e75a6..d76251fd1566 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h @@ -73,6 +73,7 @@ struct display_mode_lib { struct vba_vars_st vba; struct dal_logger *logger; struct dml_funcs funcs; + struct _vcs_dpi_display_e2e_pipe_params_st dml_pipe_state[6]; }; void dml_init_instance(struct display_mode_lib *lib, |