diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2026-10-02 09:21:25 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2026-10-02 09:24:50 -0400 |
| commit | 488d19ac306a724610957cf0ec35008b36352929 (patch) | |
| tree | f507f4c11a154fbb4929b77651ea923ae9555cd5 /drivers/gpu | |
| parent | b6b1d97218518003107d4446fac278fa3e0a19a0 (diff) | |
| download | linux-next-488d19ac306a724610957cf0ec35008b36352929.tar.gz linux-next-488d19ac306a724610957cf0ec35008b36352929.zip | |
Revert "drm/amd/display: drop INLINE_IFN_KUNIT"
This reverts commit 5a98f454a61197761c4c5e8eed948dea2b9f5a69.
This series breaks the build when CONFIG_KUNIT=y and
CONFIG_DRM_AMD_DC_KUNIT_TEST=n. When CONFIG_KUNIT=y,
the functions are not static, but when CONFIG_DRM_AMD_DC_KUNIT_TEST=n,
they should be.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dm_helpers.h | 7 |
3 files changed, 9 insertions, 2 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 de4af9adc633..c787082409fe 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -274,7 +274,7 @@ static const struct amdgpu_dm_kunit_ops *amdgpu_dm_ops; * @array_of_surface_update: dc surface update pointer * */ -VISIBLE_IF_KUNIT inline +VISIBLE_IF_KUNIT INLINE_IFN_KUNIT bool update_planes_and_stream_adapter(struct dc *dc, int planes_count, struct dc_stream_state *stream, diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c index 1fde4959baea..341b4972a309 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c @@ -173,7 +173,7 @@ void amdgpu_dm_init_color_mod(void) } EXPORT_SYMBOL_IF_KUNIT(amdgpu_dm_init_color_mod); -VISIBLE_IF_KUNIT inline +VISIBLE_IF_KUNIT INLINE_IFN_KUNIT struct fixed31_32 amdgpu_dm_fixpt_from_s3132(__u64 x) { struct fixed31_32 val; diff --git a/drivers/gpu/drm/amd/display/dc/dm_helpers.h b/drivers/gpu/drm/amd/display/dc/dm_helpers.h index cabcbc2599e6..6d7cdab1006f 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_helpers.h +++ b/drivers/gpu/drm/amd/display/dc/dm_helpers.h @@ -194,6 +194,13 @@ void dm_helpers_mccs_vcp_set( struct dc_link *link, struct dc_sink *sink); +#if IS_ENABLED(CONFIG_DRM_AMD_DC_KUNIT_TEST) +#define INLINE_IFN_KUNIT inline + +#else +#define INLINE_IFN_KUNIT +#endif + bool dm_helpers_submit_i2c_over_aux( struct ddc_service *ddc, uint32_t address, |