[PATCH] drm/radeon/kms/evergreen: fix LUT setup

[Alex Deucher]

Must have gotten broken during an earlier rebase.

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
---
 drivers/gpu/drm/radeon/radeon_display.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_display.c
b/drivers/gpu/drm/radeon/radeon_display.c
index 243c1c4..ce5163e 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -86,12 +86,12 @@ static void evergreen_crtc_load_lut(struct drm_crtc *crtc)
 	WREG32(EVERGREEN_DC_LUT_WHITE_OFFSET_GREEN +
radeon_crtc->crtc_offset, 0xffff);
 	WREG32(EVERGREEN_DC_LUT_WHITE_OFFSET_RED + radeon_crtc->crtc_offset, 0xffff);

-	WREG32(EVERGREEN_DC_LUT_RW_MODE, radeon_crtc->crtc_id);
-	WREG32(EVERGREEN_DC_LUT_WRITE_EN_MASK, 0x00000007);
+	WREG32(EVERGREEN_DC_LUT_RW_MODE + radeon_crtc->crtc_offset, 0);
+	WREG32(EVERGREEN_DC_LUT_WRITE_EN_MASK + radeon_crtc->crtc_offset, 0x00000007);

-	WREG32(EVERGREEN_DC_LUT_RW_INDEX, 0);
+	WREG32(EVERGREEN_DC_LUT_RW_INDEX + radeon_crtc->crtc_offset, 0);
 	for (i = 0; i < 256; i++) {
-		WREG32(EVERGREEN_DC_LUT_30_COLOR,
+		WREG32(EVERGREEN_DC_LUT_30_COLOR + radeon_crtc->crtc_offset,
 		       (radeon_crtc->lut_r[i] << 20) |
 		       (radeon_crtc->lut_g[i] << 10) |
 		       (radeon_crtc->lut_b[i] << 0));
-- 
1.5.6.3

--0016e6567d7eebf3250484deaa8c
Content-Type: text/plain; charset=US-ASCII; 
	name="0001-drm-radeon-kms-evergreen-fix-LUT-setup.patch"
Content-Disposition: attachment; 
	filename="0001-drm-radeon-kms-evergreen-fix-LUT-setup.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g8cf23770

RnJvbSA1MDM4MzgwYjM3YWZlNmQ3OTYxMmE1NjY1ZDQ2ZDU0MDg2ODEyNDk2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4IERldWNoZXIgPGFsZXhkZXVjaGVyQGdtYWlsLmNvbT4K
RGF0ZTogVGh1LCAyMiBBcHIgMjAxMCAyMjo1ODo1MCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIGRy
bS9yYWRlb24va21zL2V2ZXJncmVlbjogZml4IExVVCBzZXR1cAoKTXVzdCBoYXZlIGdvdHRlbiBi
cm9rZW4gZHVyaW5nIGFuIGVhcmxpZXIgcmViYXNlLgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVj
aGVyIDxhbGV4ZGV1Y2hlckBnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y
YWRlb25fZGlzcGxheS5jIHwgICAgOCArKysrLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCA0IGluc2Vy
dGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jh
ZGVvbi9yYWRlb25fZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGlz
cGxheS5jCmluZGV4IDI0M2MxYzQuLmNlNTE2M2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9yYWRlb24vcmFkZW9uX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh
ZGVvbl9kaXNwbGF5LmMKQEAgLTg2LDEyICs4NiwxMiBAQCBzdGF0aWMgdm9pZCBldmVyZ3JlZW5f
Y3J0Y19sb2FkX2x1dChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJV1JFRzMyKEVWRVJHUkVFTl9E
Q19MVVRfV0hJVEVfT0ZGU0VUX0dSRUVOICsgcmFkZW9uX2NydGMtPmNydGNfb2Zmc2V0LCAweGZm
ZmYpOwogCVdSRUczMihFVkVSR1JFRU5fRENfTFVUX1dISVRFX09GRlNFVF9SRUQgKyByYWRlb25f
Y3J0Yy0+Y3J0Y19vZmZzZXQsIDB4ZmZmZik7CiAKLQlXUkVHMzIoRVZFUkdSRUVOX0RDX0xVVF9S
V19NT0RFLCByYWRlb25fY3J0Yy0+Y3J0Y19pZCk7Ci0JV1JFRzMyKEVWRVJHUkVFTl9EQ19MVVRf
V1JJVEVfRU5fTUFTSywgMHgwMDAwMDAwNyk7CisJV1JFRzMyKEVWRVJHUkVFTl9EQ19MVVRfUldf
TU9ERSArIHJhZGVvbl9jcnRjLT5jcnRjX29mZnNldCwgMCk7CisJV1JFRzMyKEVWRVJHUkVFTl9E
Q19MVVRfV1JJVEVfRU5fTUFTSyArIHJhZGVvbl9jcnRjLT5jcnRjX29mZnNldCwgMHgwMDAwMDAw
Nyk7CiAKLQlXUkVHMzIoRVZFUkdSRUVOX0RDX0xVVF9SV19JTkRFWCwgMCk7CisJV1JFRzMyKEVW
RVJHUkVFTl9EQ19MVVRfUldfSU5ERVggKyByYWRlb25fY3J0Yy0+Y3J0Y19vZmZzZXQsIDApOwog
CWZvciAoaSA9IDA7IGkgPCAyNTY7IGkrKykgewotCQlXUkVHMzIoRVZFUkdSRUVOX0RDX0xVVF8z
MF9DT0xPUiwKKwkJV1JFRzMyKEVWRVJHUkVFTl9EQ19MVVRfMzBfQ09MT1IgKyByYWRlb25fY3J0
Yy0+Y3J0Y19vZmZzZXQsCiAJCSAgICAgICAocmFkZW9uX2NydGMtPmx1dF9yW2ldIDw8IDIwKSB8
CiAJCSAgICAgICAocmFkZW9uX2NydGMtPmx1dF9nW2ldIDw8IDEwKSB8CiAJCSAgICAgICAocmFk
ZW9uX2NydGMtPmx1dF9iW2ldIDw8IDApKTsKLS0gCjEuNS42LjMKCg==
--0016e6567d7eebf3250484deaa8c--