mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 11:41:29 -04:00
drm/amd/display: Extract connector and encoder code to amdgpu_dm_connector
Move connector lifecycle functions (init, detect, mode validation, property handling, EDID parsing, hotplug processing) and encoder functions (init, destroy, atomic_check, helper_funcs) from amdgpu_dm.c to amdgpu_dm_connector.c. No functional change intended. Assisted-by: Copilot:Claude-Opus-4.6 Reviewed-by: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com> Signed-off-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Chenyu Chen <chen-yu.chen@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Hung
@@ -44,7 +44,8 @@ AMDGPUDM = \
|
||||
amdgpu_dm_ism.o \
|
||||
amdgpu_dm_backlight.o \
|
||||
amdgpu_dm_audio.o \
|
||||
amdgpu_dm_dmub.o
|
||||
amdgpu_dm_dmub.o \
|
||||
amdgpu_dm_connector.o
|
||||
|
||||
ifdef CONFIG_DRM_AMD_DC_FP
|
||||
AMDGPUDM += dc_fpu.o
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1061,35 +1061,7 @@ struct dm_connector_state {
|
||||
#define to_dm_connector_state(x)\
|
||||
container_of((x), struct dm_connector_state, base)
|
||||
|
||||
void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector);
|
||||
struct drm_connector_state *
|
||||
amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector);
|
||||
int amdgpu_dm_connector_atomic_set_property(struct drm_connector *connector,
|
||||
struct drm_connector_state *state,
|
||||
struct drm_property *property,
|
||||
uint64_t val);
|
||||
|
||||
int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,
|
||||
const struct drm_connector_state *state,
|
||||
struct drm_property *property,
|
||||
uint64_t *val);
|
||||
|
||||
int amdgpu_dm_get_encoder_crtc_mask(struct amdgpu_device *adev);
|
||||
|
||||
void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
|
||||
struct amdgpu_dm_connector *aconnector,
|
||||
int connector_type,
|
||||
struct dc_link *link,
|
||||
int link_index);
|
||||
|
||||
enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector,
|
||||
const struct drm_display_mode *mode);
|
||||
|
||||
void dm_restore_drm_connector_state(struct drm_device *dev,
|
||||
struct drm_connector *connector);
|
||||
|
||||
void amdgpu_dm_update_freesync_caps(struct drm_connector *connector,
|
||||
const struct drm_edid *drm_edid, bool do_mccs);
|
||||
#include "amdgpu_dm_connector.h"
|
||||
|
||||
void amdgpu_dm_trigger_timing_sync(struct drm_device *dev);
|
||||
|
||||
@@ -1113,14 +1085,9 @@ int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc,
|
||||
struct drm_plane_state *plane_state,
|
||||
struct dc_plane_state *dc_plane_state);
|
||||
|
||||
void amdgpu_dm_update_connector_after_detect(
|
||||
struct amdgpu_dm_connector *aconnector);
|
||||
|
||||
void populate_hdmi_info_from_connector(bool enable_frl, struct drm_hdmi_info *info,
|
||||
struct dc_edid_caps *edid_caps);
|
||||
|
||||
extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs;
|
||||
|
||||
int amdgpu_dm_process_dmub_aux_transfer_sync(struct dc_context *ctx, unsigned int link_index,
|
||||
struct aux_payload *payload, enum aux_return_code_type *operation_result);
|
||||
|
||||
@@ -1135,20 +1102,9 @@ bool amdgpu_dm_execute_fused_io(
|
||||
int amdgpu_dm_process_dmub_set_config_sync(struct dc_context *ctx, unsigned int link_index,
|
||||
struct set_config_cmd_payload *payload, enum set_config_status *operation_result);
|
||||
|
||||
struct dc_stream_state *
|
||||
create_validate_stream_for_sink(struct drm_connector *connector,
|
||||
const struct drm_display_mode *drm_mode,
|
||||
const struct dm_connector_state *dm_state,
|
||||
const struct dc_stream_state *old_stream);
|
||||
|
||||
int dm_atomic_get_state(struct drm_atomic_commit *state,
|
||||
struct dm_atomic_state **dm_state);
|
||||
|
||||
struct drm_connector *
|
||||
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_commit *state,
|
||||
struct drm_crtc *crtc);
|
||||
|
||||
int convert_dc_color_depth_into_bpc(enum dc_color_depth display_color_depth);
|
||||
struct idle_workqueue *idle_create_workqueue(struct amdgpu_device *adev);
|
||||
|
||||
void *dm_allocate_gpu_mem(struct amdgpu_device *adev,
|
||||
@@ -1161,10 +1117,6 @@ void dm_free_gpu_mem(struct amdgpu_device *adev,
|
||||
|
||||
bool amdgpu_dm_is_headless(struct amdgpu_device *adev);
|
||||
|
||||
void hdmi_cec_set_edid(struct amdgpu_dm_connector *aconnector);
|
||||
void hdmi_cec_unset_edid(struct amdgpu_dm_connector *aconnector);
|
||||
int amdgpu_dm_initialize_hdmi_connector(struct amdgpu_dm_connector *aconnector);
|
||||
|
||||
void retrieve_dmi_info(struct amdgpu_display_manager *dm);
|
||||
|
||||
void amdgpu_dm_emulated_link_detect(struct dc_link *link);
|
||||
|
||||
3575
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
Normal file
3575
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
Normal file
File diff suppressed because it is too large
Load Diff
147
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h
Normal file
147
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h
Normal file
@@ -0,0 +1,147 @@
|
||||
/* SPDX-License-Identifier: MIT */
|
||||
/*
|
||||
* Copyright 2026 Advanced Micro Devices, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Authors: AMD
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __AMDGPU_DM_CONNECTOR_H__
|
||||
#define __AMDGPU_DM_CONNECTOR_H__
|
||||
|
||||
struct amdgpu_device;
|
||||
struct amdgpu_dm_connector;
|
||||
struct amdgpu_display_manager;
|
||||
struct amdgpu_encoder;
|
||||
struct amdgpu_i2c_adapter;
|
||||
struct dc_crtc_timing;
|
||||
struct dc_link;
|
||||
struct dc_state;
|
||||
struct dc_stream_state;
|
||||
struct ddc_service;
|
||||
struct dm_connector_state;
|
||||
struct drm_atomic_commit;
|
||||
struct drm_device;
|
||||
struct drm_encoder_helper_funcs;
|
||||
struct drm_connector;
|
||||
struct drm_connector_state;
|
||||
struct drm_crtc;
|
||||
struct drm_device;
|
||||
struct drm_display_mode;
|
||||
struct drm_edid;
|
||||
struct drm_property;
|
||||
|
||||
void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector);
|
||||
|
||||
struct drm_connector_state *
|
||||
amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector);
|
||||
|
||||
int amdgpu_dm_connector_atomic_set_property(struct drm_connector *connector,
|
||||
struct drm_connector_state *connector_state,
|
||||
struct drm_property *property,
|
||||
uint64_t val);
|
||||
|
||||
int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,
|
||||
const struct drm_connector_state *state,
|
||||
struct drm_property *property,
|
||||
uint64_t *val);
|
||||
|
||||
void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
|
||||
struct amdgpu_dm_connector *aconnector,
|
||||
int connector_type,
|
||||
struct dc_link *link,
|
||||
int link_index);
|
||||
|
||||
enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector,
|
||||
const struct drm_display_mode *mode);
|
||||
|
||||
void dm_restore_drm_connector_state(struct drm_device *dev,
|
||||
struct drm_connector *connector);
|
||||
|
||||
void amdgpu_dm_update_freesync_caps(struct drm_connector *connector,
|
||||
const struct drm_edid *drm_edid,
|
||||
bool do_mccs);
|
||||
|
||||
void amdgpu_dm_update_connector_after_detect(
|
||||
struct amdgpu_dm_connector *aconnector);
|
||||
|
||||
void amdgpu_dm_hdmi_cec_set_edid(struct amdgpu_dm_connector *aconnector);
|
||||
int amdgpu_dm_initialize_hdmi_connector(struct amdgpu_dm_connector *aconnector);
|
||||
|
||||
struct drm_connector *
|
||||
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_commit *state,
|
||||
struct drm_crtc *crtc);
|
||||
|
||||
int amdgpu_dm_convert_dc_color_depth_into_bpc(enum dc_color_depth display_color_depth);
|
||||
|
||||
struct dc_stream_state *
|
||||
amdgpu_dm_create_validate_stream_for_sink(struct drm_connector *connector,
|
||||
const struct drm_display_mode *drm_mode,
|
||||
const struct dm_connector_state *dm_state,
|
||||
const struct dc_stream_state *old_stream);
|
||||
|
||||
int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
|
||||
struct amdgpu_dm_connector *amdgpu_dm_connector,
|
||||
u32 link_index,
|
||||
struct amdgpu_encoder *amdgpu_encoder);
|
||||
|
||||
void amdgpu_dm_s3_handle_hdmi_cec(struct drm_device *ddev, bool suspend);
|
||||
|
||||
int amdgpu_dm_detect_mst_link_for_all_connectors(struct drm_device *dev);
|
||||
|
||||
void amdgpu_set_panel_orientation(struct drm_connector *connector);
|
||||
|
||||
enum dc_color_depth
|
||||
amdgpu_dm_convert_color_depth_from_display_info(const struct drm_connector *connector,
|
||||
bool is_y420, int requested_bpc);
|
||||
|
||||
void amdgpu_dm_update_stream_scaling_settings(struct drm_device *dev,
|
||||
const struct drm_display_mode *mode,
|
||||
const struct dm_connector_state *dm_state,
|
||||
struct dc_stream_state *stream);
|
||||
|
||||
bool amdgpu_dm_is_freesync_video_mode(const struct drm_display_mode *mode,
|
||||
struct amdgpu_dm_connector *aconnector);
|
||||
|
||||
int amdgpu_dm_fill_hdr_info_packet(const struct drm_connector_state *state,
|
||||
struct dc_info_packet *out);
|
||||
|
||||
enum dc_color_space
|
||||
amdgpu_dm_get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing,
|
||||
const struct drm_connector_state *connector_state);
|
||||
|
||||
struct drm_display_mode *
|
||||
amdgpu_dm_get_highest_refresh_rate_mode(struct amdgpu_dm_connector *aconnector,
|
||||
bool use_probed_modes);
|
||||
|
||||
struct amdgpu_i2c_adapter *
|
||||
amdgpu_dm_create_i2c(struct ddc_service *ddc_service, bool oem);
|
||||
|
||||
#define DDC_MANUFACTURERNAME_SAMSUNG 0x2D4C
|
||||
|
||||
/* Encoder functions */
|
||||
extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs;
|
||||
int amdgpu_dm_get_encoder_crtc_mask(struct amdgpu_device *adev);
|
||||
int amdgpu_dm_encoder_init(struct drm_device *dev,
|
||||
struct amdgpu_encoder *aencoder,
|
||||
uint32_t link_index);
|
||||
|
||||
#endif /* __AMDGPU_DM_CONNECTOR_H__ */
|
||||
@@ -2971,7 +2971,7 @@ static ssize_t hdmi_cec_state_write(struct file *f, const char __user *buf,
|
||||
ret = amdgpu_dm_initialize_hdmi_connector(aconnector);
|
||||
if (ret)
|
||||
return ret;
|
||||
hdmi_cec_set_edid(aconnector);
|
||||
amdgpu_dm_hdmi_cec_set_edid(aconnector);
|
||||
} else {
|
||||
if (!aconnector->notifier)
|
||||
return -EINVAL;
|
||||
|
||||
@@ -1784,7 +1784,7 @@ int pre_validate_dsc(struct drm_atomic_commit *state,
|
||||
dm_old_crtc_state = to_dm_crtc_state(state->crtcs[ind].old_state);
|
||||
|
||||
local_dc_state->streams[i] =
|
||||
create_validate_stream_for_sink(connector,
|
||||
amdgpu_dm_create_validate_stream_for_sink(connector,
|
||||
&state->crtcs[ind].new_state->mode,
|
||||
dm_new_conn_state,
|
||||
dm_old_crtc_state->stream);
|
||||
|
||||
Reference in New Issue
Block a user