From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 06/11] drm/i915: Convert intel_hdmi to use atomic state Date: Tue, 8 Nov 2016 13:55:37 +0100 Message-ID: <1478609742-13603-7-git-send-email-maarten.lankhorst@linux.intel.com> References: <1478609742-13603-1-git-send-email-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 23C696E507 for ; Tue, 8 Nov 2016 12:55:52 +0000 (UTC) In-Reply-To: <1478609742-13603-1-git-send-email-maarten.lankhorst@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 VGhpcyBpcyB0aGUgbGFzdCBjb25uZWN0b3Igc3RpbGwgbG9va2luZyBhdCBjcnRjLT5jb25maWcu IEZpeCB0aGlzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaGRtaS5jIHwgNDggKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfaGRtaS5jCmluZGV4IDM1YWRhNGUxYzZjZi4uMjIxOGIxMGZhMjJhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCkBAIC05NzUsNyArOTc1LDkgQEAgc3RhdGljIHZvaWQg aW50ZWxfaGRtaV9nZXRfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXBp cGVfY29uZmlnLT5sYW5lX2NvdW50ID0gNDsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxl X2hkbWlfYXVkaW8oc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCitzdGF0aWMgdm9pZCBp bnRlbF9lbmFibGVfaGRtaV9hdWRpbyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJ CQkgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAorCQkJCSAgICBzdHJ1 Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKIApAQCAtOTkxLDIx ICs5OTMsMjAgQEAgc3RhdGljIHZvaWQgZzR4X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyLAogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5iYXNl LmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXItPmJhc2Uu Y3J0Yyk7CiAJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBlbmNfdG9faW50ZWxfaGRt aSgmZW5jb2Rlci0+YmFzZSk7CiAJdTMyIHRlbXA7CiAKIAl0ZW1wID0gSTkxNV9SRUFEKGludGVs X2hkbWktPmhkbWlfcmVnKTsKIAogCXRlbXAgfD0gU0RWT19FTkFCTEU7Ci0JaWYgKGNydGMtPmNv bmZpZy0+aGFzX2F1ZGlvKQorCWlmIChwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvKQogCQl0ZW1wIHw9 IFNEVk9fQVVESU9fRU5BQkxFOwogCiAJSTkxNV9XUklURShpbnRlbF9oZG1pLT5oZG1pX3JlZywg dGVtcCk7CiAJUE9TVElOR19SRUFEKGludGVsX2hkbWktPmhkbWlfcmVnKTsKIAotCWlmIChjcnRj LT5jb25maWctPmhhc19hdWRpbykKLQkJaW50ZWxfZW5hYmxlX2hkbWlfYXVkaW8oZW5jb2Rlcik7 CisJaWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8pCisJCWludGVsX2VuYWJsZV9oZG1pX2F1ZGlv KGVuY29kZXIsIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKIH0KIAogc3RhdGljIHZvaWQgaWJ4 X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLApAQCAtMTA0MCw4ICsx MDQxLDggQEAgc3RhdGljIHZvaWQgaWJ4X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAogCSAqIEZJWE1FOiBCU3BlYyBzYXlzIHRoaXMgc2hvdWxkIGJlIGRvbmUgYXQg dGhlIGVuZCBvZgogCSAqIG9mIHRoZSBtb2Rlc2V0IHNlcXVlbmNlLCBzbyBub3Qgc3VyZSBpZiB0 aGlzIGlzbid0IHRvbyBzb29uLgogCSAqLwotCWlmIChjcnRjLT5jb25maWctPnBpcGVfYnBwID4g MjQgJiYKLQkgICAgY3J0Yy0+Y29uZmlnLT5waXhlbF9tdWx0aXBsaWVyID4gMSkgeworCWlmIChw aXBlX2NvbmZpZy0+cGlwZV9icHAgPiAyNCAmJgorCSAgICBwaXBlX2NvbmZpZy0+cGl4ZWxfbXVs dGlwbGllciA+IDEpIHsKIAkJSTkxNV9XUklURShpbnRlbF9oZG1pLT5oZG1pX3JlZywgdGVtcCAm IH5TRFZPX0VOQUJMRSk7CiAJCVBPU1RJTkdfUkVBRChpbnRlbF9oZG1pLT5oZG1pX3JlZyk7CiAK QEAgLTEwNTUsOCArMTA1Niw4IEBAIHN0YXRpYyB2b2lkIGlieF9lbmFibGVfaGRtaShzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJUE9TVElOR19SRUFEKGludGVsX2hkbWktPmhkbWlf cmVnKTsKIAl9CiAKLQlpZiAoY3J0Yy0+Y29uZmlnLT5oYXNfYXVkaW8pCi0JCWludGVsX2VuYWJs ZV9oZG1pX2F1ZGlvKGVuY29kZXIpOworCWlmIChwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvKQorCQlp bnRlbF9lbmFibGVfaGRtaV9hdWRpbyhlbmNvZGVyLCBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7 CiB9CiAKIHN0YXRpYyB2b2lkIGNwdF9lbmFibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKQEAgLTEwNzMsNyArMTA3NCw3IEBAIHN0YXRpYyB2b2lkIGNwdF9lbmFibGVfaGRt aShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAl0ZW1wID0gSTkxNV9SRUFEKGludGVs X2hkbWktPmhkbWlfcmVnKTsKIAogCXRlbXAgfD0gU0RWT19FTkFCTEU7Ci0JaWYgKGNydGMtPmNv bmZpZy0+aGFzX2F1ZGlvKQorCWlmIChwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvKQogCQl0ZW1wIHw9 IFNEVk9fQVVESU9fRU5BQkxFOwogCiAJLyoKQEAgLTEwODYsNyArMTA4Nyw3IEBAIHN0YXRpYyB2 b2lkIGNwdF9lbmFibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkgKiA0 LiBlbmFibGUgSERNSSBjbG9jayBnYXRpbmcKIAkgKi8KIAotCWlmIChjcnRjLT5jb25maWctPnBp cGVfYnBwID4gMjQpIHsKKwlpZiAocGlwZV9jb25maWctPnBpcGVfYnBwID4gMjQpIHsKIAkJSTkx NV9XUklURShUUkFOU19DSElDS0VOMShwaXBlKSwKIAkJCSAgIEk5MTVfUkVBRChUUkFOU19DSElD S0VOMShwaXBlKSkgfAogCQkJICAgVFJBTlNfQ0hJQ0tFTjFfSERNSVVOSVRfR0NfRElTQUJMRSk7 CkBAIC0xMDk4LDcgKzEwOTksNyBAQCBzdGF0aWMgdm9pZCBjcHRfZW5hYmxlX2hkbWkoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJSTkxNV9XUklURShpbnRlbF9oZG1pLT5oZG1pX3Jl ZywgdGVtcCk7CiAJUE9TVElOR19SRUFEKGludGVsX2hkbWktPmhkbWlfcmVnKTsKIAotCWlmIChj cnRjLT5jb25maWctPnBpcGVfYnBwID4gMjQpIHsKKwlpZiAocGlwZV9jb25maWctPnBpcGVfYnBw ID4gMjQpIHsKIAkJdGVtcCAmPSB+U0RWT19DT0xPUl9GT1JNQVRfTUFTSzsKIAkJdGVtcCB8PSBI RE1JX0NPTE9SX0ZPUk1BVF8xMmJwYzsKIApAQCAtMTExMCw4ICsxMTExLDggQEAgc3RhdGljIHZv aWQgY3B0X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJICAg flRSQU5TX0NISUNLRU4xX0hETUlVTklUX0dDX0RJU0FCTEUpOwogCX0KIAotCWlmIChjcnRjLT5j b25maWctPmhhc19hdWRpbykKLQkJaW50ZWxfZW5hYmxlX2hkbWlfYXVkaW8oZW5jb2Rlcik7CisJ aWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8pCisJCWludGVsX2VuYWJsZV9oZG1pX2F1ZGlvKGVu Y29kZXIsIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKIH0KIAogc3RhdGljIHZvaWQgdmx2X2Vu YWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLApAQCAtMTE3OCw5ICsxMTc5 LDcgQEAgc3RhdGljIHZvaWQgZzR4X2Rpc2FibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKIAkJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl LAogCQkJICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUpCiB7 Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXItPmJhc2Uu Y3J0Yyk7Ci0KLQlpZiAoY3J0Yy0+Y29uZmlnLT5oYXNfYXVkaW8pCisJaWYgKG9sZF9jcnRjX3N0 YXRlLT5oYXNfYXVkaW8pCiAJCWludGVsX2F1ZGlvX2NvZGVjX2Rpc2FibGUoZW5jb2Rlcik7CiAK IAlpbnRlbF9kaXNhYmxlX2hkbWkoZW5jb2Rlciwgb2xkX2NydGNfc3RhdGUsIG9sZF9jb25uX3N0 YXRlKTsKQEAgLTExOTAsOSArMTE4OSw3IEBAIHN0YXRpYyB2b2lkIHBjaF9kaXNhYmxlX2hkbWko c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAkJCSAgICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3Rh dGUgKm9sZF9jb25uX3N0YXRlKQogewotCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50 ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwotCi0JaWYgKGNydGMtPmNvbmZpZy0+aGFzX2F1 ZGlvKQorCWlmIChvbGRfY3J0Y19zdGF0ZS0+aGFzX2F1ZGlvKQogCQlpbnRlbF9hdWRpb19jb2Rl Y19kaXNhYmxlKGVuY29kZXIpOwogfQogCkBAIC0xNjQ1LDEzICsxNjQyLDEyIEBAIHN0YXRpYyB2 b2lkIGludGVsX2hkbWlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAkJCQkgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewogCXN0cnVj dCBpbnRlbF9oZG1pICppbnRlbF9oZG1pID0gZW5jX3RvX2ludGVsX2hkbWkoJmVuY29kZXItPmJh c2UpOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhlbmNv ZGVyLT5iYXNlLmNydGMpOwotCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3Rl ZF9tb2RlID0gJmludGVsX2NydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCWNvbnN0 IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJnBpcGVfY29uZmlnLT5i YXNlLmFkanVzdGVkX21vZGU7CiAKIAlpbnRlbF9oZG1pX3ByZXBhcmUoZW5jb2Rlcik7CiAKIAlp bnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcygmZW5jb2Rlci0+YmFzZSwKLQkJCQkgICBpbnRlbF9j cnRjLT5jb25maWctPmhhc19oZG1pX3NpbmssCisJCQkJICAgcGlwZV9jb25maWctPmhhc19oZG1p X3NpbmssCiAJCQkJICAgYWRqdXN0ZWRfbW9kZSk7CiB9CiAKQEAgLTE2NjMsOSArMTY1OSw3IEBA IHN0YXRpYyB2b2lkIHZsdl9oZG1pX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIsCiAJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSAmZHBvcnQtPmhkbWk7CiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YyA9Ci0JCXRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRjKTsKLQlj b25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZpbnRlbF9jcnRj LT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKKwljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwog CiAJdmx2X3BoeV9wcmVfZW5jb2Rlcl9lbmFibGUoZW5jb2Rlcik7CiAKQEAgLTE2NzQsNyArMTY2 OCw3IEBAIHN0YXRpYyB2b2lkIHZsdl9oZG1pX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiAJCQkJIDB4MmIyNDc4NzgpOwogCiAJaW50ZWxfaGRtaS0+c2V0X2luZm9m cmFtZXMoJmVuY29kZXItPmJhc2UsCi0JCQkJICAgaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNfaGRt aV9zaW5rLAorCQkJCSAgIHBpcGVfY29uZmlnLT5oYXNfaGRtaV9zaW5rLAogCQkJCSAgIGFkanVz dGVkX21vZGUpOwogCiAJZzR4X2VuYWJsZV9oZG1pKGVuY29kZXIsIHBpcGVfY29uZmlnLCBjb25u X3N0YXRlKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK