drm/radeon/kms: get rid of hdmi_config_offset
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Tested-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Christian König <deathsimple@vodafone.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
a92553abe5
commit
a010fb1a9a
|
@ -232,6 +232,4 @@
|
|||
/* HDMI blocks at 0x7030, 0x7c30, 0x10830, 0x11430, 0x12030, 0x12c30 */
|
||||
#define EVERGREEN_HDMI_BASE 0x7030
|
||||
|
||||
#define EVERGREEN_HDMI_CONFIG_OFFSET 0xf0
|
||||
|
||||
#endif
|
||||
|
|
|
@ -485,14 +485,9 @@ static void r600_hdmi_assign_block(struct drm_encoder *encoder)
|
|||
}
|
||||
radeon_encoder->hdmi_offset = EVERGREEN_HDMI_BASE +
|
||||
eg_offsets[dig->dig_encoder];
|
||||
radeon_encoder->hdmi_config_offset = radeon_encoder->hdmi_offset
|
||||
+ EVERGREEN_HDMI_CONFIG_OFFSET;
|
||||
} else if (ASIC_IS_DCE3(rdev)) {
|
||||
radeon_encoder->hdmi_offset = dig->dig_encoder ?
|
||||
R600_HDMI_BLOCK3 : R600_HDMI_BLOCK1;
|
||||
if (ASIC_IS_DCE32(rdev))
|
||||
radeon_encoder->hdmi_config_offset = dig->dig_encoder ?
|
||||
R600_HDMI_CONFIG2 : R600_HDMI_CONFIG1;
|
||||
} else if (rdev->family >= CHIP_R600 || rdev->family == CHIP_RS600 ||
|
||||
rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) {
|
||||
radeon_encoder->hdmi_offset = r600_hdmi_find_free_block(dev);
|
||||
|
@ -525,9 +520,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
|
|||
if (ASIC_IS_DCE5(rdev)) {
|
||||
/* TODO */
|
||||
} else if (ASIC_IS_DCE4(rdev)) {
|
||||
WREG32_P(radeon_encoder->hdmi_config_offset + 0xc, 0x1, ~0x1);
|
||||
WREG32_P(radeon_encoder->hdmi_offset + EVERGREEN_AUDIO_PACKET_CNTL, 0x1, ~0x1);
|
||||
} else if (ASIC_IS_DCE32(rdev)) {
|
||||
WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0x1, ~0x1);
|
||||
WREG32_P(radeon_encoder->hdmi_offset + R600_HDMI_AUDIO_PACKET_CNTL, 0x1, ~0x1);
|
||||
} else if (ASIC_IS_DCE3(rdev)) {
|
||||
/* TODO */
|
||||
} else if (rdev->family >= CHIP_R600) {
|
||||
|
@ -588,9 +583,9 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
|
|||
if (ASIC_IS_DCE5(rdev)) {
|
||||
/* TODO */
|
||||
} else if (ASIC_IS_DCE4(rdev)) {
|
||||
WREG32_P(radeon_encoder->hdmi_config_offset + 0xc, 0, ~0x1);
|
||||
WREG32_P(radeon_encoder->hdmi_offset + EVERGREEN_AUDIO_PACKET_CNTL, 0, ~0x1);
|
||||
} else if (ASIC_IS_DCE32(rdev)) {
|
||||
WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0, ~0x1);
|
||||
WREG32_P(radeon_encoder->hdmi_offset + R600_HDMI_AUDIO_PACKET_CNTL, 0, ~0x1);
|
||||
} else if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
|
||||
switch (radeon_encoder->encoder_id) {
|
||||
case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
|
||||
|
@ -610,5 +605,4 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
|
|||
}
|
||||
|
||||
radeon_encoder->hdmi_offset = 0;
|
||||
radeon_encoder->hdmi_config_offset = 0;
|
||||
}
|
||||
|
|
|
@ -192,9 +192,7 @@
|
|||
#define R600_HDMI_AUDIO_DEBUG_1 0xe4
|
||||
#define R600_HDMI_AUDIO_DEBUG_2 0xe8
|
||||
#define R600_HDMI_AUDIO_DEBUG_3 0xec
|
||||
|
||||
/* HDMI additional config base register addresses */
|
||||
#define R600_HDMI_CONFIG1 0x7600
|
||||
#define R600_HDMI_CONFIG2 0x7a00
|
||||
#define R600_HDMI_AUDIO_PACKET_CNTL 0x204
|
||||
#define EVERGREEN_AUDIO_PACKET_CNTL 0xfc
|
||||
|
||||
#endif
|
||||
|
|
|
@ -385,7 +385,6 @@ struct radeon_encoder {
|
|||
void *enc_priv;
|
||||
int audio_polling_active;
|
||||
int hdmi_offset;
|
||||
int hdmi_config_offset;
|
||||
int hdmi_audio_workaround;
|
||||
int hdmi_buffer_status;
|
||||
bool is_ext_encoder;
|
||||
|
|
Loading…
Reference in a new issue