From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 41/43] drm/radeon: Bail earlier when radeon.cik_/si_support=0 is passed Date: Tue, 1 Oct 2019 12:43:09 -0400 Message-ID: <20191001164311.15993-41-sashal@kernel.org> References: <20191001164311.15993-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191001164311.15993-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Hans de Goede , =?UTF-8?q?Michel=20D=C3=A4nzer?= , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher RnJvbTogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KClsgVXBzdHJlYW0gY29t bWl0IDlkYmM4OGQwMTNiNzljNjJiZDg0NWNiOWU3YzAyNTZlNjYwOTY3YzUgXQoKQmFpbCBmcm9t IHRoZSBwY2lfZHJpdmVyIHByb2JlIGZ1bmN0aW9uIGluc3RlYWQgb2YgZnJvbSB0aGUgZHJtX2Ry aXZlcgpsb2FkIGZ1bmN0aW9uLgoKVGhpcyBhdm9pZCAvZGV2L2RyaS9jYXJkMCB0ZW1wb3Jhcmls eSBnZXR0aW5nIHJlZ2lzdGVyZWQgYW5kIHRoZW4KdW5yZWdpc3RlcmVkIGFnYWluLCBzZW5kaW5n IHVud2FudGVkIGFkZCAvIHJlbW92ZSB1ZGV2IGV2ZW50cyB0bwp1c2Vyc3BhY2UuCgpTcGVjaWZp Y2FsbHkgdGhpcyBhdm9pZHMgdHJpZ2dlcmluZyB0aGUgKHVzZXJzcGFjZSkgYnVnIGZpeGVkIGJ5 IHRoaXMKcGx5bW91dGggbWVyZ2UtcmVxdWVzdDoKaHR0cHM6Ly9naXRsYWIuZnJlZWRlc2t0b3Au b3JnL3BseW1vdXRoL3BseW1vdXRoL21lcmdlX3JlcXVlc3RzLzU5CgpOb3RlIHRoYXQgZGVzcGl0 ZSB0aGF0IGJlaW5nIGFuIHVzZXJzcGFjZSBidWcsIG5vdCBzZW5kaW5nIHVubmVjZXNzYXJ5CnVk ZXYgZXZlbnRzIGlzIGEgZ29vZCBpZGVhIGluIGdlbmVyYWwuCgpCdWdMaW5rOiBodHRwczovL2J1 Z3ppbGxhLnJlZGhhdC5jb20vc2hvd19idWcuY2dpP2lkPTE0OTA0OTAKUmV2aWV3ZWQtYnk6IE1p Y2hlbCBEw6RuemVyIDxtZGFlbnplckByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBIYW5zIGRl IEdvZWRlIDxoZGVnb2VkZUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIg PGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxz YXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kcnYu YyB8IDMxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL3JhZGVvbl9rbXMuYyB8IDI1IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZHJ2LmMKaW5kZXggMmE3OTc3YTIzYjMxYy4uYzI2ZjA5YjQ3ZWNiMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHJ2LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yYWRlb25fZHJ2LmMKQEAgLTM0MCw4ICszNDAsMzkgQEAgc3RhdGljIGlu dCByYWRlb25fa2lja19vdXRfZmlybXdhcmVfZmIoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiBzdGF0 aWMgaW50IHJhZGVvbl9wY2lfcHJvYmUoc3RydWN0IHBjaV9kZXYgKnBkZXYsCiAJCQkgICAgY29u c3Qgc3RydWN0IHBjaV9kZXZpY2VfaWQgKmVudCkKIHsKKwl1bnNpZ25lZCBsb25nIGZsYWdzID0g MDsKIAlpbnQgcmV0OwogCisJaWYgKCFlbnQpCisJCXJldHVybiAtRU5PREVWOyAvKiBBdm9pZCBO VUxMLXB0ciBkZXJlZiBpbiBkcm1fZ2V0X3BjaV9kZXYgKi8KKworCWZsYWdzID0gZW50LT5kcml2 ZXJfZGF0YTsKKworCWlmICghcmFkZW9uX3NpX3N1cHBvcnQpIHsKKwkJc3dpdGNoIChmbGFncyAm IFJBREVPTl9GQU1JTFlfTUFTSykgeworCQljYXNlIENISVBfVEFISVRJOgorCQljYXNlIENISVBf UElUQ0FJUk46CisJCWNhc2UgQ0hJUF9WRVJERToKKwkJY2FzZSBDSElQX09MQU5EOgorCQljYXNl IENISVBfSEFJTkFOOgorCQkJZGV2X2luZm8oJnBkZXYtPmRldiwKKwkJCQkgIlNJIHN1cHBvcnQg ZGlzYWJsZWQgYnkgbW9kdWxlIHBhcmFtXG4iKTsKKwkJCXJldHVybiAtRU5PREVWOworCQl9CisJ fQorCWlmICghcmFkZW9uX2Npa19zdXBwb3J0KSB7CisJCXN3aXRjaCAoZmxhZ3MgJiBSQURFT05f RkFNSUxZX01BU0spIHsKKwkJY2FzZSBDSElQX0tBVkVSSToKKwkJY2FzZSBDSElQX0JPTkFJUkU6 CisJCWNhc2UgQ0hJUF9IQVdBSUk6CisJCWNhc2UgQ0hJUF9LQUJJTkk6CisJCWNhc2UgQ0hJUF9N VUxMSU5TOgorCQkJZGV2X2luZm8oJnBkZXYtPmRldiwKKwkJCQkgIkNJSyBzdXBwb3J0IGRpc2Fi bGVkIGJ5IG1vZHVsZSBwYXJhbVxuIik7CisJCQlyZXR1cm4gLUVOT0RFVjsKKwkJfQorCX0KKwog CWlmICh2Z2Ffc3dpdGNoZXJvb19jbGllbnRfcHJvYmVfZGVmZXIocGRldikpCiAJCXJldHVybiAt RVBST0JFX0RFRkVSOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVv bl9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jCmluZGV4IDZhOGZi NmZkMTgzYzMuLjNmZjgzNTc2N2FjNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uX2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5j CkBAIC05NSwzMSArOTUsNiBAQCBpbnQgcmFkZW9uX2RyaXZlcl9sb2FkX2ttcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCXN0cnVjdCByYWRlb25fZGV2aWNl ICpyZGV2OwogCWludCByLCBhY3BpX3N0YXR1czsKIAotCWlmICghcmFkZW9uX3NpX3N1cHBvcnQp IHsKLQkJc3dpdGNoIChmbGFncyAmIFJBREVPTl9GQU1JTFlfTUFTSykgewotCQljYXNlIENISVBf VEFISVRJOgotCQljYXNlIENISVBfUElUQ0FJUk46Ci0JCWNhc2UgQ0hJUF9WRVJERToKLQkJY2Fz ZSBDSElQX09MQU5EOgotCQljYXNlIENISVBfSEFJTkFOOgotCQkJZGV2X2luZm8oZGV2LT5kZXYs Ci0JCQkJICJTSSBzdXBwb3J0IGRpc2FibGVkIGJ5IG1vZHVsZSBwYXJhbVxuIik7Ci0JCQlyZXR1 cm4gLUVOT0RFVjsKLQkJfQotCX0KLQlpZiAoIXJhZGVvbl9jaWtfc3VwcG9ydCkgewotCQlzd2l0 Y2ggKGZsYWdzICYgUkFERU9OX0ZBTUlMWV9NQVNLKSB7Ci0JCWNhc2UgQ0hJUF9LQVZFUkk6Ci0J CWNhc2UgQ0hJUF9CT05BSVJFOgotCQljYXNlIENISVBfSEFXQUlJOgotCQljYXNlIENISVBfS0FC SU5JOgotCQljYXNlIENISVBfTVVMTElOUzoKLQkJCWRldl9pbmZvKGRldi0+ZGV2LAotCQkJCSAi Q0lLIHN1cHBvcnQgZGlzYWJsZWQgYnkgbW9kdWxlIHBhcmFtXG4iKTsKLQkJCXJldHVybiAtRU5P REVWOwotCQl9Ci0JfQotCiAJcmRldiA9IGt6YWxsb2Moc2l6ZW9mKHN0cnVjdCByYWRlb25fZGV2 aWNlKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHJkZXYgPT0gTlVMTCkgewogCQlyZXR1cm4gLUVOT01F TTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4