[PATCH] drm/radeon/kms/evergreen: don't enable hdmi audio stuff

[Alex Deucher]

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
---
 drivers/gpu/drm/radeon/r600_audio.c |    2 +-
 drivers/gpu/drm/radeon/r600_hdmi.c  |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/r600_audio.c
b/drivers/gpu/drm/radeon/r600_audio.c
index dac7042..1d89805 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -35,7 +35,7 @@
  */
 static int r600_audio_chipset_supported(struct radeon_device *rdev)
 {
-	return rdev->family >= CHIP_R600
+	return (rdev->family >= CHIP_R600 && rdev->family < CHIP_CEDAR)
 		|| rdev->family == CHIP_RS600
 		|| rdev->family == CHIP_RS690
 		|| rdev->family == CHIP_RS740;
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c
b/drivers/gpu/drm/radeon/r600_hdmi.c
index 029fa14..2616b82 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -314,6 +314,9 @@ void r600_hdmi_setmode(struct drm_encoder
*encoder, struct drm_display_mode *mod
 	struct radeon_device *rdev = dev->dev_private;
 	uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset;

+	if (ASIC_IS_DCE4(rdev))
+		return;
+
 	if (!offset)
 		return;

@@ -484,6 +487,9 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

+	if (ASIC_IS_DCE4(rdev))
+		return;
+
 	if (!radeon_encoder->hdmi_offset) {
 		r600_hdmi_assign_block(encoder);
 		if (!radeon_encoder->hdmi_offset) {
@@ -525,6 +531,9 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

+	if (ASIC_IS_DCE4(rdev))
+		return;
+
 	if (!radeon_encoder->hdmi_offset) {
 		dev_err(rdev->dev, "Disabling not enabled HDMI\n");
 		return;
-- 
1.5.6.3

--0015174482ce4b72d404845c65eb
Content-Type: text/x-diff; charset=US-ASCII; 
	name="0001-drm-radeon-kms-evergreen-don-t-enable-hdmi-audio-st.patch"
Content-Disposition: attachment; 
	filename="0001-drm-radeon-kms-evergreen-don-t-enable-hdmi-audio-st.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g835xyx40

RnJvbSA2OTgxYTVhOTYzMmY4NWZkODk3YWJkZTBlMjk2YjQ5YWI3MjQ1Njc4IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IERldWNoZXIgPGFsZXhkZXVjaGVyQGdtYWlsLmNvbT4K
RGF0ZTogRnJpLCAxNiBBcHIgMjAxMCAxMTozNTozMCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIGRy
bS9yYWRlb24va21zL2V2ZXJncmVlbjogZG9uJ3QgZW5hYmxlIGhkbWkgYXVkaW8gc3R1ZmYKClNp
Z25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGRldWNoZXJAZ21haWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9yYWRlb24vcjYwMF9hdWRpby5jIHwgICAgMiArLQogZHJpdmVycy9ncHUv
ZHJtL3JhZGVvbi9yNjAwX2hkbWkuYyAgfCAgICA5ICsrKysrKysrKwogMiBmaWxlcyBjaGFuZ2Vk
LCAxMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9yYWRlb24vcjYwMF9hdWRpby5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yNjAw
X2F1ZGlvLmMKaW5kZXggZGFjNzA0Mi4uMWQ4OTgwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL3JhZGVvbi9yNjAwX2F1ZGlvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yNjAw
X2F1ZGlvLmMKQEAgLTM1LDcgKzM1LDcgQEAKICAqLwogc3RhdGljIGludCByNjAwX2F1ZGlvX2No
aXBzZXRfc3VwcG9ydGVkKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogewotCXJldHVybiBy
ZGV2LT5mYW1pbHkgPj0gQ0hJUF9SNjAwCisJcmV0dXJuIChyZGV2LT5mYW1pbHkgPj0gQ0hJUF9S
NjAwICYmIHJkZXYtPmZhbWlseSA8IENISVBfQ0VEQVIpCiAJCXx8IHJkZXYtPmZhbWlseSA9PSBD
SElQX1JTNjAwCiAJCXx8IHJkZXYtPmZhbWlseSA9PSBDSElQX1JTNjkwCiAJCXx8IHJkZXYtPmZh
bWlseSA9PSBDSElQX1JTNzQwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y
NjAwX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjYwMF9oZG1pLmMKaW5kZXggMDI5
ZmExNC4uMjYxNmI4MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yNjAwX2hk
bWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3I2MDBfaGRtaS5jCkBAIC0zMTQsNiAr
MzE0LDkgQEAgdm9pZCByNjAwX2hkbWlfc2V0bW9kZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29k
ZXIsIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2QKIAlzdHJ1Y3QgcmFkZW9uX2RldmljZSAq
cmRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdWludDMyX3Qgb2Zmc2V0ID0gdG9fcmFkZW9uX2Vu
Y29kZXIoZW5jb2RlciktPmhkbWlfb2Zmc2V0OwogCisJaWYgKEFTSUNfSVNfRENFNChyZGV2KSkK
KwkJcmV0dXJuOworCiAJaWYgKCFvZmZzZXQpCiAJCXJldHVybjsKIApAQCAtNDg0LDYgKzQ4Nyw5
IEBAIHZvaWQgcjYwMF9oZG1pX2VuYWJsZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiAJ
c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBy
YWRlb25fZW5jb2RlciAqcmFkZW9uX2VuY29kZXIgPSB0b19yYWRlb25fZW5jb2RlcihlbmNvZGVy
KTsKIAorCWlmIChBU0lDX0lTX0RDRTQocmRldikpCisJCXJldHVybjsKKwogCWlmICghcmFkZW9u
X2VuY29kZXItPmhkbWlfb2Zmc2V0KSB7CiAJCXI2MDBfaGRtaV9hc3NpZ25fYmxvY2soZW5jb2Rl
cik7CiAJCWlmICghcmFkZW9uX2VuY29kZXItPmhkbWlfb2Zmc2V0KSB7CkBAIC01MjUsNiArNTMx
LDkgQEAgdm9pZCByNjAwX2hkbWlfZGlzYWJsZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIp
CiAJc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVj
dCByYWRlb25fZW5jb2RlciAqcmFkZW9uX2VuY29kZXIgPSB0b19yYWRlb25fZW5jb2RlcihlbmNv
ZGVyKTsKIAorCWlmIChBU0lDX0lTX0RDRTQocmRldikpCisJCXJldHVybjsKKwogCWlmICghcmFk
ZW9uX2VuY29kZXItPmhkbWlfb2Zmc2V0KSB7CiAJCWRldl9lcnIocmRldi0+ZGV2LCAiRGlzYWJs
aW5nIG5vdCBlbmFibGVkIEhETUlcbiIpOwogCQlyZXR1cm47Ci0tIAoxLjUuNi4zCgo=
--0015174482ce4b72d404845c65eb--