Commit 61a74712 authored by Qingqing Zhuo's avatar Qingqing Zhuo Committed by Alex Deucher

drm/amd/display: Fix warning

[Why]
- Wrong scope for ifdef
- Missing struct description

[How]
Move ifdef and add comment
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: default avatarEryk Brol <eryk.brol@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3c934f45
...@@ -977,11 +977,12 @@ static void event_mall_stutter(struct work_struct *work) ...@@ -977,11 +977,12 @@ static void event_mall_stutter(struct work_struct *work)
else else
dm->active_vblank_irq_count--; dm->active_vblank_irq_count--;
#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
dc_allow_idle_optimizations( dc_allow_idle_optimizations(
dm->dc, dm->active_vblank_irq_count == 0); dm->dc, dm->active_vblank_irq_count == 0);
DRM_DEBUG_DRIVER("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0); DRM_DEBUG_DRIVER("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);
#endif
mutex_unlock(&dm->dc_lock); mutex_unlock(&dm->dc_lock);
......
...@@ -245,12 +245,12 @@ struct amdgpu_display_manager { ...@@ -245,12 +245,12 @@ struct amdgpu_display_manager {
*/ */
struct mutex audio_lock; struct mutex audio_lock;
#if defined(CONFIG_DRM_AMD_DC_DCN)
/** /**
* @vblank_work_lock: * @vblank_lock:
* *
* Guards access to deferred vblank work state. * Guards access to deferred vblank work state.
*/ */
#if defined(CONFIG_DRM_AMD_DC_DCN)
spinlock_t vblank_lock; spinlock_t vblank_lock;
#endif #endif
...@@ -342,6 +342,11 @@ struct amdgpu_display_manager { ...@@ -342,6 +342,11 @@ struct amdgpu_display_manager {
#endif #endif
#if defined(CONFIG_DRM_AMD_DC_DCN) #if defined(CONFIG_DRM_AMD_DC_DCN)
/**
* @vblank_workqueue:
*
* amdgpu workqueue during vblank
*/
struct vblank_workqueue *vblank_workqueue; struct vblank_workqueue *vblank_workqueue;
#endif #endif
...@@ -360,12 +365,15 @@ struct amdgpu_display_manager { ...@@ -360,12 +365,15 @@ struct amdgpu_display_manager {
*/ */
const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box; const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box;
#if defined(CONFIG_DRM_AMD_DC_DCN)
/** /**
* @active_vblank_irq_count: * @active_vblank_irq_count:
* *
* number of currently active vblank irqs * number of currently active vblank irqs
*/ */
uint32_t active_vblank_irq_count; uint32_t active_vblank_irq_count;
#endif
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY) #if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
struct crc_rd_work *crc_rd_wrk; struct crc_rd_work *crc_rd_wrk;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment