diff options
| author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-30 18:42:27 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-30 18:42:27 +0300 |
| commit | 3ac52d0d219d5d973601c52e215f0e922b2b2d49 (patch) | |
| tree | bf6754e2aefc89998236c0a7dd7ead295d31f0d4 /drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | |
| parent | a8f910ec66583bfb61558c3f333195b3960d832d (diff) | |
| parent | 609488bc979f99f805f34e9a32c1e3b71179d10b (diff) | |
| download | linux-3ac52d0d219d5d973601c52e215f0e922b2b2d49.tar.xz | |
Merge tag 'v5.3-rc2' into patchwork
Linux 5.3-rc2
* tag 'v5.3-rc2': (342 commits)
Linux 5.3-rc2
kbuild: remove unused single-used-m
gen_compile_commands: lower the entry count threshold
.gitignore: Add compilation database file
kbuild: remove unused objectify macro
dt-bindings: Fix more $id value mismatches filenames
dt-bindings: nvmem: SID: Fix the examples node names
dt-bindings: nvmem: Add YAML schemas for the generic NVMEM bindings
of: Fix typo in kerneldoc
block: fix max segment size handling in blk_queue_virt_boundary
docs: phy: Drop duplicate 'be made'
fix the struct mount leak in umount_tree()
MAINTAINERS: vfio-ccw: Remove myself as the maintainer
s390/mm: use shared variables for sysctl range check
virtio/s390: fix race on airq_areas[]
s390/dma: provide proper ARCH_ZONE_DMA_BITS value
btrfs: fix extent_state leak in btrfs_lock_and_flush_ordered_range
Makefile: Globally enable fall-through warning
drm/i915: Mark expected switch fall-throughs
drm/amd/display: Mark expected switch fall-throughs
...
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c index c1a92c16535c..5cc3acccda2a 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c @@ -262,12 +262,12 @@ void dce110_clk_mgr_construct( struct dc_context *ctx, struct clk_mgr_internal *clk_mgr) { + dce_clk_mgr_construct(ctx, clk_mgr); + memcpy(clk_mgr->max_clks_by_state, dce110_max_clks_by_state, sizeof(dce110_max_clks_by_state)); - dce_clk_mgr_construct(ctx, clk_mgr); - clk_mgr->regs = &disp_clk_regs; clk_mgr->clk_mgr_shift = &disp_clk_shift; clk_mgr->clk_mgr_mask = &disp_clk_mask; |