From: Ivan Lipski Date: Mon, 1 Jun 2026 20:17:05 +0000 (-0400) Subject: drm/amd/display: Rename hdmi_frl_borrow_mode X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee911514a9f8382df08181b5e90702c3284a697e;p=thirdparty%2Flinux.git drm/amd/display: Rename hdmi_frl_borrow_mode [Why&How] Rename enum hdmi_frl_borrow_mode to HDMI_FRL_BORROW_MODE_* since the same enum is already defined and used by dml2. This resolves DKMS compilation fail. Reviewed-by: Fangzhi Zuo Signed-off-by: Ivan Lipski Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h b/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h index 5923a5f112a99..0da03eb794aac 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h +++ b/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h @@ -225,9 +225,9 @@ union hdmi_scdc_test_config_Data { }; enum hdmi_frl_borrow_mode { - BORROW_MODE_NONE, - BORROW_MODE_FROM_ACTIVE, - BORROW_MODE_FROM_BLANK + HDMI_FRL_BORROW_MODE_NONE, + HDMI_FRL_BORROW_MODE_FROM_ACTIVE, + HDMI_FRL_BORROW_MODE_FROM_BLANK }; enum link_result {