iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Move the dg2 fixed_enable_delay power well param to a common bitfield

Browse Source 
The DG2 fixed delay duration is always 600usec, so save some space in
the power well descriptors by converting the parameter to a flag. While
at it also use a bitfield for both the always_on and fixed_enable_delay
flag.

This change also lets simplifying the definiton of power wells sharing
the same flags in an upcoming patch.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220414210657.1785773-4-imre.deak@intel.com
This commit is contained in:
Imre Deak 2022-04-15 00:06:43 +03:00
parent 323286c812
commit 92f6d062dd
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/display/intel_display_power_map.c
View File

@ -1920,37 +1920,37 @@ static const struct i915_power_well_desc xelpd_power_wells[] = {
.name = "AUX A", .name = "AUX A",
.domains = ICL_AUX_A_IO_POWER_DOMAINS, .domains = ICL_AUX_A_IO_POWER_DOMAINS,
.ops = &icl_aux_power_well_ops, .ops = &icl_aux_power_well_ops,
.fixed_enable_delay = true,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.idx = ICL_PW_CTL_IDX_AUX_A, .hsw.idx = ICL_PW_CTL_IDX_AUX_A,
.hsw.fixed_enable_delay = 600,
}, },
}, { }, {
.name = "AUX B", .name = "AUX B",
.domains = ICL_AUX_B_IO_POWER_DOMAINS, .domains = ICL_AUX_B_IO_POWER_DOMAINS,
.ops = &icl_aux_power_well_ops, .ops = &icl_aux_power_well_ops,
.fixed_enable_delay = true,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.idx = ICL_PW_CTL_IDX_AUX_B, .hsw.idx = ICL_PW_CTL_IDX_AUX_B,
.hsw.fixed_enable_delay = 600,
}, },
}, { }, {
.name = "AUX C", .name = "AUX C",
.domains = TGL_AUX_C_IO_POWER_DOMAINS, .domains = TGL_AUX_C_IO_POWER_DOMAINS,
.ops = &icl_aux_power_well_ops, .ops = &icl_aux_power_well_ops,
.fixed_enable_delay = true,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.idx = ICL_PW_CTL_IDX_AUX_C, .hsw.idx = ICL_PW_CTL_IDX_AUX_C,
.hsw.fixed_enable_delay = 600,
}, },
}, { }, {
.name = "AUX D_XELPD", .name = "AUX D_XELPD",
.domains = XELPD_AUX_IO_D_XELPD_POWER_DOMAINS, .domains = XELPD_AUX_IO_D_XELPD_POWER_DOMAINS,
.ops = &icl_aux_power_well_ops, .ops = &icl_aux_power_well_ops,
.fixed_enable_delay = true,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.idx = XELPD_PW_CTL_IDX_AUX_D, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D,
.hsw.fixed_enable_delay = 600,
}, },
}, { }, {
.name = "AUX E_XELPD", .name = "AUX E_XELPD",
@ -1964,10 +1964,10 @@ static const struct i915_power_well_desc xelpd_power_wells[] = {
.name = "AUX USBC1", .name = "AUX USBC1",
.domains = XELPD_AUX_IO_USBC1_POWER_DOMAINS, .domains = XELPD_AUX_IO_USBC1_POWER_DOMAINS,
.ops = &icl_aux_power_well_ops, .ops = &icl_aux_power_well_ops,
.fixed_enable_delay = true,
.id = DISP_PW_ID_NONE, .id = DISP_PW_ID_NONE,
{ {
.hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1,
.hsw.fixed_enable_delay = 600,
}, },
}, { }, {
.name = "AUX USBC2", .name = "AUX USBC2",

5
drivers/gpu/drm/i915/display/intel_display_power_well.c
View File

@ -243,15 +243,14 @@ static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_priv,
{ {
const struct i915_power_well_regs *regs = power_well->desc->ops->regs; const struct i915_power_well_regs *regs = power_well->desc->ops->regs;
int pw_idx = power_well->desc->hsw.idx; int pw_idx = power_well->desc->hsw.idx;
int enable_delay = power_well->desc->hsw.fixed_enable_delay;
/* /*
* For some power wells we're not supposed to watch the status bit for * For some power wells we're not supposed to watch the status bit for
* an ack, but rather just wait a fixed amount of time and then * an ack, but rather just wait a fixed amount of time and then
* proceed. This is only used on DG2. * proceed. This is only used on DG2.
*/ */
if (IS_DG2(dev_priv) && enable_delay) { if (IS_DG2(dev_priv) && power_well->desc->fixed_enable_delay) {
usleep_range(enable_delay, 2 * enable_delay); usleep_range(600, 1200);
return; return;
} }

14
drivers/gpu/drm/i915/display/intel_display_power_well.h
View File

@ -50,8 +50,14 @@ enum i915_power_well_id {
struct i915_power_well_desc { struct i915_power_well_desc {
const char *name; const char *name;
bool always_on;
u64 domains; u64 domains;
u8 always_on:1;
/*
* Instead of waiting for the status bit to ack enables,
* just wait a specific amount of time and then consider
* the well enabled.
*/
u8 fixed_enable_delay:1;
/* unique identifier for this power well */ /* unique identifier for this power well */
enum i915_power_well_id id; enum i915_power_well_id id;
/* /*
@ -77,12 +83,6 @@ struct i915_power_well_desc {
u8 idx; u8 idx;
/* Mask of pipes whose IRQ logic is backed by the pw */ /* Mask of pipes whose IRQ logic is backed by the pw */
u8 irq_pipe_mask; u8 irq_pipe_mask;
/*
* Instead of waiting for the status bit to ack enables,
* just wait a specific amount of time and then consider
* the well enabled.
*/
u16 fixed_enable_delay;
/* The pw is backing the VGA functionality */ /* The pw is backing the VGA functionality */
bool has_vga:1; bool has_vga:1;
bool has_fuses:1; bool has_fuses:1;