From: Hans de Goede Subject: [PATCH] drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed Date: Sat, 7 Sep 2019 22:32:38 +0200 Message-ID: <20190907203238.232005-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Zhou Cc: David Airlie , Hans de Goede , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org QmFpbCBmcm9tIHRoZSBwY2lfZHJpdmVyIHByb2JlIGZ1bmN0aW9uIGluc3RlYWQgb2YgZnJvbSB0 aGUgZHJtX2RyaXZlcgpsb2FkIGZ1bmN0aW9uLgoKVGhpcyBhdm9pZCAvZGV2L2RyaS9jYXJkMCB0 ZW1wb3JhcmlseSBnZXR0aW5nIHJlZ2lzdGVyZWQgYW5kIHRoZW4KdW5yZWdpc3RlcmVkIGFnYWlu LCBzZW5kaW5nIHVud2FudGVkIGFkZCAvIHJlbW92ZSB1ZGV2IGV2ZW50cyB0bwp1c2Vyc3BhY2Uu CgpTcGVjaWZpY2FsbHkgdGhpcyBhdm9pZHMgdHJpZ2dlcmluZyB0aGUgKHVzZXJzcGFjZSkgYnVn IGZpeGVkIGJ5IHRoaXMKcGx5bW91dGggbWVyZ2UtcmVxdWVzdDoKaHR0cHM6Ly9naXRsYWIuZnJl ZWRlc2t0b3Aub3JnL3BseW1vdXRoL3BseW1vdXRoL21lcmdlX3JlcXVlc3RzLzU5CgpOb3RlIHRo YXQgZGVzcGl0ZSB0aGF0IGJlaW5nIGFuIHVzZXJzcGFjZSBidWcsIG5vdCBzZW5kaW5nIHVubmVj ZXNzYXJ5CnVkZXYgZXZlbnRzIGlzIGEgZ29vZCBpZGVhIGluIGdlbmVyYWwuCgpCdWdMaW5rOiBo dHRwczovL2J1Z3ppbGxhLnJlZGhhdC5jb20vc2hvd19idWcuY2dpP2lkPTE0OTA0OTAKU2lnbmVk LW9mZi1ieTogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kcnYuYyB8IDMxICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYyB8IDI1IC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDI1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Ry di5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHJ2LmMKaW5kZXggYTZjYmUxMWY3 OWM2Li43MDMzZjNhMzhjODcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFk ZW9uX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Rydi5jCkBAIC0z MjUsOCArMzI1LDM5IEBAIGJvb2wgcmFkZW9uX2RldmljZV9pc192aXJ0dWFsKHZvaWQpOwogc3Rh dGljIGludCByYWRlb25fcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpwZGV2LAogCQkJICAgIGNv bnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiB7CisJdW5zaWduZWQgbG9uZyBmbGFncyA9 IDA7CiAJaW50IHJldDsKIAorCWlmICghZW50KQorCQlyZXR1cm4gLUVOT0RFVjsgLyogQXZvaWQg TlVMTC1wdHIgZGVyZWYgaW4gZHJtX2dldF9wY2lfZGV2ICovCisKKwlmbGFncyA9IGVudC0+ZHJp dmVyX2RhdGE7CisKKwlpZiAoIXJhZGVvbl9zaV9zdXBwb3J0KSB7CisJCXN3aXRjaCAoZmxhZ3Mg JiBSQURFT05fRkFNSUxZX01BU0spIHsKKwkJY2FzZSBDSElQX1RBSElUSToKKwkJY2FzZSBDSElQ X1BJVENBSVJOOgorCQljYXNlIENISVBfVkVSREU6CisJCWNhc2UgQ0hJUF9PTEFORDoKKwkJY2Fz ZSBDSElQX0hBSU5BTjoKKwkJCWRldl9pbmZvKCZwZGV2LT5kZXYsCisJCQkJICJTSSBzdXBwb3J0 IGRpc2FibGVkIGJ5IG1vZHVsZSBwYXJhbVxuIik7CisJCQlyZXR1cm4gLUVOT0RFVjsKKwkJfQor CX0KKwlpZiAoIXJhZGVvbl9jaWtfc3VwcG9ydCkgeworCQlzd2l0Y2ggKGZsYWdzICYgUkFERU9O X0ZBTUlMWV9NQVNLKSB7CisJCWNhc2UgQ0hJUF9LQVZFUkk6CisJCWNhc2UgQ0hJUF9CT05BSVJF OgorCQljYXNlIENISVBfSEFXQUlJOgorCQljYXNlIENISVBfS0FCSU5JOgorCQljYXNlIENISVBf TVVMTElOUzoKKwkJCWRldl9pbmZvKCZwZGV2LT5kZXYsCisJCQkJICJDSUsgc3VwcG9ydCBkaXNh YmxlZCBieSBtb2R1bGUgcGFyYW1cbiIpOworCQkJcmV0dXJuIC1FTk9ERVY7CisJCX0KKwl9CisK IAlpZiAodmdhX3N3aXRjaGVyb29fY2xpZW50X3Byb2JlX2RlZmVyKHBkZXYpKQogCQlyZXR1cm4g LUVQUk9CRV9ERUZFUjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRl b25fa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYwppbmRleCAwN2Y3 YWNlNDJjNGIuLmU4NWM1NTRlZWFhOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa21zLmMK QEAgLTEwMCwzMSArMTAwLDYgQEAgaW50IHJhZGVvbl9kcml2ZXJfbG9hZF9rbXMoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAlzdHJ1Y3QgcmFkZW9uX2Rldmlj ZSAqcmRldjsKIAlpbnQgciwgYWNwaV9zdGF0dXM7CiAKLQlpZiAoIXJhZGVvbl9zaV9zdXBwb3J0 KSB7Ci0JCXN3aXRjaCAoZmxhZ3MgJiBSQURFT05fRkFNSUxZX01BU0spIHsKLQkJY2FzZSBDSElQ X1RBSElUSToKLQkJY2FzZSBDSElQX1BJVENBSVJOOgotCQljYXNlIENISVBfVkVSREU6Ci0JCWNh c2UgQ0hJUF9PTEFORDoKLQkJY2FzZSBDSElQX0hBSU5BTjoKLQkJCWRldl9pbmZvKGRldi0+ZGV2 LAotCQkJCSAiU0kgc3VwcG9ydCBkaXNhYmxlZCBieSBtb2R1bGUgcGFyYW1cbiIpOwotCQkJcmV0 dXJuIC1FTk9ERVY7Ci0JCX0KLQl9Ci0JaWYgKCFyYWRlb25fY2lrX3N1cHBvcnQpIHsKLQkJc3dp dGNoIChmbGFncyAmIFJBREVPTl9GQU1JTFlfTUFTSykgewotCQljYXNlIENISVBfS0FWRVJJOgot CQljYXNlIENISVBfQk9OQUlSRToKLQkJY2FzZSBDSElQX0hBV0FJSToKLQkJY2FzZSBDSElQX0tB QklOSToKLQkJY2FzZSBDSElQX01VTExJTlM6Ci0JCQlkZXZfaW5mbyhkZXYtPmRldiwKLQkJCQkg IkNJSyBzdXBwb3J0IGRpc2FibGVkIGJ5IG1vZHVsZSBwYXJhbVxuIik7Ci0JCQlyZXR1cm4gLUVO T0RFVjsKLQkJfQotCX0KLQogCXJkZXYgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgcmFkZW9uX2Rl dmljZSksIEdGUF9LRVJORUwpOwogCWlmIChyZGV2ID09IE5VTEwpIHsKIAkJcmV0dXJuIC1FTk9N RU07Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbA==