radeon/audio: moved VBI packet programming to separate functions

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c
index 2a963c1..f07d7b6 100644 (file)
--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
+++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
@@ -226,9 +226,7 @@ void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *m
        radeon_audio_enable(rdev, dig->afmt->pin, 0);
 
        radeon_audio_set_dto(encoder, mode->clock);
-
-       WREG32(HDMI0_VBI_PACKET_CONTROL + offset,
-              HDMI0_NULL_SEND); /* send null packets when required */
+       radeon_audio_set_vbi_packet(encoder);
 
        WREG32(HDMI0_AUDIO_CRC_CONTROL + offset, 0x1000);
 
@@ -252,11 +250,6 @@ void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *m
                radeon_audio_write_sad_regs(encoder);
        }
 
-       WREG32(HDMI0_VBI_PACKET_CONTROL + offset,
-              HDMI0_NULL_SEND | /* send null packets when required */
-              HDMI0_GC_SEND | /* send general control packets */
-              HDMI0_GC_CONT); /* send general control packets every frame */
-
        /* TODO: HDMI0_AUDIO_INFO_UPDATE */
        WREG32(HDMI0_INFOFRAME_CONTROL0 + offset,
               HDMI0_AVI_INFO_SEND | /* enable AVI info frames */

diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index 05cef01..3c4b33f 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -289,6 +289,17 @@ void dce4_dp_audio_set_dto(struct radeon_device *rdev,
        WREG32(DCCG_AUDIO_DTO1_MODULE, rdev->clock.max_pixel_clock * 10);
 }
 
+void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset)
+{
+       struct drm_device *dev = encoder->dev;
+       struct radeon_device *rdev = dev->dev_private;
+
+       WREG32(HDMI_VBI_PACKET_CONTROL + offset,
+               HDMI_NULL_SEND |        /* send null packets when required */
+               HDMI_GC_SEND |          /* send general control packets */
+               HDMI_GC_CONT);          /* send general control packets every frame */
+}
+
 /*
  * update the info frames with the data from the current display mode
  */
@@ -325,9 +336,7 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
        radeon_audio_enable(rdev, dig->afmt->pin, 0);
 
        radeon_audio_set_dto(encoder, mode->clock);
-
-       WREG32(HDMI_VBI_PACKET_CONTROL + offset,
-              HDMI_NULL_SEND); /* send null packets when required */
+       radeon_audio_set_vbi_packet(encoder);
 
        WREG32(AFMT_AUDIO_CRC_CONTROL + offset, 0x1000);
 
@@ -360,11 +369,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
 
        WREG32(HDMI_CONTROL + offset, val);
 
-       WREG32(HDMI_VBI_PACKET_CONTROL + offset,
-              HDMI_NULL_SEND | /* send null packets when required */
-              HDMI_GC_SEND | /* send general control packets */
-              HDMI_GC_CONT); /* send general control packets every frame */
-
        WREG32(HDMI_INFOFRAME_CONTROL0 + offset,
               HDMI_AUDIO_INFO_SEND | /* enable audio info frames (frames won't be set until audio is enabled) */
               HDMI_AUDIO_INFO_CONT); /* required for audio info values to be updated */

diff --cc drivers/gpu/drm/radeon/r600_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_audio.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_audio.h
Simple merge