From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= Subject: [PATCH] drm/amdgpu: Remove checking for atombios Date: Wed, 14 Dec 2016 21:52:45 +0100 Message-ID: <20161214205245.2639-1-nils.wallmenius@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= VGhpcyBpcyBhIGxlZnQgb3ZlciBmcm9tIHJhZGVvbiwgYW1kZ3B1IGRvZXNuJ3Qgc3VwcG9ydCBh bnkKbm9uLWF0b21iaW9zIHBhcnRzIGFuZCBhbWRncHVfZGV2aWNlX2luaXQgd291bGQgYmFpbCBp ZiB0aGUKY2hlY2sgZm9yIGF0b21iaW9zIGZhaWxlZCBhbnl3YXkuCgpTaWduZWQtb2ZmLWJ5OiBO aWxzIFdhbGxtw6luaXVzIDxuaWxzLndhbGxtZW5pdXNAZ21haWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYWNwaS5jICAgICAgIHwgMTAgKysrKy0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Jpb3MuYyAgICAgICB8IDEyICsrKysrKy0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jICAgICB8ICA4 ICstLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5jICAg IHwgMTAgKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2kyYy5j ICAgICAgICB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYXRvbWJpb3NfZW5j b2RlcnMuYyB8ICA2IC0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAz NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IDI5ZDNh OTEuLjExZGU3MTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC0xMzMwLDcg KzEzMzAsNiBAQCBzdHJ1Y3QgYW1kZ3B1X2RldmljZSB7CiAKIAkvKiBCSU9TICovCiAJdWludDhf dAkJCQkqYmlvczsKLQlib29sCQkJCWlzX2F0b21fYmlvczsKIAlzdHJ1Y3QgYW1kZ3B1X2JvCQkq c3RvbGxlbl92Z2FfbWVtb3J5OwogCXVpbnQzMl90CQkJYmlvc19zY3JhdGNoW0FNREdQVV9CSU9T X05VTV9TQ1JBVENIXTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2FjcGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hY3BpLmMK aW5kZXggNTc5NjUzOS4uZWY3OTU1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2FjcGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfYWNwaS5jCkBAIC02NzIsMTIgKzY3MiwxMCBAQCBpbnQgYW1kZ3B1X2FjcGlfaW5pdChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCQkJaWYgKChlbmMtPmRldmljZXMgJiAoQVRPTV9E RVZJQ0VfTENEX1NVUFBPUlQpKSAmJgogCQkJICAgIGVuYy0+ZW5jX3ByaXYpIHsKLQkJCQlpZiAo YWRldi0+aXNfYXRvbV9iaW9zKSB7Ci0JCQkJCXN0cnVjdCBhbWRncHVfZW5jb2Rlcl9hdG9tX2Rp ZyAqZGlnID0gZW5jLT5lbmNfcHJpdjsKLQkJCQkJaWYgKGRpZy0+YmxfZGV2KSB7Ci0JCQkJCQlh dGlmLT5lbmNvZGVyX2Zvcl9ibCA9IGVuYzsKLQkJCQkJCWJyZWFrOwotCQkJCQl9CisJCQkJc3Ry dWN0IGFtZGdwdV9lbmNvZGVyX2F0b21fZGlnICpkaWcgPSBlbmMtPmVuY19wcml2OworCQkJCWlm IChkaWctPmJsX2RldikgeworCQkJCQlhdGlmLT5lbmNvZGVyX2Zvcl9ibCA9IGVuYzsKKwkJCQkJ YnJlYWs7CiAJCQkJfQogCQkJfQogCQl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2Jpb3MuYwppbmRleCBiN2UyNzYyLi4xMTAzMjU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfYmlvcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9iaW9zLmMKQEAgLTM4NywxNSArMzg3LDE1IEBAIGJvb2wgYW1kZ3B1X2dldF9i aW9zKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWlmICghYmlvc19oZWFkZXJfc3RhcnQp IHsKIAkJZ290byBmcmVlX2Jpb3M7CiAJfQorCisJLyogTXVzdCBiZSBhbiBBVE9NQklPUyAqLwog CXRtcCA9IGJpb3NfaGVhZGVyX3N0YXJ0ICsgNDsKLQlpZiAoIW1lbWNtcChhZGV2LT5iaW9zICsg dG1wLCAiQVRPTSIsIDQpIHx8Ci0JICAgICFtZW1jbXAoYWRldi0+YmlvcyArIHRtcCwgIk1PVEEi LCA0KSkgewotCQlhZGV2LT5pc19hdG9tX2Jpb3MgPSB0cnVlOwotCX0gZWxzZSB7Ci0JCWFkZXYt PmlzX2F0b21fYmlvcyA9IGZhbHNlOworCWlmIChtZW1jbXAoYWRldi0+YmlvcyArIHRtcCwgIkFU T00iLCA0KSAmJgorCSAgICBtZW1jbXAoYWRldi0+YmlvcyArIHRtcCwgIk1PVEEiLCA0KSkgewor CQlnb3RvIGZyZWVfYmlvczsKIAl9CiAKLQlEUk1fREVCVUcoIiVzQklPUyBkZXRlY3RlZFxuIiwg YWRldi0+aXNfYXRvbV9iaW9zID8gIkFUT00iIDogIkNPTSIpOworCURSTV9ERUJVRygiQVRPTUJJ T1MgZGV0ZWN0ZWRcbiIpOwogCXJldHVybiB0cnVlOwogZnJlZV9iaW9zOgogCWtmcmVlKGFkZXYt PmJpb3MpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rl dmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4 IGQ5MDc0MTEuLmRjMDE3ZDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf ZGV2aWNlLmMKQEAgLTE2MDMsNyArMTYwMyw2IEBAIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJYWRldi0+cGRldiA9IHBkZXY7CiAJYWRldi0+Zmxh Z3MgPSBmbGFnczsKIAlhZGV2LT5hc2ljX3R5cGUgPSBmbGFncyAmIEFNRF9BU0lDX01BU0s7Ci0J YWRldi0+aXNfYXRvbV9iaW9zID0gZmFsc2U7CiAJYWRldi0+dXNlY190aW1lb3V0ID0gQU1ER1BV X01BWF9VU0VDX1RJTUVPVVQ7CiAJYWRldi0+bWMuZ3R0X3NpemUgPSA1MTIgKiAxMDI0ICogMTAy NDsKIAlhZGV2LT5hY2NlbF93b3JraW5nID0gZmFsc2U7CkBAIC0xNzE4LDEyICsxNzE3LDcgQEAg aW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJciA9 IC1FSU5WQUw7CiAJCWdvdG8gZmFpbGVkOwogCX0KLQkvKiBNdXN0IGJlIGFuIEFUT01CSU9TICov Ci0JaWYgKCFhZGV2LT5pc19hdG9tX2Jpb3MpIHsKLQkJZGV2X2VycihhZGV2LT5kZXYsICJFeHBl Y3RpbmcgYXRvbWJpb3MgZm9yIEdQVVxuIik7Ci0JCXIgPSAtRUlOVkFMOwotCQlnb3RvIGZhaWxl ZDsKLQl9CisKIAlyID0gYW1kZ3B1X2F0b21iaW9zX2luaXQoYWRldik7CiAJaWYgKHIpIHsKIAkJ ZGV2X2VycihhZGV2LT5kZXYsICJhbWRncHVfYXRvbWJpb3NfaW5pdCBmYWlsZWRcbiIpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kaXNwbGF5LmMKaW5kZXggNzQxMTQ0Zi4u ZDIzNTEyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5j CkBAIC01ODIsMTIgKzU4MiwxMCBAQCBpbnQgYW1kZ3B1X21vZGVzZXRfY3JlYXRlX3Byb3BzKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCBzejsKIAotCWlmIChhZGV2LT5pc19h dG9tX2Jpb3MpIHsKLQkJYWRldi0+bW9kZV9pbmZvLmNvaGVyZW50X21vZGVfcHJvcGVydHkgPQot CQkJZHJtX3Byb3BlcnR5X2NyZWF0ZV9yYW5nZShhZGV2LT5kZGV2LCAwICwgImNvaGVyZW50Iiwg MCwgMSk7Ci0JCWlmICghYWRldi0+bW9kZV9pbmZvLmNvaGVyZW50X21vZGVfcHJvcGVydHkpCi0J CQlyZXR1cm4gLUVOT01FTTsKLQl9CisJYWRldi0+bW9kZV9pbmZvLmNvaGVyZW50X21vZGVfcHJv cGVydHkgPQorCQlkcm1fcHJvcGVydHlfY3JlYXRlX3JhbmdlKGFkZXYtPmRkZXYsIDAgLCAiY29o ZXJlbnQiLCAwLCAxKTsKKwlpZiAoIWFkZXYtPm1vZGVfaW5mby5jb2hlcmVudF9tb2RlX3Byb3Bl cnR5KQorCQlyZXR1cm4gLUVOT01FTTsKIAogCWFkZXYtPm1vZGVfaW5mby5sb2FkX2RldGVjdF9w cm9wZXJ0eSA9CiAJCWRybV9wcm9wZXJ0eV9jcmVhdGVfcmFuZ2UoYWRldi0+ZGRldiwgMCwgImxv YWQgZGV0ZWN0aW9uIiwgMCwgMSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfaTJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaTJj LmMKaW5kZXggOTFkMzY3My4uZjI3Mzk5OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X2kyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9pMmMuYwpAQCAtMjMxLDggKzIzMSw3IEBAIHZvaWQgYW1kZ3B1X2kyY19pbml0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQogCWlmIChhbWRncHVfaHdfaTJjKQogCQlEUk1fSU5GTygi aHdfaTJjIGZvcmNlZCBvbiwgeW91IG1heSBleHBlcmllbmNlIGRpc3BsYXkgZGV0ZWN0aW9uIHBy b2JsZW1zIVxuIik7CiAKLQlpZiAoYWRldi0+aXNfYXRvbV9iaW9zKQotCQlhbWRncHVfYXRvbWJp b3NfaTJjX2luaXQoYWRldik7CisJYW1kZ3B1X2F0b21iaW9zX2kyY19pbml0KGFkZXYpOwogfQog CiAvKiByZW1vdmUgYWxsIHRoZSBidXNlcyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYXRvbWJpb3NfZW5jb2RlcnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2F0b21iaW9zX2VuY29kZXJzLmMKaW5kZXggYzMyZWNhMi4uMmFmMjZkMiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYXRvbWJpb3NfZW5jb2RlcnMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hdG9tYmlvc19lbmNvZGVycy5jCkBAIC0xODEsOSAr MTgxLDYgQEAgdm9pZCBhbWRncHVfYXRvbWJpb3NfZW5jb2Rlcl9pbml0X2JhY2tsaWdodChzdHJ1 Y3QgYW1kZ3B1X2VuY29kZXIgKmFtZGdwdV9lbmNvZGUKIAlpZiAoIWFtZGdwdV9lbmNvZGVyLT5l bmNfcHJpdikKIAkJcmV0dXJuOwogCi0JaWYgKCFhZGV2LT5pc19hdG9tX2Jpb3MpCi0JCXJldHVy bjsKLQogCWlmICghKGFkZXYtPm1vZGVfaW5mby5maXJtd2FyZV9mbGFncyAmIEFUT01fQklPU19J TkZPX0JMX0NPTlRST0xMRURfQllfR1BVKSkKIAkJcmV0dXJuOwogCkBAIC0yMzYsOSArMjMzLDYg QEAgYW1kZ3B1X2F0b21iaW9zX2VuY29kZXJfZmluaV9iYWNrbGlnaHQoc3RydWN0IGFtZGdwdV9l bmNvZGVyICphbWRncHVfZW5jb2RlcikKIAlpZiAoIWFtZGdwdV9lbmNvZGVyLT5lbmNfcHJpdikK IAkJcmV0dXJuOwogCi0JaWYgKCFhZGV2LT5pc19hdG9tX2Jpb3MpCi0JCXJldHVybjsKLQogCWlm ICghKGFkZXYtPm1vZGVfaW5mby5maXJtd2FyZV9mbGFncyAmIEFUT01fQklPU19JTkZPX0JMX0NP TlRST0xMRURfQllfR1BVKSkKIAkJcmV0dXJuOwogCi0tIAoyLjEwLjIKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=