From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F7C96E08C for ; Tue, 24 Mar 2020 20:28:16 +0000 (UTC) From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Tue, 24 Mar 2020 13:29:30 -0700 Message-Id: <20200324202930.30231-7-jose.souza@intel.com> In-Reply-To: <20200324202930.30231-1-jose.souza@intel.com> References: <20200324202930.30231-1-jose.souza@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v6 7/7] DO_NOT_MERGE: Revert "tests/kms_fbcon_fbt: Handle FBC enabled on fbcon in GEN9+" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: UmV2ZXJ0aW5nIHRoaXMgb25lIGFzIHRoZSBrZXJuZWwgcGF0Y2hlcyBkaWQgbm90IGxhbmRlZCB5 ZXQgc28gaXQgd291bGQKY2F1c2UgQ0kgdG8gZmFpbC4KClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJv YmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgotLS0KIHRlc3RzL2ttc19mYmNv bl9mYnQuYyB8IDQyICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3Rlc3RzL2ttc19mYmNvbl9mYnQuYyBiL3Rlc3RzL2ttc19mYmNvbl9mYnQuYwppbmRl eCAwODFkNTdmNi4uYjgwMDBhMjQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19mYmNvbl9mYnQuYwor KysgYi90ZXN0cy9rbXNfZmJjb25fZmJ0LmMKQEAgLTQyLDcgKzQyLDYgQEAgc3RydWN0IGRybV9p bmZvIHsKIAlpbnQgZGVidWdmc19mZDsKIAlkcm1Nb2RlUmVzUHRyIHJlczsKIAlkcm1Nb2RlQ29u bmVjdG9yUHRyIGNvbm5lY3RvcnNbTUFYX0NPTk5FQ1RPUlNdOwotCWludCBkZXZpZDsKIH07CiAK IHN0YXRpYyB2b2lkIHdhaXRfdXNlcihjb25zdCBjaGFyICptc2cpCkBAIC02OCw4ICs2Nyw2IEBA IHN0YXRpYyB2b2lkIHNldHVwX2RybShzdHJ1Y3QgZHJtX2luZm8gKmRybSkKIAkJZHJtLT5jb25u ZWN0b3JzW2ldID0gZHJtTW9kZUdldENvbm5lY3RvckN1cnJlbnQoZHJtLT5mZCwKIAkJCQkJCWRy bS0+cmVzLT5jb25uZWN0b3JzW2ldKTsKIAotCWRybS0+ZGV2aWQgPSBpbnRlbF9nZXRfZHJtX2Rl dmlkKGRybS0+ZmQpOwotCiAJa21zdGVzdF9zZXRfdnRfZ3JhcGhpY3NfbW9kZSgpOwogfQogCkBA IC0xNDIsMzAgKzEzOSwxOSBAQCBzdGF0aWMgYm9vbCBmYmNfd2FpdF91bnRpbF9kaXNhYmxlZChp bnQgZGVidWdmc19mZCkKIAlyZXR1cm4gcjsKIH0KIAotc3RhdGljIGJvb2wgZmJjX25vdF9jb21w cmVzc2luZ19lbmFibGVkKGludCBkZWJ1Z2ZzX2ZkKQotewotCWNoYXIgYnVmWzEyOF07Ci0KLQlp Z3RfZGVidWdmc19zaW1wbGVfcmVhZChkZWJ1Z2ZzX2ZkLCAiaTkxNV9mYmNfc3RhdHVzIiwgYnVm LAotCQkJCXNpemVvZihidWYpKTsKLQlyZXR1cm4gc3Ryc3RyKGJ1ZiwgIkZCQyBlbmFibGVkXG5D b21wcmVzc2luZzogbm8iKTsKLX0KLQotc3RhdGljIGJvb2wgZmJjX3dhaXRfdW50aWxfdXBkYXRl KHN0cnVjdCBkcm1faW5mbyAqZHJtKQorc3RhdGljIGJvb2wgZmJjX3dhaXRfdW50aWxfdXBkYXRl KGludCBkZWJ1Z2ZzKQogewogCS8qCi0JICogQXMgbm93IGtlcm5lbCBlbmFibGVzIEZCQyBvbiBs aW5lYXIgc3VyZmFjZXMgb24gR0VOOSssIGNoZWNrIGlmIHRoZQotCSAqIGZiY29uIGN1cnNvciBi bGlua2luZyBpcyBjYXVzaW5nIHRoZSBGQkMgdG8gdW5jb21wcmVzcyB0aGUKLQkgKiBmcmFtZWJ1 ZmZlci4KKwkgKiBGQkMgaXMgbm90IGV4cGVjdGVkIHRvIGJlIGVuYWJsZWQgYmVjYXVzZSBmYmNv biBkbyBub3QgdXNlcyBhIHRpbGVkCisJICogZnJhbWVidWZmZXIgc28gYSBmZW5jZSBjYW4gbm90 IGJlIHNldHVwIG9uIHRoZSBmcmFtZWJ1ZmZlciBhbmQgRkJDCisJICogY29kZSByZXF1aXJlcyBh IGZlbmNlIHRvIGFjY3VyYXRlIHRyYWNrIGZyb250YnVmZmVyIG1vZGlmaWNhdGlvbnMKKwkgKiAo d2hhdCBtYXliZSBpcyBub3QgbmVjZXNzYXJ5IGFueW1vcmUgYXMgd2Ugbm93IGhhdmUKKwkgKiBp bnRlbF9mYmNfaW52YWxpZGF0ZSgpL2ZsdXNoKCkpLgogCSAqCi0JICogRm9yIG9sZGVyIEdFTnMg RkJDIGlzIHN0aWxsIGV4cGVjdGVkIHRvIGJlIGRpc2FibGVkIGFzIGl0IHN0aWxsCi0JICogcmVs aWVzIG9uIGEgdGlsZWQgYW5kIGZlbmNlYWJsZSBmcmFtZWJ1ZmZlciB0byB0cmFjayBtb2RpZmlj YXRpb25zLgorCSAqIElmIG9uZSBkYXkgZmJjb24gc3RhcnRzIHRvIHVzZSBhIHRpbGVkIGZyYW1l YnVmZmVyIHdlIHdvdWxkIG5lZWQgdG8KKwkgKiBjaGVjayB0aGUgJ0NvbXByZXNzaW5nJyBzdGF0 dXMgYXMgaW4gZWFjaCBibGluayBpdCB3b3VsZCBiZSBkaXNhYmxlZC4KIAkgKi8KLQlpZiAoQVRf TEVBU1RfR0VOKGRybS0+ZGV2aWQsIDkpKQotCQlyZXR1cm4gaWd0X3dhaXQoZmJjX25vdF9jb21w cmVzc2luZ19lbmFibGVkKGRybS0+ZGVidWdmc19mZCksCi0JCQkJMjAwMCwgMSk7Ci0JZWxzZQot CQlyZXR1cm4gZmJjX3dhaXRfdW50aWxfZGlzYWJsZWQoZHJtLT5kZWJ1Z2ZzX2ZkKTsKKwlyZXR1 cm4gZmJjX3dhaXRfdW50aWxfZGlzYWJsZWQoZGVidWdmcyk7CiB9CiAKIHR5cGVkZWYgYm9vbCAo KmNvbm5lY3Rvcl9wb3NzaWJsZV9mbikoZHJtTW9kZUNvbm5lY3RvclB0ciBjb25uZWN0b3IpOwpA QCAtMjM0LDkgKzIyMCw5IEBAIHN0YXRpYyBib29sIHBzcl9zdXBwb3J0ZWRfb25fY2hpcHNldChp bnQgZGVidWdmc19mZCkKIAlyZXR1cm4gcHNyX3Npbmtfc3VwcG9ydChkZWJ1Z2ZzX2ZkLCBQU1Jf TU9ERV8xKTsKIH0KIAotc3RhdGljIGJvb2wgcHNyX3dhaXRfdW50aWxfdXBkYXRlKHN0cnVjdCBk cm1faW5mbyAqZHJtKQorc3RhdGljIGJvb2wgcHNyX3dhaXRfdW50aWxfdXBkYXRlKGludCBkZWJ1 Z2ZzX2ZkKQogewotCXJldHVybiBwc3JfbG9uZ193YWl0X3VwZGF0ZShkcm0tPmRlYnVnZnNfZmQs IFBTUl9NT0RFXzEpOworCXJldHVybiBwc3JfbG9uZ193YWl0X3VwZGF0ZShkZWJ1Z2ZzX2ZkLCBQ U1JfTU9ERV8xKTsKIH0KIAogc3RhdGljIHZvaWQgZGlzYWJsZV9mZWF0dXJlcyhpbnQgZGVidWdm c19mZCkKQEAgLTI1OSw3ICsyNDUsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgcHNyX2RlYnVnZnNf ZW5hYmxlKGludCBkZWJ1Z2ZzX2ZkKQogc3RydWN0IGZlYXR1cmUgewogCWJvb2wgKCpzdXBwb3J0 ZWRfb25fY2hpcHNldCkoaW50IGRlYnVnZnNfZmQpOwogCWJvb2wgKCp3YWl0X3VudGlsX2VuYWJs ZWQpKGludCBkZWJ1Z2ZzX2ZkKTsKLQlib29sICgqd2FpdF91bnRpbF91cGRhdGUpKHN0cnVjdCBk cm1faW5mbyAqZHJtKTsKKwlib29sICgqd2FpdF91bnRpbF91cGRhdGUpKGludCBkZWJ1Z2ZzX2Zk KTsKIAlib29sICgqY29ubmVjdG9yX3Bvc3NpYmxlX2ZuKShkcm1Nb2RlQ29ubmVjdG9yUHRyIGNv bm5lY3Rvcik7CiAJdm9pZCAoKmVuYWJsZSkoaW50IGRlYnVnZnNfZmQpOwogfSBmYmMgPSB7CkBA IC0zMDksMTMgKzI5NSwxMyBAQCBzdGF0aWMgdm9pZCBzdWJ0ZXN0KHN0cnVjdCBkcm1faW5mbyAq ZHJtLCBzdHJ1Y3QgZmVhdHVyZSAqZmVhdHVyZSwgYm9vbCBzdXNwZW5kKQogCXNsZWVwKDMpOwog CiAJd2FpdF91c2VyKCJCYWNrIHRvIGZiY29uLiIpOwotCWlndF9hc3NlcnQoZmVhdHVyZS0+d2Fp dF91bnRpbF91cGRhdGUoZHJtKSk7CisJaWd0X2Fzc2VydChmZWF0dXJlLT53YWl0X3VudGlsX3Vw ZGF0ZShkcm0tPmRlYnVnZnNfZmQpKTsKIAogCWlmIChzdXNwZW5kKSB7CiAJCWlndF9zeXN0ZW1f c3VzcGVuZF9hdXRvcmVzdW1lKFNVU1BFTkRfU1RBVEVfTUVNLAogCQkJCQkgICAgICBTVVNQRU5E X1RFU1RfTk9ORSk7CiAJCXNsZWVwKDUpOwotCQlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50 aWxfdXBkYXRlKGRybSkpOworCQlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfdXBkYXRl KGRybS0+ZGVidWdmc19mZCkpOwogCX0KIH0KIAotLSAKMi4yNi4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3Qt ZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK