diff options
| author | Dave Airlie | 2018-10-04 03:03:34 +0200 |
|---|---|---|
| committer | Dave Airlie | 2018-10-04 03:03:34 +0200 |
| commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
| tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | |
| parent | Merge tag 'exynos-drm-next-for-v4.20' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Linux 4.19-rc6 (diff) | |
| download | kernel-qcow2-linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.gz kernel-qcow2-linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.tar.xz kernel-qcow2-linux-6004f172b375f5747e89afc62ad3baaf1bebd58a.zip | |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 6b7cccc486d8..b75ede5f84f7 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -2537,7 +2537,7 @@ static void pplib_apply_display_requirements( dc->prev_display_config = *pp_display_cfg; } -void dce110_set_bandwidth( +static void dce110_set_bandwidth( struct dc *dc, struct dc_state *context, bool decrease_allowed) |