diff options
| author | Leo (Sunpeng) Li <sunpeng.li@amd.com> | 2018-01-12 13:13:11 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:19:24 -0500 |
| commit | fdb401d03d311399d844b9f23ec5ab98a2811f58 (patch) | |
| tree | b356b5895a420aa425e7911da116560d78105cae /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | |
| parent | f783577c85c00da6a8b226a89a83789d2f105c63 (diff) | |
drm/amd/display: Fix multiple definitions of handle_crc_irq
If CONFIG_DEBUG_FS is disabled, then CRC should also be disabled.
Therefore, amdgpu_dm_crtc_handle_crc_irq was redefined as a no-op
function within amdgpu_dm.h.
However, since amdgpu_dm.h is included in multiple files, this caused
conflicts when linking during compile. Therefore, Use a macro to
define the function as a no-op instead.
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 2a24d259cd91..99ae85edf3f8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -265,7 +265,7 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name, void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc); #else #define amdgpu_dm_crtc_set_crc_source NULL -void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc) {} +#define amdgpu_dm_crtc_handle_crc_irq(x) #endif extern const struct drm_encoder_helper_funcs amdgpu_dm_encoder_helper_funcs; |