From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3] drm: move i915_kick_out_vgacon to drm_fb_helper Date: Thu, 21 Feb 2019 16:47:33 +0100 Message-ID: <20190221154733.5516-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Maxime Ripard , "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..." , open list , David Airlie , Gerd Hoffmann , Rodrigo Vivi , Sean Paul List-Id: intel-gfx@lists.freedesktop.org QWxzbyByZW5hbWUgaXQgYW5kIGNhbGwgaXQgYXV0b21hdGljYWxseSBmcm9tCmRybV9mYl9oZWxw ZXJfcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZlcnMoKQoKU2lnbmVkLW9mZi1ieTog R2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Ci0tLQogaW5jbHVkZS9kcm0vZHJtX2Zi X2hlbHBlci5oICAgICB8IDE4ICsrKysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJt X2ZiX2hlbHBlci5jIHwgMzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgNDMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgNDYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2ZiX2hlbHBlci5oIGIv aW5jbHVkZS9kcm0vZHJtX2ZiX2hlbHBlci5oCmluZGV4IGJiOWFjZWE2MTM2OS4uYWVmNzY0YzNk ZDdmIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fZmJfaGVscGVyLmgKKysrIGIvaW5jbHVk ZS9kcm0vZHJtX2ZiX2hlbHBlci5oCkBAIC0zNiw2ICszNiw3IEBAIHN0cnVjdCBkcm1fZmJfaGVs cGVyOwogI2luY2x1ZGUgPGRybS9kcm1fY3J0Yy5oPgogI2luY2x1ZGUgPGRybS9kcm1fZGV2aWNl Lmg+CiAjaW5jbHVkZSA8bGludXgva2dkYi5oPgorI2luY2x1ZGUgPGxpbnV4L3ZnYWFyYi5oPgog CiBlbnVtIG1vZGVfc2V0X2F0b21pYyB7CiAJTEVBVkVfQVRPTUlDX01PREVfU0VULApAQCAtNjI1 LDYgKzYyNiw4IEBAIGRybV9mYl9oZWxwZXJfcmVtb3ZlX2NvbmZsaWN0aW5nX2ZyYW1lYnVmZmVy cyhzdHJ1Y3QgYXBlcnR1cmVzX3N0cnVjdCAqYSwKICNlbmRpZgogfQogCitpbnQgZHJtX2ZiX2hl bHBlcl9raWNrX291dF92Z2Fjb24odm9pZCk7CisKIC8qKgogICogZHJtX2ZiX2hlbHBlcl9yZW1v dmVfY29uZmxpY3RpbmdfcGNpX2ZyYW1lYnVmZmVycyAtIHJlbW92ZSBmaXJtd2FyZS1jb25maWd1 cmVkIGZyYW1lYnVmZmVycyBmb3IgUENJIGRldmljZXMKICAqIEBwZGV2OiBQQ0kgZGV2aWNlCkBA IC02NDIsMTEgKzY0NSwyMCBAQCBkcm1fZmJfaGVscGVyX3JlbW92ZV9jb25mbGljdGluZ19wY2lf ZnJhbWVidWZmZXJzKHN0cnVjdCBwY2lfZGV2ICpwZGV2LAogCQkJCQkJICBpbnQgcmVzb3VyY2Vf aWQsCiAJCQkJCQkgIGNvbnN0IGNoYXIgKm5hbWUpCiB7CisJaW50IHJldCA9IDA7CisKKwkvKgor CSAqIFdBUk5JTkc6IEFwcGFyZW50bHkgd2UgbXVzdCBraWNrIGZiZGV2IGRyaXZlcnMgYmVmb3Jl IHZnYWNvbiwKKwkgKiBvdGhlcndpc2UgdGhlIHZnYSBmYmRldiBkcml2ZXIgZmFsbHMgb3Zlci4K KwkgKi8KICNpZiBJU19SRUFDSEFCTEUoQ09ORklHX0ZCKQotCXJldHVybiByZW1vdmVfY29uZmxp Y3RpbmdfcGNpX2ZyYW1lYnVmZmVycyhwZGV2LCByZXNvdXJjZV9pZCwgbmFtZSk7Ci0jZWxzZQot CXJldHVybiAwOworCXJldCA9IHJlbW92ZV9jb25mbGljdGluZ19wY2lfZnJhbWVidWZmZXJzKHBk ZXYsIHJlc291cmNlX2lkLCBuYW1lKTsKICNlbmRpZgorI2lmIElTX1JFQUNIQUJMRShDT05GSUdf RFJNX0ZCREVWX0VNVUxBVElPTikKKwlpZiAocmV0ID09IDAgJiYgdmdhX2RlZmF1bHRfZGV2aWNl KCkgPT0gcGRldikKKwkJcmV0ID0gZHJtX2ZiX2hlbHBlcl9raWNrX291dF92Z2Fjb24oKTsKKyNl bmRpZgorCXJldHVybiByZXQ7CiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2RybV9mYl9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKaW5k ZXggMDRkMjNjYjQzMGJmLi41N2Y0MTBlMmJiYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZmJfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwpA QCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgPGxpbnV4L3N5c3JxLmg+CiAjaW5jbHVkZSA8bGlu dXgvc2xhYi5oPgogI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPgorI2luY2x1ZGUgPGxpbnV4L3Z0 X2tlcm4uaD4KICNpbmNsdWRlIDxkcm0vZHJtUC5oPgogI2luY2x1ZGUgPGRybS9kcm1fY3J0Yy5o PgogI2luY2x1ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+CkBAIC0zMzU1LDMgKzMzNTYsMzcgQEAg aW50IF9faW5pdCBkcm1fZmJfaGVscGVyX21vZGluaXQodm9pZCkKIAlyZXR1cm4gMDsKIH0KIEVY UE9SVF9TWU1CT0woZHJtX2ZiX2hlbHBlcl9tb2Rpbml0KTsKKworI2lmICFkZWZpbmVkKENPTkZJ R19WR0FfQ09OU09MRSkKK2ludCBkcm1fZmJfaGVscGVyX2tpY2tfb3V0X3ZnYWNvbih2b2lkKQor eworICAgICAgICByZXR1cm4gMDsKK30KKyNlbGlmICFkZWZpbmVkKENPTkZJR19EVU1NWV9DT05T T0xFKQoraW50IGRybV9mYl9oZWxwZXJfa2lja19vdXRfdmdhY29uKHZvaWQpCit7CisgICAgICAg IHJldHVybiAtRU5PREVWOworfQorI2Vsc2UKK2ludCBkcm1fZmJfaGVscGVyX2tpY2tfb3V0X3Zn YWNvbih2b2lkKQoreworICAgICAgICBpbnQgcmV0ID0gMDsKKworICAgICAgICBEUk1fSU5GTygi UmVwbGFjaW5nIFZHQSBjb25zb2xlIGRyaXZlclxuIik7CisKKyAgICAgICAgY29uc29sZV9sb2Nr KCk7CisgICAgICAgIGlmIChjb25faXNfYm91bmQoJnZnYV9jb24pKQorICAgICAgICAgICAgICAg IHJldCA9IGRvX3Rha2Vfb3Zlcl9jb25zb2xlKCZkdW1teV9jb24sIDAsIE1BWF9OUl9DT05TT0xF UyAtIDEsIDEpOworICAgICAgICBpZiAocmV0ID09IDApIHsKKyAgICAgICAgICAgICAgICByZXQg PSBkb191bnJlZ2lzdGVyX2Nvbl9kcml2ZXIoJnZnYV9jb24pOworCisgICAgICAgICAgICAgICAg LyogSWdub3JlICJhbHJlYWR5IHVucmVnaXN0ZXJlZCIuICovCisgICAgICAgICAgICAgICAgaWYg KHJldCA9PSAtRU5PREVWKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0ID0gMDsKKyAgICAg ICAgfQorICAgICAgICBjb25zb2xlX3VubG9jaygpOworCisgICAgICAgIHJldHVybiByZXQ7Cit9 CisjZW5kaWYKK0VYUE9SVF9TWU1CT0woZHJtX2ZiX2hlbHBlcl9raWNrX291dF92Z2Fjb24pOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggNjYzMDIxMmYyZmFmLi4wZTg3ZWVmNTQyZGEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNzU3LDM5ICs3NTcsNiBAQCBzdGF0aWMgaW50IGk5 MTVfa2lja19vdXRfZmlybXdhcmVfZmIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCXJldHVybiByZXQ7CiB9CiAKLSNpZiAhZGVmaW5lZChDT05GSUdfVkdBX0NPTlNPTEUpCi1z dGF0aWMgaW50IGk5MTVfa2lja19vdXRfdmdhY29uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKLXsKLQlyZXR1cm4gMDsKLX0KLSNlbGlmICFkZWZpbmVkKENPTkZJR19EVU1NWV9D T05TT0xFKQotc3RhdGljIGludCBpOTE1X2tpY2tfb3V0X3ZnYWNvbihzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JcmV0dXJuIC1FTk9ERVY7Ci19Ci0jZWxzZQotc3RhdGlj IGludCBpOTE1X2tpY2tfb3V0X3ZnYWNvbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCi17Ci0JaW50IHJldCA9IDA7Ci0KLQlEUk1fSU5GTygiUmVwbGFjaW5nIFZHQSBjb25zb2xl IGRyaXZlclxuIik7Ci0KLQljb25zb2xlX2xvY2soKTsKLQlpZiAoY29uX2lzX2JvdW5kKCZ2Z2Ff Y29uKSkKLQkJcmV0ID0gZG9fdGFrZV9vdmVyX2NvbnNvbGUoJmR1bW15X2NvbiwgMCwgTUFYX05S X0NPTlNPTEVTIC0gMSwgMSk7Ci0JaWYgKHJldCA9PSAwKSB7Ci0JCXJldCA9IGRvX3VucmVnaXN0 ZXJfY29uX2RyaXZlcigmdmdhX2Nvbik7Ci0KLQkJLyogSWdub3JlICJhbHJlYWR5IHVucmVnaXN0 ZXJlZCIuICovCi0JCWlmIChyZXQgPT0gLUVOT0RFVikKLQkJCXJldCA9IDA7Ci0JfQotCWNvbnNv bGVfdW5sb2NrKCk7Ci0KLQlyZXR1cm4gcmV0OwotfQotI2VuZGlmCi0KIHN0YXRpYyB2b2lkIGlu dGVsX2luaXRfZHBpbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJLyoK QEAgLTE0MTAsMjIgKzEzNzcsMTIgQEAgc3RhdGljIGludCBpOTE1X2RyaXZlcl9pbml0X2h3KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAocmV0KQogCQlnb3RvIGVycl9w ZXJmOwogCi0JLyoKLQkgKiBXQVJOSU5HOiBBcHBhcmVudGx5IHdlIG11c3Qga2ljayBmYmRldiBk cml2ZXJzIGJlZm9yZSB2Z2Fjb24sCi0JICogb3RoZXJ3aXNlIHRoZSB2Z2EgZmJkZXYgZHJpdmVy IGZhbGxzIG92ZXIuCi0JICovCiAJcmV0ID0gaTkxNV9raWNrX291dF9maXJtd2FyZV9mYihkZXZf cHJpdik7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byByZW1vdmUgY29uZmxp Y3RpbmcgZnJhbWVidWZmZXIgZHJpdmVyc1xuIik7CiAJCWdvdG8gZXJyX2dndHQ7CiAJfQogCi0J cmV0ID0gaTkxNV9raWNrX291dF92Z2Fjb24oZGV2X3ByaXYpOwotCWlmIChyZXQpIHsKLQkJRFJN X0VSUk9SKCJmYWlsZWQgdG8gcmVtb3ZlIGNvbmZsaWN0aW5nIFZHQSBjb25zb2xlXG4iKTsKLQkJ Z290byBlcnJfZ2d0dDsKLQl9Ci0KIAlyZXQgPSBpOTE1X2dndHRfaW5pdF9odyhkZXZfcHJpdik7 CiAJaWYgKHJldCkKIAkJZ290byBlcnJfZ2d0dDsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=