From: Alex Deucher Subject: [PATCH 14/19] drm/amdgpu: disentangle runtime pm and vga_switcheroo Date: Thu, 10 Oct 2019 20:45:31 -0500 Message-ID: <20191011014536.10869-15-alexander.deucher@amd.com> References: <20191011014536.10869-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191011014536.10869-1-alexander.deucher-5C7GfCeVMHo@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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, tiwai-l3A5Bk7waGM@public.gmane.org, lukas-JFq808J9C/izQB+pC5nmwQ@public.gmane.org Cc: Alex Deucher T3JpZ2luYWxseSB3ZSBvbmx5IHN1cHBvcnRlZCBydW50aW1lIHBtIG9uIFBYL0hHIGxhcHRvcHMK c28gdmdhX3N3aXRjaGVyb28gYW5kIHJ1bnRpbWUgcG0gYXJlIHNvcnQgb2YgZW50YW5nbGVkLgoK QXR0ZW1wdCB0byBsb2dpY2FsbHkgc2VwYXJhdGUgdGhlbS4KClNpZ25lZC1vZmYtYnk6IEFsZXgg RGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgfCAyMiArKysrKysrKysrKysrKy0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKaW5kZXggMGY0ZTY1ZDNiZmFmLi5j MGNiNjgxNDU3YmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNl LmMKQEAgLTI2NjIsNyArMjY2Miw3IEBAIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsCiAJCSAgICAgICB1aW50MzJfdCBmbGFncykKIHsKIAlpbnQgciwg aTsKLQlib29sIHJ1bnRpbWUgPSBmYWxzZTsKKwlib29sIGJvY28gPSBmYWxzZTsKIAl1MzIgbWF4 X01CcHM7CiAKIAlhZGV2LT5zaHV0ZG93biA9IGZhbHNlOwpAQCAtMjgzMywxMSArMjgzMywxNCBA QCBpbnQgYW1kZ3B1X2RldmljZV9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXZn YV9jbGllbnRfcmVnaXN0ZXIoYWRldi0+cGRldiwgYWRldiwgTlVMTCwgYW1kZ3B1X2RldmljZV92 Z2Ffc2V0X2RlY29kZSk7CiAKIAlpZiAoYW1kZ3B1X2RldmljZV9zdXBwb3J0c19ib2NvKGRkZXYp KQotCQlydW50aW1lID0gdHJ1ZTsKLQlpZiAoIXBjaV9pc190aHVuZGVyYm9sdF9hdHRhY2hlZChh ZGV2LT5wZGV2KSkKKwkJYm9jbyA9IHRydWU7CisJaWYgKGFtZGdwdV9oYXNfYXRweCgpICYmCisJ ICAgIChhbWRncHVfaXNfYXRweF9oeWJyaWQoKSB8fAorCSAgICAgYW1kZ3B1X2hhc19hdHB4X2Rn cHVfcG93ZXJfY250bCgpKSAmJgorCSAgICAhcGNpX2lzX3RodW5kZXJib2x0X2F0dGFjaGVkKGFk ZXYtPnBkZXYpKQogCQl2Z2Ffc3dpdGNoZXJvb19yZWdpc3Rlcl9jbGllbnQoYWRldi0+cGRldiwK LQkJCQkJICAgICAgICZhbWRncHVfc3dpdGNoZXJvb19vcHMsIHJ1bnRpbWUpOwotCWlmIChydW50 aW1lKQorCQkJCQkgICAgICAgJmFtZGdwdV9zd2l0Y2hlcm9vX29wcywgYm9jbyk7CisJaWYgKGJv Y28pCiAJCXZnYV9zd2l0Y2hlcm9vX2luaXRfZG9tYWluX3BtX29wcyhhZGV2LT5kZXYsICZhZGV2 LT52Z2FfcG1fZG9tYWluKTsKIAogCWlmIChhbWRncHVfZW11X21vZGUgPT0gMSkgewpAQCAtMzAx NCw3ICszMDE3LDcgQEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKIAogZmFpbGVkOgogCWFtZGdwdV92Zl9lcnJvcl90cmFuc19hbGwoYWRldik7Ci0J aWYgKHJ1bnRpbWUpCisJaWYgKGJvY28pCiAJCXZnYV9zd2l0Y2hlcm9vX2ZpbmlfZG9tYWluX3Bt X29wcyhhZGV2LT5kZXYpOwogCiAJcmV0dXJuIHI7CkBAIC0zMDYxLDkgKzMwNjQsMTIgQEAgdm9p ZCBhbWRncHVfZGV2aWNlX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAlrZnJl ZShhZGV2LT5iaW9zKTsKIAlhZGV2LT5iaW9zID0gTlVMTDsKLQlpZiAoIXBjaV9pc190aHVuZGVy Ym9sdF9hdHRhY2hlZChhZGV2LT5wZGV2KSkKKwlpZiAoYW1kZ3B1X2hhc19hdHB4KCkgJiYKKwkg ICAgKGFtZGdwdV9pc19hdHB4X2h5YnJpZCgpIHx8CisJICAgICBhbWRncHVfaGFzX2F0cHhfZGdw dV9wb3dlcl9jbnRsKCkpICYmCisJICAgICFwY2lfaXNfdGh1bmRlcmJvbHRfYXR0YWNoZWQoYWRl di0+cGRldikpCiAJCXZnYV9zd2l0Y2hlcm9vX3VucmVnaXN0ZXJfY2xpZW50KGFkZXYtPnBkZXYp OwotCWlmIChhZGV2LT5mbGFncyAmIEFNRF9JU19QWCkKKwlpZiAoYW1kZ3B1X2RldmljZV9zdXBw b3J0c19ib2NvKGFkZXYtPmRkZXYpKQogCQl2Z2Ffc3dpdGNoZXJvb19maW5pX2RvbWFpbl9wbV9v cHMoYWRldi0+ZGV2KTsKIAl2Z2FfY2xpZW50X3JlZ2lzdGVyKGFkZXYtPnBkZXYsIE5VTEwsIE5V TEwsIE5VTEwpOwogCWlmIChhZGV2LT5yaW9fbWVtKQotLSAKMi4yMC4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAph bWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZng=