From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v4 1/2] drm: move i915_kick_out_vgacon to vgaarb Date: Fri, 22 Feb 2019 08:16:03 +0100 Message-ID: <20190222071604.26024-2-kraxel@redhat.com> References: <20190222071604.26024-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190222071604.26024-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: David Airlie , "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , Maxime Ripard , Gerd Hoffmann List-Id: intel-gfx@lists.freedesktop.org QWxzbyByZW5hbWUgaXQgYW5kIGNhbGwgaXQgYXV0b21hdGljYWxseSBmcm9tCmRybV9mYl9oZWxw ZXJfcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZlcnMoKQoKU2lnbmVkLW9mZi1ieTog R2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Ci0tLQogaW5jbHVkZS9kcm0vZHJtX2Zi X2hlbHBlci5oICAgICB8IDE0ICsrKysrKysrKysrLS0tCiBpbmNsdWRlL2xpbnV4L3ZnYWFyYi5o ICAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCA0MyAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvdmdh L3ZnYWFyYi5jICAgICAgICB8IDM4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KwogNCBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCA0NiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fZmJfaGVscGVyLmggYi9pbmNsdWRlL2RybS9kcm1f ZmJfaGVscGVyLmgKaW5kZXggYmI5YWNlYTYxMzY5Li4yODZkNThlZmVkNWQgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fZmJfaGVs cGVyLmgKQEAgLTM2LDYgKzM2LDcgQEAgc3RydWN0IGRybV9mYl9oZWxwZXI7CiAjaW5jbHVkZSA8 ZHJtL2RybV9jcnRjLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9kZXZpY2UuaD4KICNpbmNsdWRlIDxs aW51eC9rZ2RiLmg+CisjaW5jbHVkZSA8bGludXgvdmdhYXJiLmg+CiAKIGVudW0gbW9kZV9zZXRf YXRvbWljIHsKIAlMRUFWRV9BVE9NSUNfTU9ERV9TRVQsCkBAIC02NDIsMTEgKzY0MywxOCBAQCBk cm1fZmJfaGVscGVyX3JlbW92ZV9jb25mbGljdGluZ19wY2lfZnJhbWVidWZmZXJzKHN0cnVjdCBw Y2lfZGV2ICpwZGV2LAogCQkJCQkJICBpbnQgcmVzb3VyY2VfaWQsCiAJCQkJCQkgIGNvbnN0IGNo YXIgKm5hbWUpCiB7CisJaW50IHJldCA9IDA7CisKKwkvKgorCSAqIFdBUk5JTkc6IEFwcGFyZW50 bHkgd2UgbXVzdCBraWNrIGZiZGV2IGRyaXZlcnMgYmVmb3JlIHZnYWNvbiwKKwkgKiBvdGhlcndp c2UgdGhlIHZnYSBmYmRldiBkcml2ZXIgZmFsbHMgb3Zlci4KKwkgKi8KICNpZiBJU19SRUFDSEFC TEUoQ09ORklHX0ZCKQotCXJldHVybiByZW1vdmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVmZmVy cyhwZGV2LCByZXNvdXJjZV9pZCwgbmFtZSk7Ci0jZWxzZQotCXJldHVybiAwOworCXJldCA9IHJl bW92ZV9jb25mbGljdGluZ19wY2lfZnJhbWVidWZmZXJzKHBkZXYsIHJlc291cmNlX2lkLCBuYW1l KTsKICNlbmRpZgorCWlmIChyZXQgPT0gMCkKKwkJcmV0ID0gdmdhX3JlbW92ZV92Z2Fjb24ocGRl dik7CisJcmV0dXJuIHJldDsKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4 L3ZnYWFyYi5oIGIvaW5jbHVkZS9saW51eC92Z2FhcmIuaAppbmRleCBlZTE2MmUzZTg3OWIuLjU1 M2IzNGM4YjVmNyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC92Z2FhcmIuaAorKysgYi9pbmNs dWRlL2xpbnV4L3ZnYWFyYi5oCkBAIC0xMjUsOSArMTI1LDExIEBAIGV4dGVybiB2b2lkIHZnYV9w dXQoc3RydWN0IHBjaV9kZXYgKnBkZXYsIHVuc2lnbmVkIGludCByc3JjKTsKICNpZmRlZiBDT05G SUdfVkdBX0FSQgogZXh0ZXJuIHN0cnVjdCBwY2lfZGV2ICp2Z2FfZGVmYXVsdF9kZXZpY2Uodm9p ZCk7CiBleHRlcm4gdm9pZCB2Z2Ffc2V0X2RlZmF1bHRfZGV2aWNlKHN0cnVjdCBwY2lfZGV2ICpw ZGV2KTsKK2V4dGVybiBpbnQgdmdhX3JlbW92ZV92Z2Fjb24oc3RydWN0IHBjaV9kZXYgKnBkZXYp OwogI2Vsc2UKIHN0YXRpYyBpbmxpbmUgc3RydWN0IHBjaV9kZXYgKnZnYV9kZWZhdWx0X2Rldmlj ZSh2b2lkKSB7IHJldHVybiBOVUxMOyB9Owogc3RhdGljIGlubGluZSB2b2lkIHZnYV9zZXRfZGVm YXVsdF9kZXZpY2Uoc3RydWN0IHBjaV9kZXYgKnBkZXYpIHsgfTsKK3N0YXRpYyBpbmxpbmUgaW50 IHZnYV9yZW1vdmVfdmdhY29uKHN0cnVjdCBwY2lfZGV2ICpwZGV2KSB7IHJldHVybiAwOyB9Owog I2VuZGlmCiAKIC8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA2NjMwMjEyZjJmYWYuLjBl ODdlZWY1NDJkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC03NTcsMzkgKzc1Nyw2IEBA IHN0YXRpYyBpbnQgaTkxNV9raWNrX291dF9maXJtd2FyZV9mYihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIHJldDsKIH0KIAotI2lmICFkZWZpbmVkKENPTkZJR19W R0FfQ09OU09MRSkKLXN0YXRpYyBpbnQgaTkxNV9raWNrX291dF92Z2Fjb24oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCXJldHVybiAwOwotfQotI2VsaWYgIWRlZmluZWQo Q09ORklHX0RVTU1ZX0NPTlNPTEUpCi1zdGF0aWMgaW50IGk5MTVfa2lja19vdXRfdmdhY29uKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlyZXR1cm4gLUVOT0RFVjsKLX0K LSNlbHNlCi1zdGF0aWMgaW50IGk5MTVfa2lja19vdXRfdmdhY29uKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKLXsKLQlpbnQgcmV0ID0gMDsKLQotCURSTV9JTkZPKCJSZXBsYWNp bmcgVkdBIGNvbnNvbGUgZHJpdmVyXG4iKTsKLQotCWNvbnNvbGVfbG9jaygpOwotCWlmIChjb25f aXNfYm91bmQoJnZnYV9jb24pKQotCQlyZXQgPSBkb190YWtlX292ZXJfY29uc29sZSgmZHVtbXlf Y29uLCAwLCBNQVhfTlJfQ09OU09MRVMgLSAxLCAxKTsKLQlpZiAocmV0ID09IDApIHsKLQkJcmV0 ID0gZG9fdW5yZWdpc3Rlcl9jb25fZHJpdmVyKCZ2Z2FfY29uKTsKLQotCQkvKiBJZ25vcmUgImFs cmVhZHkgdW5yZWdpc3RlcmVkIi4gKi8KLQkJaWYgKHJldCA9PSAtRU5PREVWKQotCQkJcmV0ID0g MDsKLQl9Ci0JY29uc29sZV91bmxvY2soKTsKLQotCXJldHVybiByZXQ7Ci19Ci0jZW5kaWYKLQog c3RhdGljIHZvaWQgaW50ZWxfaW5pdF9kcGlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKIAkvKgpAQCAtMTQxMCwyMiArMTM3NywxMiBAQCBzdGF0aWMgaW50IGk5MTVfZHJp dmVyX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChyZXQp CiAJCWdvdG8gZXJyX3BlcmY7CiAKLQkvKgotCSAqIFdBUk5JTkc6IEFwcGFyZW50bHkgd2UgbXVz dCBraWNrIGZiZGV2IGRyaXZlcnMgYmVmb3JlIHZnYWNvbiwKLQkgKiBvdGhlcndpc2UgdGhlIHZn YSBmYmRldiBkcml2ZXIgZmFsbHMgb3Zlci4KLQkgKi8KIAlyZXQgPSBpOTE1X2tpY2tfb3V0X2Zp cm13YXJlX2ZiKGRldl9wcml2KTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRv IHJlbW92ZSBjb25mbGljdGluZyBmcmFtZWJ1ZmZlciBkcml2ZXJzXG4iKTsKIAkJZ290byBlcnJf Z2d0dDsKIAl9CiAKLQlyZXQgPSBpOTE1X2tpY2tfb3V0X3ZnYWNvbihkZXZfcHJpdik7Ci0JaWYg KHJldCkgewotCQlEUk1fRVJST1IoImZhaWxlZCB0byByZW1vdmUgY29uZmxpY3RpbmcgVkdBIGNv bnNvbGVcbiIpOwotCQlnb3RvIGVycl9nZ3R0OwotCX0KLQogCXJldCA9IGk5MTVfZ2d0dF9pbml0 X2h3KGRldl9wcml2KTsKIAlpZiAocmV0KQogCQlnb3RvIGVycl9nZ3R0OwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvdmdhL3ZnYWFyYi5jIGIvZHJpdmVycy9ncHUvdmdhL3ZnYWFyYi5jCmluZGV4 IGRjOGUwMzliZmFiNS4uNTI0MDkyYTQzZGU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS92Z2Ev dmdhYXJiLmMKKysrIGIvZHJpdmVycy9ncHUvdmdhL3ZnYWFyYi5jCkBAIC00OCw2ICs0OCw4IEBA CiAjaW5jbHVkZSA8bGludXgvbWlzY2RldmljZS5oPgogI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4K ICNpbmNsdWRlIDxsaW51eC9zY3JlZW5faW5mby5oPgorI2luY2x1ZGUgPGxpbnV4L3Z0Lmg+Cisj aW5jbHVkZSA8bGludXgvY29uc29sZS5oPgogCiAjaW5jbHVkZSA8bGludXgvdWFjY2Vzcy5oPgog CkBAIC0xNjgsNiArMTcwLDQyIEBAIHZvaWQgdmdhX3NldF9kZWZhdWx0X2RldmljZShzdHJ1Y3Qg cGNpX2RldiAqcGRldikKIAl2Z2FfZGVmYXVsdCA9IHBjaV9kZXZfZ2V0KHBkZXYpOwogfQogCisj aWYgIWRlZmluZWQoQ09ORklHX1ZHQV9DT05TT0xFKQoraW50IHZnYV9yZW1vdmVfdmdhY29uKHN0 cnVjdCBwY2lfZGV2ICpwZGV2KQoreworICAgICAgICByZXR1cm4gMDsKK30KKyNlbGlmICFkZWZp bmVkKENPTkZJR19EVU1NWV9DT05TT0xFKQoraW50IHZnYV9yZW1vdmVfdmdhY29uKHN0cnVjdCBw Y2lfZGV2ICpwZGV2KQoreworICAgICAgICByZXR1cm4gLUVOT0RFVjsKK30KKyNlbHNlCitpbnQg dmdhX3JlbW92ZV92Z2Fjb24oc3RydWN0IHBjaV9kZXYgKnBkZXYpCit7CisgICAgICAgIGludCBy ZXQgPSAwOworCisJaWYgKHBkZXYgIT0gdmdhX2RlZmF1bHQpCisJCXJldHVybiAwOworCXZnYWFy Yl9pbmZvKCZwZGV2LT5kZXYsICJkZWFjdGl2YXRlIHZnYSBjb25zb2xlXG4iKTsKKworICAgICAg ICBjb25zb2xlX2xvY2soKTsKKyAgICAgICAgaWYgKGNvbl9pc19ib3VuZCgmdmdhX2NvbikpCisg ICAgICAgICAgICAgICAgcmV0ID0gZG9fdGFrZV9vdmVyX2NvbnNvbGUoJmR1bW15X2NvbiwgMCwg TUFYX05SX0NPTlNPTEVTIC0gMSwgMSk7CisgICAgICAgIGlmIChyZXQgPT0gMCkgeworICAgICAg ICAgICAgICAgIHJldCA9IGRvX3VucmVnaXN0ZXJfY29uX2RyaXZlcigmdmdhX2Nvbik7CisKKyAg ICAgICAgICAgICAgICAvKiBJZ25vcmUgImFscmVhZHkgdW5yZWdpc3RlcmVkIi4gKi8KKyAgICAg ICAgICAgICAgICBpZiAocmV0ID09IC1FTk9ERVYpCisgICAgICAgICAgICAgICAgICAgICAgICBy ZXQgPSAwOworICAgICAgICB9CisgICAgICAgIGNvbnNvbGVfdW5sb2NrKCk7CisKKyAgICAgICAg cmV0dXJuIHJldDsKK30KKyNlbmRpZgorRVhQT1JUX1NZTUJPTCh2Z2FfcmVtb3ZlX3ZnYWNvbik7 CisKIHN0YXRpYyBpbmxpbmUgdm9pZCB2Z2FfaXJxX3NldF9zdGF0ZShzdHJ1Y3QgdmdhX2Rldmlj ZSAqdmdhZGV2LCBib29sIHN0YXRlKQogewogCWlmICh2Z2FkZXYtPmlycV9zZXRfc3RhdGUpCi0t IAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4