UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: clean up base dccg struct 

Move things not accessed outside dccg block into dce specific
struct

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dmytro Laktyushkin 2018-09-18 15:37:36 -04:00 committed by Alex Deucher
parent de801062bf
commit 4244381cd1
7 changed files with 37 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
View File

@ -244,7 +244,7 @@ static enum dm_pp_clocks_state dce_get_required_clocks_state(
* lowest RequiredState with the lowest state that satisfies * lowest RequiredState with the lowest state that satisfies
* all required clocks * all required clocks
*/ */
for (i = dccg->max_clks_state; i >= DM_PP_CLOCKS_STATE_ULTRA_LOW; i--) for (i = dccg_dce->max_clks_state; i >= DM_PP_CLOCKS_STATE_ULTRA_LOW; i--)
if (context->bw.dce.dispclk_khz > if (context->bw.dce.dispclk_khz >
dccg_dce->max_clks_by_state[i].display_clk_khz dccg_dce->max_clks_by_state[i].display_clk_khz
|| max_pix_clk > || max_pix_clk >
@ -252,13 +252,13 @@ static enum dm_pp_clocks_state dce_get_required_clocks_state(
break; break;
low_req_clk = i + 1; low_req_clk = i + 1;
if (low_req_clk > dccg->max_clks_state) { if (low_req_clk > dccg_dce->max_clks_state) {
/* set max clock state for high phyclock, invalid on exceeding display clock */ /* set max clock state for high phyclock, invalid on exceeding display clock */
if (dccg_dce->max_clks_by_state[dccg->max_clks_state].display_clk_khz if (dccg_dce->max_clks_by_state[dccg_dce->max_clks_state].display_clk_khz
< context->bw.dce.dispclk_khz) < context->bw.dce.dispclk_khz)
low_req_clk = DM_PP_CLOCKS_STATE_INVALID; low_req_clk = DM_PP_CLOCKS_STATE_INVALID;
else else
low_req_clk = dccg->max_clks_state; low_req_clk = dccg_dce->max_clks_state;
} }
return low_req_clk; return low_req_clk;
@ -298,7 +298,7 @@ static int dce_set_clock(
/* from power down, we need mark the clock state as ClocksStateNominal /* from power down, we need mark the clock state as ClocksStateNominal
* from HWReset, so when resume we will call pplib voltage regulator.*/ * from HWReset, so when resume we will call pplib voltage regulator.*/
if (requested_clk_khz == 0) if (requested_clk_khz == 0)
dccg->cur_min_clks_state = DM_PP_CLOCKS_STATE_NOMINAL; dccg_dce->cur_min_clks_state = DM_PP_CLOCKS_STATE_NOMINAL;
dmcu->funcs->set_psr_wait_loop(dmcu, actual_clock / 1000 / 7); dmcu->funcs->set_psr_wait_loop(dmcu, actual_clock / 1000 / 7);
@ -333,7 +333,7 @@ static int dce112_set_clock(
/* from power down, we need mark the clock state as ClocksStateNominal /* from power down, we need mark the clock state as ClocksStateNominal
* from HWReset, so when resume we will call pplib voltage regulator.*/ * from HWReset, so when resume we will call pplib voltage regulator.*/
if (requested_clk_khz == 0) if (requested_clk_khz == 0)
dccg->cur_min_clks_state = DM_PP_CLOCKS_STATE_NOMINAL; dccg_dce->cur_min_clks_state = DM_PP_CLOCKS_STATE_NOMINAL;
/*Program DP ref Clock*/ /*Program DP ref Clock*/
/*VBIOS will determine DPREFCLK frequency, so we don't set it*/ /*VBIOS will determine DPREFCLK frequency, so we don't set it*/
@ -839,9 +839,9 @@ static void dce_update_clocks(struct dccg *dccg,
struct dc_state *context, struct dc_state *context,
bool safe_to_lower) bool safe_to_lower)
{ {
struct dce_dccg *dccg_dce = TO_DCE_DCCG(dccg);
struct dm_pp_power_level_change_request level_change_req; struct dm_pp_power_level_change_request level_change_req;
int unpatched_disp_clk = context->bw.dce.dispclk_khz; int unpatched_disp_clk = context->bw.dce.dispclk_khz;
struct dce_dccg *dccg_dce = TO_DCE_DCCG(dccg);
/*TODO: W/A for dal3 linux, investigate why this works */ /*TODO: W/A for dal3 linux, investigate why this works */
if (!dccg_dce->dfs_bypass_active) if (!dccg_dce->dfs_bypass_active)
@ -849,10 +849,10 @@ static void dce_update_clocks(struct dccg *dccg,
level_change_req.power_level = dce_get_required_clocks_state(dccg, context); level_change_req.power_level = dce_get_required_clocks_state(dccg, context);
/* get max clock state from PPLIB */ /* get max clock state from PPLIB */
if ((level_change_req.power_level < dccg->cur_min_clks_state && safe_to_lower) if ((level_change_req.power_level < dccg_dce->cur_min_clks_state && safe_to_lower)
|| level_change_req.power_level > dccg->cur_min_clks_state) { || level_change_req.power_level > dccg_dce->cur_min_clks_state) {
if (dm_pp_apply_power_level_change_request(dccg->ctx, &level_change_req)) if (dm_pp_apply_power_level_change_request(dccg->ctx, &level_change_req))
dccg->cur_min_clks_state = level_change_req.power_level; dccg_dce->cur_min_clks_state = level_change_req.power_level;
} }
if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) { if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) {
@ -868,14 +868,15 @@ static void dce11_update_clocks(struct dccg *dccg,
struct dc_state *context, struct dc_state *context,
bool safe_to_lower) bool safe_to_lower)
{ {
struct dce_dccg *dccg_dce = TO_DCE_DCCG(dccg);
struct dm_pp_power_level_change_request level_change_req; struct dm_pp_power_level_change_request level_change_req;
level_change_req.power_level = dce_get_required_clocks_state(dccg, context); level_change_req.power_level = dce_get_required_clocks_state(dccg, context);
/* get max clock state from PPLIB */ /* get max clock state from PPLIB */
if ((level_change_req.power_level < dccg->cur_min_clks_state && safe_to_lower) if ((level_change_req.power_level < dccg_dce->cur_min_clks_state && safe_to_lower)
|| level_change_req.power_level > dccg->cur_min_clks_state) { || level_change_req.power_level > dccg_dce->cur_min_clks_state) {
if (dm_pp_apply_power_level_change_request(dccg->ctx, &level_change_req)) if (dm_pp_apply_power_level_change_request(dccg->ctx, &level_change_req))
dccg->cur_min_clks_state = level_change_req.power_level; dccg_dce->cur_min_clks_state = level_change_req.power_level;
} }
if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) { if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) {
@ -889,14 +890,15 @@ static void dce112_update_clocks(struct dccg *dccg,
struct dc_state *context, struct dc_state *context,
bool safe_to_lower) bool safe_to_lower)
{ {
struct dce_dccg *dccg_dce = TO_DCE_DCCG(dccg);
struct dm_pp_power_level_change_request level_change_req; struct dm_pp_power_level_change_request level_change_req;
level_change_req.power_level = dce_get_required_clocks_state(dccg, context); level_change_req.power_level = dce_get_required_clocks_state(dccg, context);
/* get max clock state from PPLIB */ /* get max clock state from PPLIB */
if ((level_change_req.power_level < dccg->cur_min_clks_state && safe_to_lower) if ((level_change_req.power_level < dccg_dce->cur_min_clks_state && safe_to_lower)
|| level_change_req.power_level > dccg->cur_min_clks_state) { || level_change_req.power_level > dccg_dce->cur_min_clks_state) {
if (dm_pp_apply_power_level_change_request(dccg->ctx, &level_change_req)) if (dm_pp_apply_power_level_change_request(dccg->ctx, &level_change_req))
dccg->cur_min_clks_state = level_change_req.power_level; dccg_dce->cur_min_clks_state = level_change_req.power_level;
} }
if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) { if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) {
@ -910,12 +912,14 @@ static void dce12_update_clocks(struct dccg *dccg,
struct dc_state *context, struct dc_state *context,
bool safe_to_lower) bool safe_to_lower)
{ {
struct dce_dccg *dccg_dce = TO_DCE_DCCG(dccg);
struct dm_pp_clock_for_voltage_req clock_voltage_req = {0}; struct dm_pp_clock_for_voltage_req clock_voltage_req = {0};
int max_pix_clk = get_max_pixel_clock_for_all_paths(context); int max_pix_clk = get_max_pixel_clock_for_all_paths(context);
int unpatched_disp_clk = context->bw.dce.dispclk_khz; int unpatched_disp_clk = context->bw.dce.dispclk_khz;
/* W/A for dal3 linux */ /*TODO: W/A for dal3 linux, investigate why this works */
context->bw.dce.dispclk_khz = context->bw.dce.dispclk_khz * 115 / 100; if (!dccg_dce->dfs_bypass_active)
context->bw.dce.dispclk_khz = context->bw.dce.dispclk_khz * 115 / 100;
if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) { if (should_set_clock(safe_to_lower, context->bw.dce.dispclk_khz, dccg->clks.dispclk_khz)) {
clock_voltage_req.clk_type = DM_PP_CLOCK_TYPE_DISPLAY_CLK; clock_voltage_req.clk_type = DM_PP_CLOCK_TYPE_DISPLAY_CLK;
@ -973,6 +977,7 @@ static void dce_dccg_construct(
const struct dccg_mask *clk_mask) const struct dccg_mask *clk_mask)
{ {
struct dccg *base = &dccg_dce->base; struct dccg *base = &dccg_dce->base;
struct dm_pp_static_clock_info static_clk_info = {0};
base->ctx = ctx; base->ctx = ctx;
base->funcs = &dce_funcs; base->funcs = &dce_funcs;
@ -987,8 +992,12 @@ static void dce_dccg_construct(
dccg_dce->dprefclk_ss_divider = 1000; dccg_dce->dprefclk_ss_divider = 1000;
dccg_dce->ss_on_dprefclk = false; dccg_dce->ss_on_dprefclk = false;
base->max_clks_state = DM_PP_CLOCKS_STATE_NOMINAL;
base->cur_min_clks_state = DM_PP_CLOCKS_STATE_INVALID; if (dm_pp_get_static_clocks(ctx, &static_clk_info))
dccg_dce->max_clks_state = static_clk_info.max_clocks_state;
else
dccg_dce->max_clks_state = DM_PP_CLOCKS_STATE_NOMINAL;
dccg_dce->cur_min_clks_state = DM_PP_CLOCKS_STATE_INVALID;
dce_clock_read_integrated_info(dccg_dce); dce_clock_read_integrated_info(dccg_dce);
dce_clock_read_ss_info(dccg_dce); dce_clock_read_ss_info(dccg_dce);

8
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h
View File

@ -68,6 +68,11 @@ struct dccg_registers {
uint32_t DENTIST_DISPCLK_CNTL; uint32_t DENTIST_DISPCLK_CNTL;
}; };
struct state_dependent_clocks {
int display_clk_khz;
int pixel_clk_khz;
};
struct dce_dccg { struct dce_dccg {
struct dccg base; struct dccg base;
const struct dccg_registers *regs; const struct dccg_registers *regs;
@ -93,6 +98,9 @@ struct dce_dccg {
/* DPREFCLK SS percentage Divider (100 or 1000) */ /* DPREFCLK SS percentage Divider (100 or 1000) */
int dprefclk_ss_divider; int dprefclk_ss_divider;
int dprefclk_khz; int dprefclk_khz;
enum dm_pp_clocks_state max_clks_state;
enum dm_pp_clocks_state cur_min_clks_state;
}; };

7
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
View File

@ -860,7 +860,6 @@ static bool construct(
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct dc_firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0};
ctx->dc_bios->regs = &bios_regs; ctx->dc_bios->regs = &bios_regs;
@ -938,12 +937,6 @@ static bool construct(
goto res_create_fail; goto res_create_fail;
} }
/* get static clock information for PPLIB or firmware, save
* max_clock_state
*/
if (dm_pp_get_static_clocks(ctx, &static_clk_info))
pool->base.dccg->max_clks_state =
static_clk_info.max_clocks_state;
{ {
struct irq_service_init_data init_data; struct irq_service_init_data init_data;
init_data.ctx = dc->ctx; init_data.ctx = dc->ctx;

8
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
View File

@ -1201,7 +1201,6 @@ static bool construct(
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct dc_firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0};
ctx->dc_bios->regs = &bios_regs; ctx->dc_bios->regs = &bios_regs;
@ -1287,13 +1286,6 @@ static bool construct(
goto res_create_fail; goto res_create_fail;
} }
/* get static clock information for PPLIB or firmware, save
* max_clock_state
*/
if (dm_pp_get_static_clocks(ctx, &static_clk_info))
pool->base.dccg->max_clks_state =
static_clk_info.max_clocks_state;
{ {
struct irq_service_init_data init_data; struct irq_service_init_data init_data;
init_data.ctx = dc->ctx; init_data.ctx = dc->ctx;

8
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
View File

@ -1131,7 +1131,6 @@ static bool construct(
{ {
unsigned int i; unsigned int i;
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct dm_pp_static_clock_info static_clk_info = {0};
ctx->dc_bios->regs = &bios_regs; ctx->dc_bios->regs = &bios_regs;
@ -1229,13 +1228,6 @@ static bool construct(
goto res_create_fail; goto res_create_fail;
} }
/* get static clock information for PPLIB or firmware, save
* max_clock_state
*/
if (dm_pp_get_static_clocks(ctx, &static_clk_info))
pool->base.dccg->max_clks_state =
static_clk_info.max_clocks_state;
{ {
struct irq_service_init_data init_data; struct irq_service_init_data init_data;
init_data.ctx = dc->ctx; init_data.ctx = dc->ctx;

15
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
View File

@ -855,7 +855,6 @@ static bool dce80_construct(
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct dc_firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0};
ctx->dc_bios->regs = &bios_regs; ctx->dc_bios->regs = &bios_regs;
@ -948,10 +947,6 @@ static bool dce80_construct(
goto res_create_fail; goto res_create_fail;
} }
if (dm_pp_get_static_clocks(ctx, &static_clk_info))
pool->base.dccg->max_clks_state =
static_clk_info.max_clocks_state;
{ {
struct irq_service_init_data init_data; struct irq_service_init_data init_data;
init_data.ctx = dc->ctx; init_data.ctx = dc->ctx;
@ -1065,7 +1060,6 @@ static bool dce81_construct(
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct dc_firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0};
ctx->dc_bios->regs = &bios_regs; ctx->dc_bios->regs = &bios_regs;
@ -1158,10 +1152,6 @@ static bool dce81_construct(
goto res_create_fail; goto res_create_fail;
} }
if (dm_pp_get_static_clocks(ctx, &static_clk_info))
pool->base.dccg->max_clks_state =
static_clk_info.max_clocks_state;
{ {
struct irq_service_init_data init_data; struct irq_service_init_data init_data;
init_data.ctx = dc->ctx; init_data.ctx = dc->ctx;
@ -1275,7 +1265,6 @@ static bool dce83_construct(
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct dc_firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0};
ctx->dc_bios->regs = &bios_regs; ctx->dc_bios->regs = &bios_regs;
@ -1364,10 +1353,6 @@ static bool dce83_construct(
goto res_create_fail; goto res_create_fail;
} }
if (dm_pp_get_static_clocks(ctx, &static_clk_info))
pool->base.dccg->max_clks_state =
static_clk_info.max_clocks_state;
{ {
struct irq_service_init_data init_data; struct irq_service_init_data init_data;
init_data.ctx = dc->ctx; init_data.ctx = dc->ctx;

9
drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h
View File

@ -29,19 +29,10 @@
#include "dm_services_types.h" #include "dm_services_types.h"
#include "dc.h" #include "dc.h"
/* Structure containing all state-dependent clocks
* (dependent on "enum clocks_state") */
struct state_dependent_clocks {
int display_clk_khz;
int pixel_clk_khz;
};
struct dccg { struct dccg {
struct dc_context *ctx; struct dc_context *ctx;
const struct dccg_funcs *funcs; const struct dccg_funcs *funcs;
enum dm_pp_clocks_state max_clks_state;
enum dm_pp_clocks_state cur_min_clks_state;
struct dc_clocks clks; struct dc_clocks clks;
}; };