diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-02-20 20:26:12 +0300 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-02-20 20:57:17 +0300 |
commit | fbb944086f2fa36c633be71cfcb38ce9f37eb90e (patch) | |
tree | 78428083a0de1e910a2eb025102b462bebdb8bfc /drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | |
parent | 0f688c0eb63a643ef0568b29b12cefbb23181e1a (diff) | |
parent | 9ac4beb7578a88baa4f7e6a59eeb5be79d7b011a (diff) | |
download | linux-fbb944086f2fa36c633be71cfcb38ce9f37eb90e.tar.xz |
Merge drm/drm-next into drm-xe-next
Bring changes from drm-misc-next that got merged in drm-next back to
drm-xe so they can be used for additional features.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c')
-rw-r--r-- | drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c index a47a47238e2b..82d540334318 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c @@ -258,7 +258,7 @@ int pp_atomfwctrl_get_gpu_pll_dividers_vega10(struct pp_hwmgr *hwmgr, idx = GetIndexIntoMasterCmdTable(computegpuclockparam); if (amdgpu_atom_execute_table( - adev->mode_info.atom_context, idx, (uint32_t *)&pll_parameters)) + adev->mode_info.atom_context, idx, (uint32_t *)&pll_parameters, sizeof(pll_parameters))) return -EINVAL; pll_output = (struct compute_gpu_clock_output_parameter_v1_8 *) @@ -505,7 +505,7 @@ int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, ix = GetIndexIntoMasterCmdTable(getsmuclockinfo); if (amdgpu_atom_execute_table( - adev->mode_info.atom_context, ix, (uint32_t *)¶meters)) + adev->mode_info.atom_context, ix, (uint32_t *)¶meters, sizeof(parameters))) return -EINVAL; output = (struct atom_get_smu_clock_info_output_parameters_v3_1 *)¶meters; |