From: Dave Airlie <[email protected]> The only external reads of struct dc_config were five runtime-mutable options. Give each a purpose-built getter (dc_get_disable_ips, dc_get_enable_frl, dc_get_consolidated_dpia_dp_lt, dc_get_usb4_bw_alloc_support, dc_get_allow_edp_hotplug_detection, complementing the existing setter) and drop the dc_get_config view. KUnit tests install the options through dc_test_set_* setters.
No code outside the dc directory references struct dc_config in production anymore. Part of making the struct dc sub-structures opaque outside DC. Signed-off-by: Dave Airlie <[email protected]> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 14 ++++++----- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 +-- .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 4 +-- .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 4 +-- drivers/gpu/drm/amd/display/dc/core/dc_accessors.c | 25 +++++++++++++++++-- drivers/gpu/drm/amd/display/dc/core/dc_test.c | 29 ++++++++++++++++++---- drivers/gpu/drm/amd/display/dc/inc/dc.h | 10 +++++--- drivers/gpu/drm/amd/display/dc/inc/dc_test.h | 6 ++++- 11 files changed, 77 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index b601ec00ba05..6bfa3e9fe5ae 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -761,7 +761,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) } if (dc_get_caps(adev->dm.dc)->ips_support && - dc_get_config(adev->dm.dc)->disable_ips != DMUB_IPS_DISABLE_ALL) + dc_get_disable_ips(adev->dm.dc) != DMUB_IPS_DISABLE_ALL) adev->dm.idle_workqueue = idle_create_workqueue(adev); if (dc_get_caps(adev->dm.dc)->max_links > 0 && adev->family >= AMDGPU_FAMILY_RV) { diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c index 9c607ecc4bd6..a10f374f16df 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c @@ -309,7 +309,7 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) * update the vblank counter in DRM. */ if (dc_get_caps(dc)->ips_support && - dc_get_config(dc)->disable_ips != DMUB_IPS_DISABLE_ALL && + dc_get_disable_ips(dc) != DMUB_IPS_DISABLE_ALL && sr_supported && vblank->config.disable_immediate) drm_crtc_vblank_restore(crtc); } diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index 8bc737117db9..99400740cd66 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -2701,7 +2701,7 @@ static int ips_status_show(struct seq_file *m, void *unused) struct dc *dc = adev->dm.dc; struct dc_dmub_srv *dc_dmub_srv; - seq_printf(m, "IPS config: %d\n", dc_get_config(dc)->disable_ips); + seq_printf(m, "IPS config: %d\n", dc_get_disable_ips(dc)); seq_printf(m, "Idle optimization: %d\n", dc_is_idle_optimizations_allowed(dc)); if (adev->dm.idle_workqueue) { @@ -3379,7 +3379,7 @@ static int allow_edp_hotplug_detection_get(void *data, u64 *val) struct drm_device *dev = connector->dev; struct amdgpu_device *adev = drm_to_adev(dev); - *val = dc_get_config(adev->dm.dc)->allow_edp_hotplug_detection; + *val = dc_get_allow_edp_hotplug_detection(adev->dm.dc); return 0; } diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c index 3ed6a9318931..9aee6fe047ba 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c @@ -340,11 +340,11 @@ int dm_dmub_hw_init(struct amdgpu_device *adev) dc_get_usb4_dpia_count(dc) != 0 && !dc_get_debug_options(dc)->dpia_debug.bits.disable_dpia) { hw_params.dpia_supported = true; - hw_params.disable_dpia = dc_get_debug_options(dc)->dpia_debug.bits.disable_dpia; + hw_params.disable_dpia = + dc_get_debug_options(dc)->dpia_debug.bits.disable_dpia; hw_params.dpia_hpd_int_enable_supported = false; - hw_params.enable_non_transparent_setconfig = - dc_get_config(dc)->consolidated_dpia_dp_lt; - hw_params.disable_dpia_bw_allocation = !dc_get_config(dc)->usb4_bw_alloc_support; + hw_params.enable_non_transparent_setconfig = dc_get_consolidated_dpia_dp_lt(dc); + hw_params.disable_dpia_bw_allocation = !dc_get_usb4_bw_alloc_support(dc); } switch (amdgpu_ip_version(adev, DCE_HWIP, 0)) { @@ -399,14 +399,16 @@ int dm_dmub_hw_init(struct amdgpu_device *adev) case IP_VERSION(3, 1, 3): if (adev->dm.dmcub_fw_version && adev->dm.dmcub_fw_version >= DMUB_FW_VERSION(4, 0, 0) && - adev->dm.dmcub_fw_version < DMUB_FW_VERSION(4, 0, 59)) + adev->dm.dmcub_fw_version < DMUB_FW_VERSION(4, 0, 59)) { dc_get_debug_options_mutable(adev->dm.dc)->sanity_checks = true; + } break; case IP_VERSION(3, 1, 4): if (adev->dm.dmcub_fw_version && adev->dm.dmcub_fw_version >= DMUB_FW_VERSION(4, 0, 0) && - adev->dm.dmcub_fw_version < DMUB_FW_VERSION(8, 0, 16)) + adev->dm.dmcub_fw_version < DMUB_FW_VERSION(8, 0, 16)) { dc_get_debug_options_mutable(adev->dm.dc)->sanity_checks = true; + } break; default: break; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 542f9c4cb7e4..5a92e0a2b086 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -229,8 +229,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps( if (edid_caps->edid_hdmi) { edid_caps->qs_bit = connector->display_info.rgb_quant_range_selectable; populate_hdmi_info_from_connector( - dc_get_config(link->dc)->enable_frl, - &connector->display_info.hdmi, edid_caps); + dc_get_enable_frl(link->dc), + &connector->display_info.hdmi, edid_caps); drm_dbg_driver(connector->dev, "%s: HDMI_FRL [%s] max_frl_rate %d\n", __func__, connector->name, edid_caps->max_frl_rate); if (edid_caps->frl_dsc_support) drm_dbg_driver(connector->dev, "%s: HDMI_FRL_DSC [%s] frl_dsc_10bpc %d, frl_dsc_12bpc %d, frl_dsc_all_bpp %d, frl_dsc_native_420 %d, frl_dsc_max_slices %d, frl_dsc_max_frl_rate %d, frl_dsc_total_chunk_kbytes %d\n", diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c index 4543b0b0f993..1ebe9bef2c96 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c @@ -1194,7 +1194,7 @@ static void dm_test_crtc_enable_vblank_ips_restore(struct kunit *test) /* IPS enabled and not fully disabled -> first restore condition holds. */ dc_test_caps(adev->dm.dc)->ips_support = true; - dc_test_config(adev->dm.dc)->disable_ips = DMUB_IPS_ENABLE; + dc_test_set_disable_ips(adev->dm.dc, DMUB_IPS_ENABLE); /* Supported PSR version makes self-refresh supported. */ link = acrtc_state->stream->link; @@ -1241,7 +1241,7 @@ static void dm_test_crtc_enable_vblank_ips_restore_replay(struct kunit *test) /* IPS enabled and not fully disabled -> first restore condition holds. */ dc_test_caps(adev->dm.dc)->ips_support = true; - dc_test_config(adev->dm.dc)->disable_ips = DMUB_IPS_ENABLE; + dc_test_set_disable_ips(adev->dm.dc, DMUB_IPS_ENABLE); /* * PSR unsupported but replay supported -> sr_supported is driven by the diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c index 65bffc57ea40..e5145902d7d6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c @@ -435,7 +435,7 @@ static void dm_test_parse_edid_caps_hdmi_frl(struct kunit *test) dc = dm_kunit_alloc_dc(test); link->dc = dc; - dc_test_config(dc)->enable_frl = true; + dc_test_set_enable_frl(dc, true); dm_test_fill_base_edid(dc_edid, true); @@ -477,7 +477,7 @@ static void dm_test_parse_edid_caps_hdmi_frl_dsc(struct kunit *test) dc = dm_kunit_alloc_dc(test); link->dc = dc; - dc_test_config(dc)->enable_frl = true; + dc_test_set_enable_frl(dc, true); dm_test_fill_base_edid(dc_edid, true); diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c b/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c index 163884db0294..eb34a76262b1 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_accessors.c @@ -57,9 +57,25 @@ const struct dc_caps *dc_get_caps(const struct dc *dc) return &dc->caps; } -const struct dc_config *dc_get_config(const struct dc *dc) +unsigned int dc_get_disable_ips(const struct dc *dc) { - return &dc->config; + return dc->config.disable_ips; +} +EXPORT_IF_KUNIT(dc_get_disable_ips); + +bool dc_get_enable_frl(const struct dc *dc) +{ + return dc->config.enable_frl; +} + +bool dc_get_consolidated_dpia_dp_lt(const struct dc *dc) +{ + return dc->config.consolidated_dpia_dp_lt; +} + +bool dc_get_usb4_bw_alloc_support(const struct dc *dc) +{ + return dc->config.usb4_bw_alloc_support; } void dc_set_allow_edp_hotplug_detection(struct dc *dc, @@ -68,6 +84,11 @@ void dc_set_allow_edp_hotplug_detection(struct dc *dc, dc->config.allow_edp_hotplug_detection = hpd_select; } +unsigned int dc_get_allow_edp_hotplug_detection(const struct dc *dc) +{ + return dc->config.allow_edp_hotplug_detection; +} + const struct dc_debug_options *dc_get_debug_options(const struct dc *dc) { return &dc->debug; diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_test.c b/drivers/gpu/drm/amd/display/dc/core/dc_test.c index 04c799ae33d3..6431afb2b5b1 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_test.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_test.c @@ -105,17 +105,36 @@ void dc_test_set_idle_optimizations_allowed(struct dc *dc, bool allowed) } EXPORT_SYMBOL(dc_test_set_idle_optimizations_allowed); +void dc_test_set_disable_ips(struct dc *dc, unsigned int disable_ips) +{ + dc->config.disable_ips = disable_ips; +} +EXPORT_SYMBOL(dc_test_set_disable_ips); + +void dc_test_set_enable_frl(struct dc *dc, bool enable) +{ + dc->config.enable_frl = enable; +} +EXPORT_SYMBOL(dc_test_set_enable_frl); + +void dc_test_set_consolidated_dpia_dp_lt(struct dc *dc, bool enable) +{ + dc->config.consolidated_dpia_dp_lt = enable; +} +EXPORT_SYMBOL(dc_test_set_consolidated_dpia_dp_lt); + +void dc_test_set_usb4_bw_alloc_support(struct dc *dc, bool enable) +{ + dc->config.usb4_bw_alloc_support = enable; +} +EXPORT_SYMBOL(dc_test_set_usb4_bw_alloc_support); + struct dc_caps *dc_test_caps(struct dc *dc) { return &dc->caps; } EXPORT_SYMBOL(dc_test_caps); -struct dc_config *dc_test_config(struct dc *dc) -{ - return &dc->config; -} -EXPORT_SYMBOL(dc_test_config); struct dc_debug_options *dc_test_debug_options(struct dc *dc) { diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc.h b/drivers/gpu/drm/amd/display/dc/inc/dc.h index 65705f4941c1..31baba820f6c 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/inc/dc.h @@ -2354,9 +2354,6 @@ enum dce_version dc_get_dce_version(const struct dc *dc); /* Capabilities detected at dc_create() time. Read-only. */ const struct dc_caps *dc_get_caps(const struct dc *dc); -/* Configuration captured at dc_create() time. Read-only. */ -const struct dc_config *dc_get_config(const struct dc *dc); - /* * Select which eDP connectors get hotplug detection enabled; see * enum dc_hpd_enable_select. Runtime configurable (debugfs). @@ -2364,6 +2361,13 @@ const struct dc_config *dc_get_config(const struct dc *dc); void dc_set_allow_edp_hotplug_detection(struct dc *dc, enum dc_hpd_enable_select hpd_select); +/* Configuration reads for the runtime-mutable options. */ +unsigned int dc_get_disable_ips(const struct dc *dc); +bool dc_get_enable_frl(const struct dc *dc); +bool dc_get_consolidated_dpia_dp_lt(const struct dc *dc); +bool dc_get_usb4_bw_alloc_support(const struct dc *dc); +unsigned int dc_get_allow_edp_hotplug_detection(const struct dc *dc); + /* Debug overrides (module parameters, debugfs). Read-only view. */ const struct dc_debug_options *dc_get_debug_options(const struct dc *dc); diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc_test.h b/drivers/gpu/drm/amd/display/dc/inc/dc_test.h index 61911de9da05..80f97e29246f 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/dc_test.h +++ b/drivers/gpu/drm/amd/display/dc/inc/dc_test.h @@ -69,9 +69,13 @@ void dc_test_set_link(struct dc *dc, unsigned int index, struct dc_link *link); void dc_test_set_link_count(struct dc *dc, unsigned int count); void dc_test_set_idle_optimizations_allowed(struct dc *dc, bool allowed); +void dc_test_set_disable_ips(struct dc *dc, unsigned int disable_ips); +void dc_test_set_enable_frl(struct dc *dc, bool enable); +void dc_test_set_consolidated_dpia_dp_lt(struct dc *dc, bool enable); +void dc_test_set_usb4_bw_alloc_support(struct dc *dc, bool enable); + /* Mutable views of embedded sub-structures, for test faking only. */ struct dc_caps *dc_test_caps(struct dc *dc); -struct dc_config *dc_test_config(struct dc *dc); struct dc_debug_options *dc_test_debug_options(struct dc *dc); struct dc_cap_funcs *dc_test_cap_funcs(struct dc *dc); struct hw_sequencer_funcs *dc_test_hwss(struct dc *dc); -- 2.56.0
