diff options
| author | Maxime Ripard | 2019-02-11 10:35:35 +0100 |
|---|---|---|
| committer | Maxime Ripard | 2019-02-11 10:35:35 +0100 |
| commit | d588100baa28dae6a5c32d02bfe744d0792ed2ad (patch) | |
| tree | 3be3984cea35a07b4259f8ebe55ce0e52e416d1c /drivers/gpu/drm/amd/display/dc/bios/command_table2.h | |
| parent | drm/doc: Remove solved KMS cleanup task (diff) | |
| parent | drm/virtio: do NOT reuse resource ids (diff) | |
| download | kernel-qcow2-linux-d588100baa28dae6a5c32d02bfe744d0792ed2ad.tar.gz kernel-qcow2-linux-d588100baa28dae6a5c32d02bfe744d0792ed2ad.tar.xz kernel-qcow2-linux-d588100baa28dae6a5c32d02bfe744d0792ed2ad.zip | |
Merge drm/drm-next into drm-misc-next
We need to backmerge drm-next to fix the komeda build failure.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/bios/command_table2.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/command_table2.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table2.h b/drivers/gpu/drm/amd/display/dc/bios/command_table2.h index ec1c0c9f3f1d..7a2af24dfe60 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/command_table2.h +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table2.h @@ -71,9 +71,6 @@ struct cmd_tbl { enum bp_result (*set_crtc_timing)( struct bios_parser *bp, struct bp_hw_crtc_timing_parameters *bp_params); - enum bp_result (*select_crtc_source)( - struct bios_parser *bp, - struct bp_crtc_source_select *bp_params); enum bp_result (*enable_crtc)( struct bios_parser *bp, enum controller_id controller_id, |