From: Maarten Lankhorst Subject: [PATCH i-g-t] lib/igt_kms: Handle changing rotation property correctly Date: Wed, 22 Nov 2017 10:50:57 +0100 Message-ID: <20171122095057.67309-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF8E56E614 for ; Wed, 22 Nov 2017 09:51:02 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlIHJvdGF0aW9uIHByb3BlcnR5IHN1Y2tzIGJlY2F1c2UgaXQgbWF5IGFmZmVjdCB3aGV0aGVy CmRybU1vZGVTZXRQbGFuZSBzdWNjZWVkcyBvciBub3QuIEFkZCBzb21lIGNvZGUgdG8gaGFuZGxl CnRoaXMuCgpGaXJzdCB0cnkgdG8gc2V0IHJvdGF0aW9uIGRpcmVjdGx5LCBpZiB0aGF0IHN1Y2Nl ZWRzIHdlCnJldHVybiBpbW1lZGlhdGVseS4gSWYgaXQgZmFpbHMgd2UgZGlzYWJsZSB0aGUgcGxh bmUsIHNldAp0aGUgcm90YXRpb24gcHJvcGVydHkgYW5kIHJ1biB0aGUgcmVzdCBvZiB0aGUgY29k ZS4KClRoaXMgd2lsbCBob3BlZnVsbHkgbWFrZSBsZWdhY3kgcm90YXRpb24gd29yayBpbiBtb3Jl IGNhc2VzIHdoZW4Kc2NhbGluZyBpcyBub3Qgc3VwcG9ydGVkLgoKU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBs aWIvaWd0X2ttcy5jIHwgNzEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0KIGxpYi9pZ3Rfa21zLmggfCAgMSArCiAyIGZpbGVzIGNoYW5n ZWQsIDY2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2ln dF9rbXMuYyBiL2xpYi9pZ3Rfa21zLmMKaW5kZXggZjE0NGYwZDM5NWZjLi45MmRjZDNjYWQ0YWEg MTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rfa21zLmMKKysrIGIvbGliL2lndF9rbXMuYwpAQCAtMTYwNCwx MSArMTYwNCw4IEBAIHN0YXRpYyB2b2lkIGlndF9wbGFuZV9yZXNldChpZ3RfcGxhbmVfdCAqcGxh bmUpCiAJaWd0X3BsYW5lX3NldF9wcm9wX3ZhbHVlKHBsYW5lLCBJR1RfUExBTkVfQ1JUQ19JRCwg MCk7CiAKIAkvKiBVc2UgZGVmYXVsdCByb3RhdGlvbiAqLwotCWlmIChpZ3RfcGxhbmVfaGFzX3By b3AocGxhbmUsIElHVF9QTEFORV9ST1RBVElPTikpIHsKLQkJcGxhbmUtPnZhbHVlc1tJR1RfUExB TkVfUk9UQVRJT05dID0KLQkJCWlndF9wbGFuZV9nZXRfcHJvcChwbGFuZSwgSUdUX1BMQU5FX1JP VEFUSU9OKTsKLQkJaWd0X3BsYW5lX2NsZWFyX3Byb3BfY2hhbmdlZChwbGFuZSwgSUdUX1BMQU5F X1JPVEFUSU9OKTsKLQl9CisJaWYgKGlndF9wbGFuZV9oYXNfcHJvcChwbGFuZSwgSUdUX1BMQU5F X1JPVEFUSU9OKSkKKwkJaWd0X3BsYW5lX3NldF9wcm9wX3ZhbHVlKHBsYW5lLCBJR1RfUExBTkVf Uk9UQVRJT04sIElHVF9ST1RBVElPTl8wKTsKIAogCWlndF9wbGFuZV9jbGVhcl9wcm9wX2NoYW5n ZWQocGxhbmUsIElHVF9QTEFORV9JTl9GRU5DRV9GRCk7CiAJcGxhbmUtPnZhbHVlc1tJR1RfUExB TkVfSU5fRkVOQ0VfRkRdID0gfjBVTEw7CkBAIC0xNjY2LDYgKzE2NjMsMTIgQEAgdm9pZCBpZ3Rf ZGlzcGxheV9yZXNldChpZ3RfZGlzcGxheV90ICpkaXNwbGF5KQogCWVudW0gcGlwZSBwaXBlOwog CWludCBpOwogCisJLyoKKwkgKiBBbGxvdyByZXNldHRpbmcgcm90YXRpb24gb24gYWxsIHBsYW5l cywgd2hpY2ggaXMgbm9ybWFsbHkKKwkgKiBwcm9oaWJpdGVkIG9uIHRoZSBwcmltYXJ5IGFuZCBj dXJzb3IgcGxhbmUgZm9yIGxlZ2FjeSBjb21taXRzLgorCSAqLworCWRpc3BsYXktPmZpcnN0X2Nv bW1pdCA9IHRydWU7CisKIAlmb3JfZWFjaF9waXBlKGRpc3BsYXksIHBpcGUpIHsKIAkJaWd0X3Bp cGVfdCAqcGlwZV9vYmogPSAmZGlzcGxheS0+cGlwZXNbcGlwZV07CiAJCWlndF9wbGFuZV90ICpw bGFuZTsKQEAgLTIyOTgsNyArMjMwMSw4IEBAIHN0YXRpYyBpbnQgaWd0X3ByaW1hcnlfcGxhbmVf Y29tbWl0X2xlZ2FjeShpZ3RfcGxhbmVfdCAqcHJpbWFyeSwKIAlpZ3RfYXNzZXJ0KChwcmltYXJ5 LT52YWx1ZXNbSUdUX1BMQU5FX0NSVENfWF0gPT0gMCAmJiBwcmltYXJ5LT52YWx1ZXNbSUdUX1BM QU5FX0NSVENfWV0gPT0gMCkpOwogCiAJLyogbm9yIHJvdGF0ZWQgKi8KLQlpZ3RfYXNzZXJ0KCFp Z3RfcGxhbmVfaXNfcHJvcF9jaGFuZ2VkKHByaW1hcnksIElHVF9QTEFORV9ST1RBVElPTikpOwor CWlmICghcGlwZS0+ZGlzcGxheS0+Zmlyc3RfY29tbWl0KQorCQlpZ3RfYXNzZXJ0KCFpZ3RfcGxh bmVfaXNfcHJvcF9jaGFuZ2VkKHByaW1hcnksIElHVF9QTEFORV9ST1RBVElPTikpOwogCiAJaWYg KCFpZ3RfcGxhbmVfaXNfcHJvcF9jaGFuZ2VkKHByaW1hcnksIElHVF9QTEFORV9GQl9JRCkgJiYK IAkgICAgIShwcmltYXJ5LT5jaGFuZ2VkICYgSUdUX1BMQU5FX0NPT1JEX0NIQU5HRURfTUFTSykg JiYKQEAgLTIzNTEsNiArMjM1NSw0OCBAQCBzdGF0aWMgaW50IGlndF9wcmltYXJ5X3BsYW5lX2Nv bW1pdF9sZWdhY3koaWd0X3BsYW5lX3QgKnByaW1hcnksCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRp YyBpbnQgaWd0X3BsYW5lX2ZpeHVwX3JvdGF0aW9uKGlndF9wbGFuZV90ICpwbGFuZSwKKwkJCQkg ICAgaWd0X3BpcGVfdCAqcGlwZSkKK3sKKwlpbnQgcmV0OworCisJaWYgKCFpZ3RfcGxhbmVfaGFz X3Byb3AocGxhbmUsIElHVF9QTEFORV9ST1RBVElPTikpCisJCXJldHVybiAwOworCisJTE9HKHBp cGUtPmRpc3BsYXksICJGaXhpbmcgdXAgaW5pdGlhbCByb3RhdGlvbiBwaXBlICVzLCBwbGFuZSAl ZFxuIiwKKwkgICAga21zdGVzdF9waXBlX25hbWUocGlwZS0+cGlwZSksIHBsYW5lLT5pbmRleCk7 CisKKwkvKiBGaXJzdCB0cnkgdGhlIGVhc3kgY2FzZSwgY2FuIHdlIGNoYW5nZSByb3RhdGlvbiB3 aXRob3V0IHByb2JsZW1zPyAqLworCXJldCA9IGlndF9wbGFuZV9zZXRfcHJvcGVydHkocGxhbmUs IHBsYW5lLT5wcm9wc1tJR1RfUExBTkVfUk9UQVRJT05dLAorCQkJCSAgICAgcGxhbmUtPnZhbHVl c1tJR1RfUExBTkVfUk9UQVRJT05dKTsKKwlpZiAoIXJldCkKKwkJcmV0dXJuIDA7CisKKwkvKiBE aXNhYmxlIHRoZSBwbGFuZSwgd2hpbGUgd2UgdGlua2VyIHdpdGggcm90YXRpb24gKi8KKwlyZXQg PSBkcm1Nb2RlU2V0UGxhbmUocGlwZS0+ZGlzcGxheS0+ZHJtX2ZkLAorCQkJICAgICAgcGxhbmUt PmRybV9wbGFuZS0+cGxhbmVfaWQsCisJCQkgICAgICBwaXBlLT5jcnRjX2lkLCAwLCAvKiBmYl9p ZCAqLworCQkJICAgICAgMCwgLyogZmxhZ3MgKi8KKwkJCSAgICAgIDAsIDAsIDAsIDAsIC8qIGNy dGNfeCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCAqLworCQkJICAgICAgSUdUX0ZJWEVEKDAsMCks IElHVF9GSVhFRCgwLDApLCAvKiBzcmNfeCwgc3JjX3kgKi8KKwkJCSAgICAgIElHVF9GSVhFRCgw LDApLCBJR1RfRklYRUQoMCwwKSk7IC8qIHNyY193LCBzcmNfaCAqLworCisJaWYgKHJldCAmJiBw bGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQorCQlyZXR1cm4gcmV0OworCisJ LyogRm9yIHByaW1hcnkgcGxhbmUsIGZhbGwgYmFjayB0byBkaXNhYmxpbmcgdGhlIGNydGMuICov CisJaWYgKHJldCkgeworCQlyZXQgPSBkcm1Nb2RlU2V0Q3J0YyhwaXBlLT5kaXNwbGF5LT5kcm1f ZmQsCisJCQkJICAgICBwaXBlLT5jcnRjX2lkLCAwLCAwLCAwLCBOVUxMLCAwLCBOVUxMKTsKKwor CQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CisKKwkvKiBhbmQgZmluYWxseSwgc2V0IHJv dGF0aW9uIHByb3BlcnR5LiAqLworCXJldHVybiBpZ3RfcGxhbmVfc2V0X3Byb3BlcnR5KHBsYW5l LCBwbGFuZS0+cHJvcHNbSUdUX1BMQU5FX1JPVEFUSU9OXSwKKwkJCQkgICAgICBwbGFuZS0+dmFs dWVzW0lHVF9QTEFORV9ST1RBVElPTl0pOworfQogCiAvKgogICogQ29tbWl0IHBvc2l0aW9uIGFu ZCBmYiBjaGFuZ2VzIHRvIGEgcGxhbmUuICBUaGUgdmFsdWUgb2YgQHMgd2lsbCBkZXRlcm1pbmUK QEAgLTIzNjEsNiArMjQwNywxNCBAQCBzdGF0aWMgaW50IGlndF9wbGFuZV9jb21taXQoaWd0X3Bs YW5lX3QgKnBsYW5lLAogCQkJICAgIGVudW0gaWd0X2NvbW1pdF9zdHlsZSBzLAogCQkJICAgIGJv b2wgZmFpbF9vbl9lcnJvcikKIHsKKwlpZiAocGlwZS0+ZGlzcGxheS0+Zmlyc3RfY29tbWl0IHx8 IChzID09IENPTU1JVF9VTklWRVJTQUwgJiYKKwkgICAgIGlndF9wbGFuZV9pc19wcm9wX2NoYW5n ZWQocGxhbmUsIElHVF9QTEFORV9ST1RBVElPTikpKSB7CisJCWludCByZXQ7CisKKwkJcmV0ID0g aWd0X3BsYW5lX2ZpeHVwX3JvdGF0aW9uKHBsYW5lLCBwaXBlKTsKKwkJQ0hFQ0tfUkVUVVJOKHJl dCwgZmFpbF9vbl9lcnJvcik7CisJfQorCiAJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9U WVBFX0NVUlNPUiAmJiBzID09IENPTU1JVF9MRUdBQ1kpIHsKIAkJcmV0dXJuIGlndF9jdXJzb3Jf Y29tbWl0X2xlZ2FjeShwbGFuZSwgcGlwZSwgZmFpbF9vbl9lcnJvcik7CiAJfSBlbHNlIGlmIChw bGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZICYmIHMgPT0gQ09NTUlUX0xFR0FD WSkgewpAQCAtMjc4Myw2ICsyODM3LDkgQEAgZGlzcGxheV9jb21taXRfY2hhbmdlZChpZ3RfZGlz cGxheV90ICpkaXNwbGF5LCBlbnVtIGlndF9jb21taXRfc3R5bGUgcykKIAkJCQkgICAgIShwbGFu ZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZIHx8CiAJCQkJICAgICAgcGxhbmUtPnR5 cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSkKIAkJCQkJcGxhbmUtPmNoYW5nZWQgJj0gfkxF R0FDWV9QTEFORV9DT01NSVRfTUFTSzsKKworCQkJCWlmIChkaXNwbGF5LT5maXJzdF9jb21taXQp CisJCQkJCWlndF9wbGFuZV9jbGVhcl9wcm9wX2NoYW5nZWQocGxhbmUsIElHVF9QTEFORV9ST1RB VElPTik7CiAJCQl9CiAJCX0KIAl9CkBAIC0yNzk2LDYgKzI4NTMsOCBAQCBkaXNwbGF5X2NvbW1p dF9jaGFuZ2VkKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gaWd0X2NvbW1pdF9zdHlsZSBz KQogCQkJLyogbm8gbW9kZXNldCBpbiB1bml2ZXJzYWwgY29tbWl0LCBubyBjaGFuZ2UgdG8gY3J0 Yy4gKi8KIAkJCW91dHB1dC0+Y2hhbmdlZCAmPSAxIDw8IElHVF9DT05ORUNUT1JfQ1JUQ19JRDsK IAl9CisKKwlkaXNwbGF5LT5maXJzdF9jb21taXQgPSBmYWxzZTsKIH0KIAogLyoKZGlmZiAtLWdp dCBhL2xpYi9pZ3Rfa21zLmggYi9saWIvaWd0X2ttcy5oCmluZGV4IGUxODgzYmYxYjhhMy4uMmE0 ODBiZjM5OTU2IDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5oCisrKyBiL2xpYi9pZ3Rfa21zLmgK QEAgLTM0OSw2ICszNDksNyBAQCBzdHJ1Y3QgaWd0X2Rpc3BsYXkgewogCWlndF9waXBlX3QgKnBp cGVzOwogCWJvb2wgaGFzX2N1cnNvcl9wbGFuZTsKIAlib29sIGlzX2F0b21pYzsKKwlib29sIGZp cnN0X2NvbW1pdDsKIH07CiAKIHZvaWQgaWd0X2Rpc3BsYXlfaW5pdChpZ3RfZGlzcGxheV90ICpk aXNwbGF5LCBpbnQgZHJtX2ZkKTsKLS0gCjIuMTUuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==