From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Subject: [PATCH 1/2] drm/radeon: fix render backend setup for SI and CIK Date: Sun, 22 Dec 2013 02:18:00 +0100 Message-ID: <1387675081-3406-1-git-send-email-maraeo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 14FADFA96A for ; Sat, 21 Dec 2013 17:18:08 -0800 (PST) Received: by mail-ea0-f177.google.com with SMTP id n15so1722486ead.8 for ; Sat, 21 Dec 2013 17:18:07 -0800 (PST) Received: from localhost.localdomain ([194.228.11.87]) by mx.google.com with ESMTPSA id v1sm32126031eef.9.2013.12.21.17.18.05 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 21 Dec 2013 17:18:05 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4KCk9ubHkgdGhlIHJlbmRl ciBiYWNrZW5kcyBvZiB0aGUgZmlyc3Qgc2hhZGVyIGVuZ2luZSB3ZXJlIGVuYWJsZWQuIFRoZSBv dGhlcnMKd2VyZSBlcnJvbmVvdXNseSBkaXNhYmxlZC4gRW5hYmxpbmcgdGhlIG90aGVyIHJlbmRl ciBiYWNrZW5kcyBpbXByb3ZlcwpwZXJmb3JtYW5jZSBhIGxvdC4KClVuaWdpbmUgU2FuY3R1YXJ5 IG9uIEJvbmFpcmU6CiAgQmVmb3JlOiAxNSBmcHMKICBBZnRlcjogIDkwIGZwcwoKSnVkZ2luZyBm cm9tIHRoZSBmYW4gbm9pc2UsIHRoZSBHUFUgd2FzIGFsc28gdW5kZXJjbG9ja2VkIHdoZW4gdGhl IG90aGVyCnJlbmRlciBiYWNrZW5kcyB3ZXJlIGRpc2FibGVkLCByZXN1bHRpbmcgaW4gaG9ycmli bGUgcGVyZm9ybWFuY2UuIFRoZSBmYW4gaXMKYSBsb3Qgbm9pc3kgdW5kZXIgbG9hZCBub3cuCgpT aWduZWQtb2ZmLWJ5OiBNYXJlayBPbMWhw6FrIDxtYXJlay5vbHNha0BhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9yYWRlb24vY2lrLmMgfCAxMCArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3NpLmMgIHwgMTAgKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL2Npay5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9jaWsuYwppbmRleCBiNDNhM2Ez Li4xMzhhNzc2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2Npay5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vY2lrLmMKQEAgLTMwNTcsNyArMzA1Nyw3IEBAIHN0YXRp YyB1MzIgY2lrX2NyZWF0ZV9iaXRtYXNrKHUzMiBiaXRfd2lkdGgpCiAgKiBSZXR1cm5zIHRoZSBk aXNhYmxlZCBSQiBiaXRtYXNrLgogICovCiBzdGF0aWMgdTMyIGNpa19nZXRfcmJfZGlzYWJsZWQo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCi0JCQkgICAgICB1MzIgbWF4X3JiX251bSwgdTMy IHNlX251bSwKKwkJCSAgICAgIHUzMiBtYXhfcmJfbnVtX3Blcl9zZSwKIAkJCSAgICAgIHUzMiBz aF9wZXJfc2UpCiB7CiAJdTMyIGRhdGEsIG1hc2s7CkBAIC0zMDcxLDcgKzMwNzEsNyBAQCBzdGF0 aWMgdTMyIGNpa19nZXRfcmJfZGlzYWJsZWQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAK IAlkYXRhID4+PSBCQUNLRU5EX0RJU0FCTEVfU0hJRlQ7CiAKLQltYXNrID0gY2lrX2NyZWF0ZV9i aXRtYXNrKG1heF9yYl9udW0gLyBzZV9udW0gLyBzaF9wZXJfc2UpOworCW1hc2sgPSBjaWtfY3Jl YXRlX2JpdG1hc2sobWF4X3JiX251bV9wZXJfc2UgLyBzaF9wZXJfc2UpOwogCiAJcmV0dXJuIGRh dGEgJiBtYXNrOwogfQpAQCAtMzA4OCw3ICszMDg4LDcgQEAgc3RhdGljIHUzMiBjaWtfZ2V0X3Ji X2Rpc2FibGVkKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogICovCiBzdGF0aWMgdm9pZCBj aWtfc2V0dXBfcmIoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJCQkgdTMyIHNlX251bSwg dTMyIHNoX3Blcl9zZSwKLQkJCSB1MzIgbWF4X3JiX251bSkKKwkJCSB1MzIgbWF4X3JiX251bV9w ZXJfc2UpCiB7CiAJaW50IGksIGo7CiAJdTMyIGRhdGEsIG1hc2s7CkBAIC0zMDk4LDcgKzMwOTgs NyBAQCBzdGF0aWMgdm9pZCBjaWtfc2V0dXBfcmIoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYs CiAJZm9yIChpID0gMDsgaSA8IHNlX251bTsgaSsrKSB7CiAJCWZvciAoaiA9IDA7IGogPCBzaF9w ZXJfc2U7IGorKykgewogCQkJY2lrX3NlbGVjdF9zZV9zaChyZGV2LCBpLCBqKTsKLQkJCWRhdGEg PSBjaWtfZ2V0X3JiX2Rpc2FibGVkKHJkZXYsIG1heF9yYl9udW0sIHNlX251bSwgc2hfcGVyX3Nl KTsKKwkJCWRhdGEgPSBjaWtfZ2V0X3JiX2Rpc2FibGVkKHJkZXYsIG1heF9yYl9udW1fcGVyX3Nl LCBzaF9wZXJfc2UpOwogCQkJaWYgKHJkZXYtPmZhbWlseSA9PSBDSElQX0hBV0FJSSkKIAkJCQlk aXNhYmxlZF9yYnMgfD0gZGF0YSA8PCAoKGkgKiBzaF9wZXJfc2UgKyBqKSAqIEhBV0FJSV9SQl9C SVRNQVBfV0lEVEhfUEVSX1NIKTsKIAkJCWVsc2UKQEAgLTMxMDgsNyArMzEwOCw3IEBAIHN0YXRp YyB2b2lkIGNpa19zZXR1cF9yYihzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAljaWtfc2Vs ZWN0X3NlX3NoKHJkZXYsIDB4ZmZmZmZmZmYsIDB4ZmZmZmZmZmYpOwogCiAJbWFzayA9IDE7Ci0J Zm9yIChpID0gMDsgaSA8IG1heF9yYl9udW07IGkrKykgeworCWZvciAoaSA9IDA7IGkgPCBtYXhf cmJfbnVtX3Blcl9zZSAqIHNlX251bTsgaSsrKSB7CiAJCWlmICghKGRpc2FibGVkX3JicyAmIG1h c2spKQogCQkJZW5hYmxlZF9yYnMgfD0gbWFzazsKIAkJbWFzayA8PD0gMTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2ku YwppbmRleCBhMzY3MzZkLi4zZWVkOWExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL3NpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9zaS5jCkBAIC0yODExLDcgKzI4 MTEsNyBAQCBzdGF0aWMgdm9pZCBzaV9zZXR1cF9zcGkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJk ZXYsCiB9CiAKIHN0YXRpYyB1MzIgc2lfZ2V0X3JiX2Rpc2FibGVkKHN0cnVjdCByYWRlb25fZGV2 aWNlICpyZGV2LAotCQkJICAgICAgdTMyIG1heF9yYl9udW0sIHUzMiBzZV9udW0sCisJCQkgICAg ICB1MzIgbWF4X3JiX251bV9wZXJfc2UsCiAJCQkgICAgICB1MzIgc2hfcGVyX3NlKQogewogCXUz MiBkYXRhLCBtYXNrOwpAQCAtMjgyNSwxNCArMjgyNSwxNCBAQCBzdGF0aWMgdTMyIHNpX2dldF9y Yl9kaXNhYmxlZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAogCWRhdGEgPj49IEJBQ0tF TkRfRElTQUJMRV9TSElGVDsKIAotCW1hc2sgPSBzaV9jcmVhdGVfYml0bWFzayhtYXhfcmJfbnVt IC8gc2VfbnVtIC8gc2hfcGVyX3NlKTsKKwltYXNrID0gc2lfY3JlYXRlX2JpdG1hc2sobWF4X3Ji X251bV9wZXJfc2UgLyBzaF9wZXJfc2UpOwogCiAJcmV0dXJuIGRhdGEgJiBtYXNrOwogfQogCiBz dGF0aWMgdm9pZCBzaV9zZXR1cF9yYihzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAkJCXUz MiBzZV9udW0sIHUzMiBzaF9wZXJfc2UsCi0JCQl1MzIgbWF4X3JiX251bSkKKwkJCXUzMiBtYXhf cmJfbnVtX3Blcl9zZSkKIHsKIAlpbnQgaSwgajsKIAl1MzIgZGF0YSwgbWFzazsKQEAgLTI4NDIs MTQgKzI4NDIsMTQgQEAgc3RhdGljIHZvaWQgc2lfc2V0dXBfcmIoc3RydWN0IHJhZGVvbl9kZXZp Y2UgKnJkZXYsCiAJZm9yIChpID0gMDsgaSA8IHNlX251bTsgaSsrKSB7CiAJCWZvciAoaiA9IDA7 IGogPCBzaF9wZXJfc2U7IGorKykgewogCQkJc2lfc2VsZWN0X3NlX3NoKHJkZXYsIGksIGopOwot CQkJZGF0YSA9IHNpX2dldF9yYl9kaXNhYmxlZChyZGV2LCBtYXhfcmJfbnVtLCBzZV9udW0sIHNo X3Blcl9zZSk7CisJCQlkYXRhID0gc2lfZ2V0X3JiX2Rpc2FibGVkKHJkZXYsIG1heF9yYl9udW1f cGVyX3NlLCBzaF9wZXJfc2UpOwogCQkJZGlzYWJsZWRfcmJzIHw9IGRhdGEgPDwgKChpICogc2hf cGVyX3NlICsgaikgKiBUQUhJVElfUkJfQklUTUFQX1dJRFRIX1BFUl9TSCk7CiAJCX0KIAl9CiAJ c2lfc2VsZWN0X3NlX3NoKHJkZXYsIDB4ZmZmZmZmZmYsIDB4ZmZmZmZmZmYpOwogCiAJbWFzayA9 IDE7Ci0JZm9yIChpID0gMDsgaSA8IG1heF9yYl9udW07IGkrKykgeworCWZvciAoaSA9IDA7IGkg PCBtYXhfcmJfbnVtX3Blcl9zZSAqIHNlX251bTsgaSsrKSB7CiAJCWlmICghKGRpc2FibGVkX3Ji cyAmIG1hc2spKQogCQkJZW5hYmxlZF9yYnMgfD0gbWFzazsKIAkJbWFzayA8PD0gMTsKLS0gCjEu OC4zLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==