diff mbox series

[1/2] drm/i915/display: Rename POWER_DOMAIN_DPLL_DC_OFF to POWER_DOMAIN_DC_OFF

Message ID 20211020003558.222198-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915/display: Rename POWER_DOMAIN_DPLL_DC_OFF to POWER_DOMAIN_DC_OFF | expand

Commit Message

Souza, Jose Oct. 20, 2021, 12:35 a.m. UTC
This power domain to disable DC states will be used in places outside
of DPLL, so making the name more generic.

Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.c | 6 +++---
 drivers/gpu/drm/i915/display/intel_display_power.h | 2 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

Comments

Yokoyama, Caz Oct. 20, 2021, 3:09 p.m. UTC | #1
Looks good to me.
Reviewed-by: Caz Yokoyama <caz.yokoyama@intel.com>
-caz
On Tue, 2021-10-19 at 17:35 -0700, José Roberto de Souza wrote:
> This power domain to disable DC states will be used in places outside
> of DPLL, so making the name more generic.
> 
> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_power.c | 6 +++---
>  drivers/gpu/drm/i915/display/intel_display_power.h | 2 +-
>  drivers/gpu/drm/i915/display/intel_dpll_mgr.c      | 6 +++---
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c
> b/drivers/gpu/drm/i915/display/intel_display_power.c
> index d88da0d0f05ac..6637760d24e0c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -155,8 +155,8 @@ intel_display_power_domain_str(enum
> intel_display_power_domain domain)
>  		return "MODESET";
>  	case POWER_DOMAIN_GT_IRQ:
>  		return "GT_IRQ";
> -	case POWER_DOMAIN_DPLL_DC_OFF:
> -		return "DPLL_DC_OFF";
> +	case POWER_DOMAIN_DC_OFF:
> +		return "DC_OFF";
>  	case POWER_DOMAIN_TC_COLD_OFF:
>  		return "TC_COLD_OFF";
>  	default:
> @@ -2803,7 +2803,7 @@ intel_display_power_put_mask_in_set(struct
> drm_i915_private *i915,
>  	ICL_PW_2_POWER_DOMAINS |			\
>  	BIT_ULL(POWER_DOMAIN_MODESET) |			\
>  	BIT_ULL(POWER_DOMAIN_AUX_A) |			\
> -	BIT_ULL(POWER_DOMAIN_DPLL_DC_OFF) |			\
> +	BIT_ULL(POWER_DOMAIN_DC_OFF) |			\
>  	BIT_ULL(POWER_DOMAIN_INIT))
>  
>  #define ICL_DDI_IO_A_POWER_DOMAINS (			\
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
> b/drivers/gpu/drm/i915/display/intel_display_power.h
> index 0612e4b6e3c81..d54b7574ed373 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -117,7 +117,7 @@ enum intel_display_power_domain {
>  	POWER_DOMAIN_GMBUS,
>  	POWER_DOMAIN_MODESET,
>  	POWER_DOMAIN_GT_IRQ,
> -	POWER_DOMAIN_DPLL_DC_OFF,
> +	POWER_DOMAIN_DC_OFF,
>  	POWER_DOMAIN_TC_COLD_OFF,
>  	POWER_DOMAIN_INIT,
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> index ca69b67bbc231..fc8fda77483ab 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> @@ -3741,7 +3741,7 @@ static void combo_pll_enable(struct
> drm_i915_private *dev_priv,
>  		 * domain.
>  		 */
>  		pll->wakeref = intel_display_power_get(dev_priv,
> -						       POWER_DOMAIN_DPL
> L_DC_OFF);
> +						       POWER_DOMAIN_DC_
> OFF);
>  	}
>  
>  	icl_pll_power_enable(dev_priv, pll, enable_reg);
> @@ -3848,7 +3848,7 @@ static void combo_pll_disable(struct
> drm_i915_private *dev_priv,
>  
>  	if (IS_JSL_EHL(dev_priv) &&
>  	    pll->info->id == DPLL_ID_EHL_DPLL4)
> -		intel_display_power_put(dev_priv,
> POWER_DOMAIN_DPLL_DC_OFF,
> +		intel_display_power_put(dev_priv, POWER_DOMAIN_DC_OFF,
>  					pll->wakeref);
>  }
>  
> @@ -4232,7 +4232,7 @@ static void readout_dpll_hw_state(struct
> drm_i915_private *i915,
>  	if (IS_JSL_EHL(i915) && pll->on &&
>  	    pll->info->id == DPLL_ID_EHL_DPLL4) {
>  		pll->wakeref = intel_display_power_get(i915,
> -						       POWER_DOMAIN_DPL
> L_DC_OFF);
> +						       POWER_DOMAIN_DC_
> OFF);
>  	}
>  
>  	pll->state.pipe_mask = 0;
Souza, Jose Oct. 20, 2021, 8:30 p.m. UTC | #2
On Wed, 2021-10-20 at 05:49 +0000, Patchwork wrote:
> Patch Details
> Series:	series starting with [1/2] drm/i915/display: Rename POWER_DOMAIN_DPLL_DC_OFF to POWER_DOMAIN_DC_OFF
> URL:	https://patchwork.freedesktop.org/series/96039/
> State:	failure
> Details:	https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21386/index.html
> CI Bug Log - changes from CI_DRM_10762_full -> Patchwork_21386_full
> 
> Summary
> 
> FAILURE
> 
> Serious unknown changes coming with Patchwork_21386_full absolutely need to be
> verified manually.
> 
> If you think the reported changes have nothing to do with the changes
> introduced in Patchwork_21386_full, please notify your bug team to allow them
> to document this new failure mode, which will reduce false positives in CI.
> 
> Possible new issues
> 
> Here are the unknown changes that may have been introduced in Patchwork_21386_full:
> 
> Piglit changes
> 
> Possible regressions
> 
> spec@arb_texture_multisample@texelfetch fs sampler2dms 4 1x130-501x130:
> pig-kbl-iris: NOTRUN -> FAIL

Not related.

Thanks for the reviews Mika and Caz.
Pushed.

> Known issues
> 
> Here are the changes found in Patchwork_21386_full that come from known issues:
> 
> IGT changes
> 
> Issues hit
> 
> igt@gem_create@create-massive:
> 
> shard-snb: NOTRUN -> DMESG-WARN ([i915#3002])
> 
> shard-apl: NOTRUN -> DMESG-WARN ([i915#3002])
> 
> igt@gem_ctx_persistence@legacy-engines-mixed:
> 
> shard-snb: NOTRUN -> SKIP ([fdo#109271] / [i915#1099]) +5 similar issues
> igt@gem_ctx_sseu@mmap-args:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#280]) +1 similar issue
> igt@gem_exec_fair@basic-deadline:
> 
> shard-kbl: PASS -> FAIL ([i915#2846])
> igt@gem_exec_fair@basic-none-share@rcs0:
> 
> shard-iclb: PASS -> FAIL ([i915#2842])
> igt@gem_exec_fair@basic-none-vip@rcs0:
> 
> shard-tglb: NOTRUN -> FAIL ([i915#2842]) +5 similar issues
> igt@gem_exec_fair@basic-pace@rcs0:
> 
> shard-kbl: PASS -> SKIP ([fdo#109271])
> igt@gem_exec_whisper@basic-queues-forked:
> 
> shard-glk: PASS -> DMESG-WARN ([i915#118])
> igt@gem_pread@exhaustion:
> 
> shard-kbl: NOTRUN -> WARN ([i915#2658])
> igt@gem_pxp@create-regular-context-1:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#4270])
> igt@gem_userptr_blits@vma-merge:
> 
> shard-snb: NOTRUN -> FAIL ([i915#2724])
> 
> shard-apl: NOTRUN -> FAIL ([i915#3318])
> 
> igt@gen9_exec_parse@bb-start-out:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#2856])
> igt@i915_pm_rc6_residency@rc6-idle:
> 
> shard-tglb: NOTRUN -> WARN ([i915#2681] / [i915#2684])
> igt@i915_pm_rpm@system-suspend:
> 
> shard-tglb: PASS -> INCOMPLETE ([i915#2411] / [i915#456]) +2 similar issues
> igt@kms_async_flips@crc:
> 
> shard-skl: NOTRUN -> FAIL ([i915#4272])
> igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-hflip:
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271] / [i915#3777])
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [i915#3777])
> 
> igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-async-flip:
> 
> shard-skl: NOTRUN -> FAIL ([i915#3743])
> igt@kms_big_fb@y-tiled-8bpp-rotate-270:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#111614])
> igt@kms_big_fb@yf-tiled-addfb-size-overflow:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#111615]) +1 similar issue
> igt@kms_bw@linear-tiling-1-displays-3840x2160p:
> 
> shard-tglb: NOTRUN -> FAIL ([i915#1385] / [i915#4299])
> igt@kms_bw@linear-tiling-2-displays-1920x1080p:
> 
> shard-apl: NOTRUN -> DMESG-FAIL ([i915#4298]) +1 similar issue
> igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc:
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271] / [i915#3886]) +3 similar issues
> igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
> 
> shard-iclb: NOTRUN -> SKIP ([fdo#109278] / [i915#3886])
> igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#3689] / [i915#3886])
> igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [i915#3886]) +5 similar issues
> igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs:
> 
> shard-snb: NOTRUN -> SKIP ([fdo#109271]) +308 similar issues
> igt@kms_ccs@pipe-d-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#3689]) +3 similar issues
> igt@kms_ccs@pipe-d-crc-primary-rotation-180-yf_tiled_ccs:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271]) +229 similar issues
> igt@kms_chamelium@dp-mode-timings:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [fdo#111827]) +20 similar issues
> igt@kms_chamelium@hdmi-hpd-enable-disable-mode:
> 
> shard-snb: NOTRUN -> SKIP ([fdo#109271] / [fdo#111827]) +13 similar issues
> igt@kms_chamelium@vga-hpd-fast:
> 
> shard-skl: NOTRUN -> SKIP ([fdo#109271] / [fdo#111827]) +2 similar issues
> igt@kms_chamelium@vga-hpd-for-each-pipe:
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271] / [fdo#111827]) +9 similar issues
> igt@kms_color@pipe-a-ctm-0-75:
> 
> shard-skl: PASS -> DMESG-WARN ([i915#1982])
> igt@kms_color_chamelium@pipe-a-ctm-0-75:
> 
> shard-iclb: NOTRUN -> SKIP ([fdo#109284] / [fdo#111827])
> igt@kms_color_chamelium@pipe-d-ctm-red-to-blue:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#109284] / [fdo#111827]) +5 similar issues
> igt@kms_content_protection@mei_interface:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#111828])
> igt@kms_cursor_crc@pipe-a-cursor-512x512-random:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#109279] / [i915#3359])
> igt@kms_cursor_crc@pipe-b-cursor-32x10-random:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#3359]) +1 similar issue
> igt@kms_cursor_crc@pipe-b-cursor-32x32-onscreen:
> 
> shard-skl: NOTRUN -> SKIP ([fdo#109271]) +16 similar issues
> igt@kms_cursor_crc@pipe-c-cursor-suspend:
> 
> shard-kbl: PASS -> DMESG-WARN ([i915#180]) +1 similar issue
> igt@kms_cursor_crc@pipe-d-cursor-256x85-onscreen:
> 
> shard-iclb: NOTRUN -> SKIP ([fdo#109278]) +1 similar issue
> igt@kms_cursor_crc@pipe-d-cursor-32x32-rapid-movement:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#3319]) +1 similar issue
> igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
> 
> shard-skl: NOTRUN -> FAIL ([i915#2346])
> igt@kms_cursor_legacy@pipe-d-torture-bo:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [i915#533])
> igt@kms_fbcon_fbt@fbc-suspend:
> 
> shard-apl: PASS -> INCOMPLETE ([i915#180])
> igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
> 
> shard-apl: PASS -> DMESG-WARN ([i915#180]) +2 similar issues
> igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile:
> 
> shard-iclb: PASS -> SKIP ([i915#3701])
> igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-shrfb-plflip-blt:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#111825]) +13 similar issues
> igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-mmap-cpu:
> 
> shard-iclb: NOTRUN -> SKIP ([fdo#109280])
> igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc:
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271]) +116 similar issues
> igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
> 
> shard-apl: NOTRUN -> FAIL ([fdo#108145] / [i915#265]) +3 similar issues
> 
> shard-kbl: NOTRUN -> FAIL ([fdo#108145] / [i915#265]) +1 similar issue
> 
> igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
> 
> shard-skl: NOTRUN -> SKIP ([fdo#109271] / [i915#658])
> igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [i915#658]) +3 similar issues
> igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271] / [i915#658]) +1 similar issue
> igt@kms_psr2_su@page_flip:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#1911])
> igt@kms_psr@psr2_sprite_mmap_gtt:
> 
> shard-iclb: PASS -> SKIP ([fdo#109441])
> igt@kms_writeback@writeback-check-output:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [i915#2437])
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271] / [i915#2437])
> 
> igt@nouveau_crc@pipe-a-source-outp-complete:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#2530])
> igt@prime_nv_api@nv_i915_reimport_twice_check_flink_name:
> 
> shard-tglb: NOTRUN -> SKIP ([fdo#109291])
> igt@prime_nv_api@nv_self_import_to_different_fd:
> 
> shard-iclb: NOTRUN -> SKIP ([fdo#109291]) +1 similar issue
> igt@sysfs_clients@fair-7:
> 
> shard-apl: NOTRUN -> SKIP ([fdo#109271] / [i915#2994]) +3 similar issues
> igt@sysfs_clients@sema-10:
> 
> shard-kbl: NOTRUN -> SKIP ([fdo#109271] / [i915#2994]) +1 similar issue
> igt@sysfs_clients@sema-50:
> 
> shard-tglb: NOTRUN -> SKIP ([i915#2994])
> igt@sysfs_clients@split-10:
> 
> shard-iclb: NOTRUN -> SKIP ([i915#2994])
> Possible fixes
> 
> igt@gem_eio@unwedge-stress:
> 
> shard-tglb: TIMEOUT ([i915#2369] / [i915#3063] / [i915#3648]) -> PASS
> igt@gem_exec_fair@basic-flow@rcs0:
> 
> shard-tglb: FAIL ([i915#2842]) -> PASS +3 similar issues
> igt@gem_exec_fair@basic-pace@vcs1:
> 
> shard-kbl: FAIL ([i915#2842]) -> PASS
> igt@gem_exec_fair@basic-throttle@rcs0:
> 
> shard-glk: FAIL ([i915#2842]) -> PASS
> igt@gem_exec_whisper@basic-queues-priority:
> 
> shard-iclb: INCOMPLETE ([i915#1895]) -> PASS
> igt@gem_spin_batch@resubmit-new-all@vecs0:
> 
> shard-skl: DMESG-WARN ([i915#1982]) -> PASS +1 similar issue
> igt@gem_workarounds@suspend-resume:
> 
> shard-skl: INCOMPLETE ([i915#198]) -> PASS
> igt@i915_selftest@live@hangcheck:
> 
> shard-snb: INCOMPLETE ([i915#3921]) -> PASS
> igt@i915_selftest@perf@region:
> 
> shard-iclb: INCOMPLETE -> PASS
> igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180:
> 
> shard-snb: SKIP ([fdo#109271]) -> PASS +1 similar issue
> igt@kms_cursor_crc@pipe-c-cursor-suspend:
> 
> shard-tglb: INCOMPLETE ([i915#2411] / [i915#456]) -> PASS
> igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
> 
> shard-skl: FAIL ([i915#2346] / [i915#533]) -> PASS
> igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
> 
> shard-skl: FAIL ([i915#79]) -> PASS
> igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
> 
> shard-apl: DMESG-WARN ([i915#180]) -> PASS +3 similar issues
> igt@kms_flip@plain-flip-fb-recreate@c-edp1:
> 
> shard-skl: FAIL ([i915#2122]) -> PASS
> igt@kms_hdr@bpc-switch-suspend:
> 
> shard-skl: FAIL ([i915#1188]) -> PASS +1 similar issue
> igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
> 
> shard-kbl: DMESG-WARN ([i915#180]) -> PASS +2 similar issues
> igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
> 
> shard-skl: FAIL ([fdo#108145] / [i915#265]) -> PASS
> igt@kms_psr@psr2_primary_mmap_cpu:
> 
> shard-iclb: SKIP ([fdo#109441]) -> PASS +2 similar issues
> igt@perf@polling-parameterized:
> 
> shard-glk: FAIL ([i915#1542]) -> PASS
> Warnings
> 
> igt@i915_pm_rc6_residency@rc6-fence:
> 
> shard-iclb: WARN ([i915#1804] / [i915#2684]) -> WARN ([i915#2684])
> igt@i915_pm_rc6_residency@rc6-idle:
> 
> shard-iclb: WARN ([i915#2684]) -> WARN ([i915#1804] / [i915#2684])
> igt@kms_bw@linear-tiling-1-displays-2560x1440p:
> 
> shard-tglb: FAIL ([i915#1385]) -> FAIL ([i915#1385] / [i915#4299]) +10 similar issues
> igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1:
> 
> shard-iclb: SKIP ([i915#2920]) -> SKIP ([i915#658])
> igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
> 
> shard-iclb: SKIP ([i915#658]) -> SKIP ([i915#2920])
> igt@kms_psr2_su@page_flip:
> 
> shard-iclb: FAIL ([i915#4148]) -> SKIP ([fdo#109642] / [fdo#111068] / [i915#658])
> igt@runner@aborted:
> 
> shard-kbl: (FAIL, FAIL, FAIL, FAIL, [FAIL][138], [FAIL][139], [FAIL][140], [FAIL][141], [FAIL][142], [FAIL][143]) ([i915#180] / [i915#1814] /
[i915#3002] / [i915#3363] / [i915#4312]) -> ([FAIL][144], [FAIL][145], [FAIL][146], [FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150], [FAIL][151],
[FAIL][152]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#4312])
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index d88da0d0f05ac..6637760d24e0c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -155,8 +155,8 @@  intel_display_power_domain_str(enum intel_display_power_domain domain)
 		return "MODESET";
 	case POWER_DOMAIN_GT_IRQ:
 		return "GT_IRQ";
-	case POWER_DOMAIN_DPLL_DC_OFF:
-		return "DPLL_DC_OFF";
+	case POWER_DOMAIN_DC_OFF:
+		return "DC_OFF";
 	case POWER_DOMAIN_TC_COLD_OFF:
 		return "TC_COLD_OFF";
 	default:
@@ -2803,7 +2803,7 @@  intel_display_power_put_mask_in_set(struct drm_i915_private *i915,
 	ICL_PW_2_POWER_DOMAINS |			\
 	BIT_ULL(POWER_DOMAIN_MODESET) |			\
 	BIT_ULL(POWER_DOMAIN_AUX_A) |			\
-	BIT_ULL(POWER_DOMAIN_DPLL_DC_OFF) |			\
+	BIT_ULL(POWER_DOMAIN_DC_OFF) |			\
 	BIT_ULL(POWER_DOMAIN_INIT))
 
 #define ICL_DDI_IO_A_POWER_DOMAINS (			\
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
index 0612e4b6e3c81..d54b7574ed373 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power.h
@@ -117,7 +117,7 @@  enum intel_display_power_domain {
 	POWER_DOMAIN_GMBUS,
 	POWER_DOMAIN_MODESET,
 	POWER_DOMAIN_GT_IRQ,
-	POWER_DOMAIN_DPLL_DC_OFF,
+	POWER_DOMAIN_DC_OFF,
 	POWER_DOMAIN_TC_COLD_OFF,
 	POWER_DOMAIN_INIT,
 
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index ca69b67bbc231..fc8fda77483ab 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -3741,7 +3741,7 @@  static void combo_pll_enable(struct drm_i915_private *dev_priv,
 		 * domain.
 		 */
 		pll->wakeref = intel_display_power_get(dev_priv,
-						       POWER_DOMAIN_DPLL_DC_OFF);
+						       POWER_DOMAIN_DC_OFF);
 	}
 
 	icl_pll_power_enable(dev_priv, pll, enable_reg);
@@ -3848,7 +3848,7 @@  static void combo_pll_disable(struct drm_i915_private *dev_priv,
 
 	if (IS_JSL_EHL(dev_priv) &&
 	    pll->info->id == DPLL_ID_EHL_DPLL4)
-		intel_display_power_put(dev_priv, POWER_DOMAIN_DPLL_DC_OFF,
+		intel_display_power_put(dev_priv, POWER_DOMAIN_DC_OFF,
 					pll->wakeref);
 }
 
@@ -4232,7 +4232,7 @@  static void readout_dpll_hw_state(struct drm_i915_private *i915,
 	if (IS_JSL_EHL(i915) && pll->on &&
 	    pll->info->id == DPLL_ID_EHL_DPLL4) {
 		pll->wakeref = intel_display_power_get(i915,
-						       POWER_DOMAIN_DPLL_DC_OFF);
+						       POWER_DOMAIN_DC_OFF);
 	}
 
 	pll->state.pipe_mask = 0;