From: Alex Deucher Subject: [PATCH 1/2] drm/radeon: move vga_switcheroo registration Date: Wed, 10 May 2017 10:55:46 -0400 Message-ID: <1494428147-18140-1-git-send-email-alexander.deucher@amd.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: Alex Deucher TW92ZSB0aGUgcmVnaXN0cmF0aW9uIGxhdGVyIHRvIGF2b2lkIGEgcG9zc2libGUgcmFjZQpiZXR3 ZWVuIGRyaXZlciBpbml0aWFsaXphdGlvbiBhbmQgYSB2Z2Ffc3dpdGNoZXJvbwpyZXF1ZXN0LgoK YnVnOiBodHRwczovL2J1Z3ppbGxhLnJlZGhhdC5jb20vc2hvd19idWcuY2dpP2lkPTE0MTEwMzQK ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oICAgICAgICB8ICAyICsrCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYyB8IDM4ICsrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jICAg IHwgIDUgKysrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCBiL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggN2U5ZDNiOS4uOGNkNDc5OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0yNDc3LDYgKzI0NzcsOCBAQCBzdHJ1Y3QgcmFkZW9u X2RldmljZSB7CiB9OwogCiBib29sIHJhZGVvbl9pc19weChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKK3ZvaWQgcmFkZW9uX2RldmljZV9zd2l0Y2hlcm9vX2luaXQoc3RydWN0IHJhZGVvbl9kZXZp Y2UgKnJkZXYpOwordm9pZCByYWRlb25fZGV2aWNlX3N3aXRjaGVyb29fZmluaShzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldik7CiBpbnQgcmFkZW9uX2RldmljZV9pbml0KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAogCQkgICAgICAgc3RydWN0IGRybV9kZXZpY2UgKmRkZXYsCiAJCSAgICAg ICBzdHJ1Y3QgcGNpX2RldiAqcGRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uX2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNl LmMKaW5kZXggMzRlMTM4Yi4uMGMzZGU0ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f ZGV2aWNlLmMKQEAgLTEyOTgsNiArMTI5OCwyNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHZnYV9z d2l0Y2hlcm9vX2NsaWVudF9vcHMgcmFkZW9uX3N3aXRjaGVyb29fb3BzID0gewogCS5jYW5fc3dp dGNoID0gcmFkZW9uX3N3aXRjaGVyb29fY2FuX3N3aXRjaCwKIH07CiAKK3ZvaWQgcmFkZW9uX2Rl dmljZV9zd2l0Y2hlcm9vX2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCit7CisJYm9v bCBydW50aW1lID0gZmFsc2U7CisKKwlpZiAocmRldi0+ZmxhZ3MgJiBSQURFT05fSVNfUFgpIHsK KwkJcmFkZW9uX2RldmljZV9oYW5kbGVfcHhfcXVpcmtzKHJkZXYpOworCQlydW50aW1lID0gdHJ1 ZTsKKwl9CisJdmdhX3N3aXRjaGVyb29fcmVnaXN0ZXJfY2xpZW50KHJkZXYtPnBkZXYsICZyYWRl b25fc3dpdGNoZXJvb19vcHMsIHJ1bnRpbWUpOworCWlmIChydW50aW1lKQorCQl2Z2Ffc3dpdGNo ZXJvb19pbml0X2RvbWFpbl9wbV9vcHMocmRldi0+ZGV2LCAmcmRldi0+dmdhX3BtX2RvbWFpbik7 Cit9CisKK3ZvaWQgcmFkZW9uX2RldmljZV9zd2l0Y2hlcm9vX2Zpbmkoc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYpCit7CisJdmdhX3N3aXRjaGVyb29fdW5yZWdpc3Rlcl9jbGllbnQocmRldi0+ cGRldik7CisJaWYgKHJkZXYtPmZsYWdzICYgUkFERU9OX0lTX1BYKQorCQl2Z2Ffc3dpdGNoZXJv b19maW5pX2RvbWFpbl9wbV9vcHMocmRldi0+ZGV2KTsKK30KKwogLyoqCiAgKiByYWRlb25fZGV2 aWNlX2luaXQgLSBpbml0aWFsaXplIHRoZSBkcml2ZXIKICAqCkBAIC0xMzE3LDcgKzEzMzcsNiBA QCBpbnQgcmFkZW9uX2RldmljZV9pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogewog CWludCByLCBpOwogCWludCBkbWFfYml0czsKLQlib29sIHJ1bnRpbWUgPSBmYWxzZTsKIAogCXJk ZXYtPnNodXRkb3duID0gZmFsc2U7CiAJcmRldi0+ZGV2ID0gJnBkZXYtPmRldjsKQEAgLTE0NTgs MjAgKzE0NzcsMTEgQEAgaW50IHJhZGVvbl9kZXZpY2VfaW5pdChzdHJ1Y3QgcmFkZW9uX2Rldmlj ZSAqcmRldiwKIAlpZiAocmRldi0+cmlvX21lbSA9PSBOVUxMKQogCQlEUk1fRVJST1IoIlVuYWJs ZSB0byBmaW5kIFBDSSBJL08gQkFSXG4iKTsKIAotCWlmIChyZGV2LT5mbGFncyAmIFJBREVPTl9J U19QWCkKLQkJcmFkZW9uX2RldmljZV9oYW5kbGVfcHhfcXVpcmtzKHJkZXYpOwotCiAJLyogaWYg d2UgaGF2ZSA+IDEgVkdBIGNhcmRzLCB0aGVuIGRpc2FibGUgdGhlIHJhZGVvbiBWR0EgcmVzb3Vy Y2VzICovCiAJLyogdGhpcyB3aWxsIGZhaWwgZm9yIGNhcmRzIHRoYXQgYXJlbid0IFZHQSBjbGFz cyBkZXZpY2VzLCBqdXN0CiAJICogaWdub3JlIGl0ICovCiAJdmdhX2NsaWVudF9yZWdpc3Rlcihy ZGV2LT5wZGV2LCByZGV2LCBOVUxMLCByYWRlb25fdmdhX3NldF9kZWNvZGUpOwogCi0JaWYgKHJk ZXYtPmZsYWdzICYgUkFERU9OX0lTX1BYKQotCQlydW50aW1lID0gdHJ1ZTsKLQl2Z2Ffc3dpdGNo ZXJvb19yZWdpc3Rlcl9jbGllbnQocmRldi0+cGRldiwgJnJhZGVvbl9zd2l0Y2hlcm9vX29wcywg cnVudGltZSk7Ci0JaWYgKHJ1bnRpbWUpCi0JCXZnYV9zd2l0Y2hlcm9vX2luaXRfZG9tYWluX3Bt X29wcyhyZGV2LT5kZXYsICZyZGV2LT52Z2FfcG1fZG9tYWluKTsKLQogCXIgPSByYWRlb25faW5p dChyZGV2KTsKIAlpZiAocikKIAkJZ290byBmYWlsZWQ7CkBAIC0xNTM4LDExICsxNTQ4LDYgQEAg aW50IHJhZGVvbl9kZXZpY2VfaW5pdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAlyZXR1 cm4gMDsKIAogZmFpbGVkOgotCS8qIGJhbGFuY2UgcG1fcnVudGltZV9nZXRfc3luYygpIGluIHJh ZGVvbl9kcml2ZXJfdW5sb2FkX2ttcygpICovCi0JaWYgKHJhZGVvbl9pc19weChkZGV2KSkKLQkJ cG1fcnVudGltZV9wdXRfbm9pZGxlKGRkZXYtPmRldik7Ci0JaWYgKHJ1bnRpbWUpCi0JCXZnYV9z d2l0Y2hlcm9vX2ZpbmlfZG9tYWluX3BtX29wcyhyZGV2LT5kZXYpOwogCXJldHVybiByOwogfQog CkBAIC0xNTYzLDkgKzE1NjgsNiBAQCB2b2lkIHJhZGVvbl9kZXZpY2VfZmluaShzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldikKIAkvKiBldmljdCB2cmFtIG1lbW9yeSAqLwogCXJhZGVvbl9ib19l dmljdF92cmFtKHJkZXYpOwogCXJhZGVvbl9maW5pKHJkZXYpOwotCXZnYV9zd2l0Y2hlcm9vX3Vu cmVnaXN0ZXJfY2xpZW50KHJkZXYtPnBkZXYpOwotCWlmIChyZGV2LT5mbGFncyAmIFJBREVPTl9J U19QWCkKLQkJdmdhX3N3aXRjaGVyb29fZmluaV9kb21haW5fcG1fb3BzKHJkZXYtPmRldik7CiAJ dmdhX2NsaWVudF9yZWdpc3RlcihyZGV2LT5wZGV2LCBOVUxMLCBOVUxMLCBOVUxMKTsKIAlpZiAo cmRldi0+cmlvX21lbSkKIAkJcGNpX2lvdW5tYXAocmRldi0+cGRldiwgcmRldi0+cmlvX21lbSk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYyBiL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jCmluZGV4IDQzODhkZGUuLjE0MGEwNjAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jCkBAIC03MSw5ICs3MSwxMCBAQCBpbnQgcmFk ZW9uX2RyaXZlcl91bmxvYWRfa21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmFkZW9uX2tm ZF9kZXZpY2VfZmluaShyZGV2KTsKIAogCXJhZGVvbl9hY3BpX2ZpbmkocmRldik7Ci0JCisKIAly YWRlb25fbW9kZXNldF9maW5pKHJkZXYpOwogCXJhZGVvbl9kZXZpY2VfZmluaShyZGV2KTsKKwly YWRlb25fZGV2aWNlX3N3aXRjaGVyb29fZmluaShyZGV2KTsKIAogZG9uZV9mcmVlOgogCWtmcmVl KHJkZXYpOwpAQCAtMTQ5LDYgKzE1MCw4IEBAIGludCByYWRlb25fZHJpdmVyX2xvYWRfa21zKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJCQkJIkVycm9yIGR1 cmluZyBBQ1BJIG1ldGhvZHMgY2FsbFxuIik7CiAJfQogCisJcmFkZW9uX2RldmljZV9zd2l0Y2hl cm9vX2luaXQocmRldik7CisKIAlyYWRlb25fa2ZkX2RldmljZV9wcm9iZShyZGV2KTsKIAlyYWRl b25fa2ZkX2RldmljZV9pbml0KHJkZXYpOwogCi0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==