From: Ville Syrjala Subject: [PATCH 8/8] drm/i915: Eliminate crtc->state usage from DVO pipe tracking Date: Wed, 13 Sep 2017 17:09:00 +0300 Message-ID: <20170913140900.6972-9-ville.syrjala@linux.intel.com> References: <20170913140900.6972-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F1AC89F9F for ; Wed, 13 Sep 2017 14:09:27 +0000 (UTC) In-Reply-To: <20170913140900.6972-1-ville.syrjala@linux.intel.com> 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNo YW5nZSB0aGUgRFZPIHBpcGUgdHJhY2tpbmcgdG8gbWFpbnRhaW4gYSBiaXRtYXNrIGluIHRoZSB0 b3AgbGV2ZWwKc3RhdGUsIGp1c3QgYXMgd2UgZG8gZm9yIGFjdGl2ZV9jcnRjcy4gVGhpcyBnZXRz IHJpZCBvZiB0aGUgdWdseQppbnRlbF9udW1fZHZvX3BpcGVzKCkgYW5kIGl0cyBjcnRjLT5zdGF0 ZSBhbmQgY3J0Yy0+Y29uZmlnIHVzYWdlLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgMzMgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArKwogMyBmaWxlcyBjaGFuZ2VkLCAyMCBp bnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRl eCBmOGQ3NTk5Y2ZmNDMuLmEzNTI2NDRlYTVhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBA IC0yMzg0LDYgKzIzODQsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJc3RydWN0IG11 dGV4IGRwbGxfbG9jazsKIAogCXU4IGFjdGl2ZV9jcnRjczsKKwl1OCBkdm9fcGlwZXM7IC8qIGJp dG1hc2sgb2YgcGlwZXMgZHJpdmluZyBEVk8gZW5jb2RlcnMgKi8KKwogCS8qIG1pbmltdW0gYWNj ZXB0YWJsZSBjZGNsayBmb3IgZWFjaCBwaXBlICovCiAJaW50IG1pbl9jZGNsa1tJOTE1X01BWF9Q SVBFU107CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjMzNmY2U5ZDk4 MjQuLmNiMzJmMjY0YTVkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt MTU1NSwxOSArMTU1NSw2IEBAIHN0YXRpYyB2b2lkIGNodl9lbmFibGVfcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCX0KIH0KIAotc3RhdGljIGludCBpbnRlbF9udW1fZHZvX3BpcGVzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YzsKLQlpbnQgY291bnQgPSAwOwotCi0JZm9yX2VhY2hfaW50ZWxfY3J0YygmZGV2X3ByaXYt PmRybSwgY3J0YykgewotCQljb3VudCArPSBjcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgJiYKLQkJ CWludGVsX2NydGNfaGFzX3R5cGUoY3J0Yy0+Y29uZmlnLCBJTlRFTF9PVVRQVVRfRFZPKTsKLQl9 Ci0KLQlyZXR1cm4gY291bnQ7Ci19Ci0KIHN0YXRpYyB2b2lkIGk5eHhfZW5hYmxlX3BsbChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKIHsKQEAgLTE1ODMsNyArMTU3MCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhf ZW5hYmxlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJYXNzZXJ0X3BhbmVsX3VubG9j a2VkKGRldl9wcml2LCBjcnRjLT5waXBlKTsKIAogCS8qIEVuYWJsZSBEVk8gMnggY2xvY2sgb24g Ym90aCBQTExzIGlmIG5lY2Vzc2FyeSAqLwotCWlmIChJU19JODMwKGRldl9wcml2KSAmJiBpbnRl bF9udW1fZHZvX3BpcGVzKGRldl9wcml2KSA+IDApIHsKKwlpZiAoSVNfSTgzMChkZXZfcHJpdikg JiYgZGV2X3ByaXYtPmR2b19waXBlcyAhPSAwKSB7CiAJCS8qCiAJCSAqIEl0IGFwcGVhcnMgdG8g YmUgaW1wb3J0YW50IHRoYXQgd2UgZG9uJ3QgZW5hYmxlIHRoaXMKIAkJICogZm9yIHRoZSBjdXJy ZW50IHBpcGUgYmVmb3JlIG90aGVyd2lzZSBjb25maWd1cmluZyB0aGUKQEAgLTE2MzQsOSArMTYy MSw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfZGlzYWJsZV9wbGwoc3RydWN0IGludGVsX2NydGMgKmNy dGMpCiAJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwogCiAJLyogRGlzYWJsZSBEVk8gMngg Y2xvY2sgb24gYm90aCBQTExzIGlmIG5lY2Vzc2FyeSAqLwotCWlmIChJU19JODMwKGRldl9wcml2 KSAmJgotCSAgICBpbnRlbF9jcnRjX2hhc190eXBlKGNydGMtPmNvbmZpZywgSU5URUxfT1VUUFVU X0RWTykgJiYKLQkgICAgIWludGVsX251bV9kdm9fcGlwZXMoZGV2X3ByaXYpKSB7CisJaWYgKElT X0k4MzAoZGV2X3ByaXYpICYmIGRldl9wcml2LT5kdm9fcGlwZXMgPT0gMCkgewogCQlJOTE1X1dS SVRFKERQTEwoUElQRV9CKSwKIAkJCSAgIEk5MTVfUkVBRChEUExMKFBJUEVfQikpICYgfkRQTExf RFZPXzJYX01PREUpOwogCQlJOTE1X1dSSVRFKERQTEwoUElQRV9BKSwKQEAgLTYwMzMsNiArNjAx OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zID0gMDsKIAog CWRldl9wcml2LT5hY3RpdmVfY3J0Y3MgJj0gfkJJVChpbnRlbF9jcnRjLT5waXBlKTsKKwlkZXZf cHJpdi0+ZHZvX3BpcGVzICY9IH5CSVQoaW50ZWxfY3J0Yy0+cGlwZSk7CiAJZGV2X3ByaXYtPm1p bl9jZGNsa1tpbnRlbF9jcnRjLT5waXBlXSA9IDA7CiB9CiAKQEAgLTExOTUxLDYgKzExOTM3LDcg QEAgc3RhdGljIGludCBpbnRlbF9tb2Rlc2V0X2NoZWNrcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiAKIAlpbnRlbF9zdGF0ZS0+bW9kZXNldCA9IHRydWU7CiAJaW50ZWxfc3RhdGUt PmFjdGl2ZV9jcnRjcyA9IGRldl9wcml2LT5hY3RpdmVfY3J0Y3M7CisJaW50ZWxfc3RhdGUtPmR2 b19waXBlcyA9IGRldl9wcml2LT5kdm9fcGlwZXM7CiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2lj YWwgPSBkZXZfcHJpdi0+Y2RjbGsubG9naWNhbDsKIAlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFs ID0gZGV2X3ByaXYtPmNkY2xrLmFjdHVhbDsKIApAQCAtMTE5NjAsNiArMTE5NDcsMTIgQEAgc3Rh dGljIGludCBpbnRlbF9tb2Rlc2V0X2NoZWNrcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUpCiAJCWVsc2UKIAkJCWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MgJj0gfkJJVChjcnRjLT5w aXBlKTsKIAorCQlpZiAobmV3X2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlICYmCisJCSAgICBpbnRl bF9jcnRjX2hhc190eXBlKG5ld19jcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfRFZPKSkKKwkJCWlu dGVsX3N0YXRlLT5kdm9fcGlwZXMgfD0gQklUKGNydGMtPnBpcGUpOworCQllbHNlCisJCQlpbnRl bF9zdGF0ZS0+ZHZvX3BpcGVzICY9IH5CSVQoY3J0Yy0+cGlwZSk7CisKIAkJaWYgKG9sZF9jcnRj X3N0YXRlLT5iYXNlLmFjdGl2ZSAhPSBuZXdfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUpCiAJCQlp bnRlbF9zdGF0ZS0+YWN0aXZlX3BpcGVfY2hhbmdlcyB8PSBCSVQoY3J0Yy0+cGlwZSk7CiAJfQpA QCAtMTI1NjAsNiArMTI1NTMsNyBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJbWVtY3B5KGRldl9wcml2LT5taW5fY2RjbGssIGludGVs X3N0YXRlLT5taW5fY2RjbGssCiAJCSAgICAgICBzaXplb2YoaW50ZWxfc3RhdGUtPm1pbl9jZGNs aykpOwogCQlkZXZfcHJpdi0+YWN0aXZlX2NydGNzID0gaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRj czsKKwkJZGV2X3ByaXYtPmR2b19waXBlcyA9IGludGVsX3N0YXRlLT5kdm9fcGlwZXM7CiAJCWRl dl9wcml2LT5jZGNsay5sb2dpY2FsID0gaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWw7CiAJCWRl dl9wcml2LT5jZGNsay5hY3R1YWwgPSBpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsOwogCX0KQEAg LTE0OTM1LDYgKzE0OTI5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3 X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50IGk7CiAKIAlkZXZfcHJpdi0+YWN0 aXZlX2NydGNzID0gMDsKKwlkZXZfcHJpdi0+ZHZvX3BpcGVzID0gMDsKIAogCWZvcl9lYWNoX2lu dGVsX2NydGMoZGV2LCBjcnRjKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlID0KQEAgLTE0OTkyLDYgKzE0OTg3LDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRf cmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZW5jb2Rlci0+YmFz ZS5jcnRjID0gJmNydGMtPmJhc2U7CiAJCQljcnRjX3N0YXRlLT5vdXRwdXRfdHlwZXMgfD0gMSA8 PCBlbmNvZGVyLT50eXBlOwogCQkJZW5jb2Rlci0+Z2V0X2NvbmZpZyhlbmNvZGVyLCBjcnRjX3N0 YXRlKTsKKworCQkJaWYgKGNydGNfc3RhdGUtPmJhc2UuYWN0aXZlICYmCisJCQkgICAgaW50ZWxf Y3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfRFZPKSkKKwkJCQlkZXZfcHJp di0+ZHZvX3BpcGVzIHw9IEJJVChjcnRjLT5waXBlKTsKIAkJfSBlbHNlIHsKIAkJCWVuY29kZXIt PmJhc2UuY3J0YyA9IE5VTEw7CiAJCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggOTZm NjgzMjU2ZDdlLi4xNWVjNjA3NmU2YTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0z ODQsNiArMzg0LDggQEAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSB7CiAJdTggYWN0aXZlX3Bp cGVfY2hhbmdlczsKIAogCXU4IGFjdGl2ZV9jcnRjczsKKwl1OCBkdm9fcGlwZXM7IC8qIGJpdG1h c2sgb2YgcGlwZXMgZHJpdmluZyBEVk8gZW5jb2RlcnMgKi8KKwogCS8qIG1pbmltdW0gYWNjZXB0 YWJsZSBjZGNsayBmb3IgZWFjaCBwaXBlICovCiAJaW50IG1pbl9jZGNsa1tJOTE1X01BWF9QSVBF U107CiAKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==