diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2021-01-06 19:05:44 -0800 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2021-01-06 19:05:44 -0800 |
| commit | 9fb57b9173c3703d3b543e6823f2d6c9647b83f1 (patch) | |
| tree | 6b92920830e666baca0a4ce93f8010d4555258a9 /drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | |
| parent | 82d8d2c0d3970526f5f607ec12d423c083d68cf9 (diff) | |
| parent | 5b2fc08c455bbf749489254a81baeffdf4c0a693 (diff) | |
Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm into drm-next-5.11
drm fixes for 5.11-rc1
dma-buf:
- fix build on mips
komeda:
- fix commit tail operation order
- NULL pointer fix
- out of bounds access fix
ttm:
- remove an unused function
amdgpu:
- Vangogh SMU fixes
- Arcturus gfx9 fixes
- Misc display fixes
- Sienna Cichlid SMU update
- Fix S3 display memory leak
- Fix regression caused by DP sub-connector support
amdkfd:
- Properly require pcie atomics for gfx10
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c index 99cc095dc33c..6a99fdd55e8c 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c @@ -556,6 +556,7 @@ const struct mpc_funcs dcn20_mpc_funcs = { .set_ocsc_default = mpc2_set_ocsc_default, .set_output_gamma = mpc2_set_output_gamma, .power_on_mpc_mem_pwr = mpc20_power_on_ogam_lut, + .get_mpc_out_mux = mpc1_get_mpc_out_mux, }; void dcn20_mpc_construct(struct dcn20_mpc *mpc20, |