github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/lspcon: rename interfaces to intel_lspcon_* to unify

Browse Source 
Rename all the main functions to have intel_lspcon_ prefix. Keep the
infoframes hooks named lspcon_ for now, and grouped together, as there'd
be a clash with intel_lspcon_infoframes_enabled().

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/15e8c4133aee89181e6776a44e58f2573cfe23f2.1738677489.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-02-04 15:58:43 +02:00
parent 9b98776490
commit 8de6a113ad
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3521,7 +3521,7 @@ void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode)
} else {
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
lspcon_resume(dig_port);
intel_lspcon_resume(dig_port);
/* Write the source OUI as early as possible */
intel_dp_init_source_oui(intel_dp);
@ -3538,7 +3538,7 @@ void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode)
}
if (ret == 1 && intel_lspcon_active(dig_port))
lspcon_wait_pcon_mode(dig_port);
intel_lspcon_wait_pcon_mode(dig_port);
}
if (ret != 1)
@ -5388,7 +5388,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)
if (drm_WARN_ON(display->drm, intel_dp_is_edp(intel_dp)))
return connector_status_connected;
lspcon_resume(dig_port);
intel_lspcon_resume(dig_port);
if (!intel_dp_get_dpcd(intel_dp))
return connector_status_disconnected;
@ -5883,8 +5883,8 @@ intel_dp_connector_register(struct drm_connector *connector)
* ToDo: Clean this up to handle lspcon init and resume more
* efficiently and streamlined.
*/
if (lspcon_init(dig_port)) {
if (lspcon_detect_hdr_capability(dig_port))
if (intel_lspcon_init(dig_port)) {
if (intel_lspcon_detect_hdr_capability(dig_port))
drm_connector_attach_hdr_output_metadata_property(connector);
}

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

@ -126,7 +126,7 @@ static u32 get_hdr_status_reg(struct intel_lspcon *lspcon)
return DPCD_PARADE_LSPCON_HDR_STATUS;
}
bool lspcon_detect_hdr_capability(struct intel_digital_port *dig_port)
bool intel_lspcon_detect_hdr_capability(struct intel_digital_port *dig_port)
{
struct intel_lspcon *lspcon = &dig_port->lspcon;
struct intel_dp *intel_dp = lspcon_to_intel_dp(lspcon);
@ -661,14 +661,14 @@ u32 lspcon_infoframes_enabled(struct intel_encoder *encoder,
return val;
}
void lspcon_wait_pcon_mode(struct intel_digital_port *dig_port)
void intel_lspcon_wait_pcon_mode(struct intel_digital_port *dig_port)
{
struct intel_lspcon *lspcon = &dig_port->lspcon;
lspcon_wait_mode(lspcon, DRM_LSPCON_MODE_PCON);
}
bool lspcon_init(struct intel_digital_port *dig_port)
bool intel_lspcon_init(struct intel_digital_port *dig_port)
{
struct intel_display *display = to_intel_display(dig_port);
struct intel_dp *intel_dp = &dig_port->dp;
@ -714,7 +714,7 @@ u32 intel_lspcon_infoframes_enabled(struct intel_encoder *encoder,
return dig_port->infoframes_enabled(encoder, pipe_config);
}
void lspcon_resume(struct intel_digital_port *dig_port)
void intel_lspcon_resume(struct intel_digital_port *dig_port)
{
struct intel_display *display = to_intel_display(dig_port);
struct intel_lspcon *lspcon = &dig_port->lspcon;
@ -724,7 +724,7 @@ void lspcon_resume(struct intel_digital_port *dig_port)
return;
if (!lspcon->active) {
if (!lspcon_init(dig_port)) {
if (!intel_lspcon_init(dig_port)) {
drm_err(display->drm, "LSPCON init failed on port %c\n",
port_name(dig_port->base.port));
return;

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

@ -13,11 +13,15 @@ struct intel_crtc_state;
struct intel_digital_port;
struct intel_encoder;
bool lspcon_init(struct intel_digital_port *dig_port);
bool intel_lspcon_init(struct intel_digital_port *dig_port);
bool intel_lspcon_active(struct intel_digital_port *dig_port);
bool lspcon_detect_hdr_capability(struct intel_digital_port *dig_port);
void lspcon_resume(struct intel_digital_port *dig_port);
void lspcon_wait_pcon_mode(struct intel_digital_port *dig_port);
bool intel_lspcon_detect_hdr_capability(struct intel_digital_port *dig_port);
void intel_lspcon_resume(struct intel_digital_port *dig_port);
void intel_lspcon_wait_pcon_mode(struct intel_digital_port *dig_port);
u32 intel_lspcon_infoframes_enabled(struct intel_encoder *encoder,
const struct intel_crtc_state *pipe_config);
/* digital port infoframes hooks */
void lspcon_write_infoframe(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
unsigned int type,
@ -32,7 +36,5 @@ void lspcon_set_infoframes(struct intel_encoder *encoder,
const struct drm_connector_state *conn_state);
u32 lspcon_infoframes_enabled(struct intel_encoder *encoder,
const struct intel_crtc_state *pipe_config);
u32 intel_lspcon_infoframes_enabled(struct intel_encoder *encoder,
const struct intel_crtc_state *pipe_config);
#endif /* __INTEL_LSPCON_H__ */