From: Matt Roper Subject: [RFC 04/15] drm/i915: Make atomic use in-flight state for CRTC active value (v2) Date: Wed, 20 May 2015 19:12:16 -0700 Message-ID: <1432174347-19138-5-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B87326E808 for ; Wed, 20 May 2015 19:12:29 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@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 T3VyIGF0b21pYyBwbGFuZSBjb2RlIGN1cnJlbnRseSB1c2VzIGludGVsX2NydGMtPmFjdGl2ZSB0 byBkZXRlcm1pbmUKaG93L3doZW4gdG8gdXBkYXRlIHNvbWUgZGVyaXZlZCBzdGF0ZSB2YWx1ZXMu ICBUaGlzIHdvcmtzIGZpbmUgZm9yIHB1cmUKcGxhbmUgdXBkYXRlcyBhdCB0aGUgbW9tZW50IHNp bmNlIHRoZSBDUlRDIHN0YXRlIGl0c2VsZiBpc24ndCBjaGFuZ2VkIGFzCnBhcnQgb2YgdGhlIG9w ZXJhdGlvbi4gIEhvd2V2ZXIgYXMgd2UgY29udmVydCBtb3JlIG9mIG91ciBkcml2ZXIKaW50ZXJu YWxzIG92ZXIgdG8gYXRvbWljIG1vZGVzZXR0aW5nLCB3ZSBuZWVkIHRvIGxvb2sgYXQgd2hldGhl ciB0aGUKQ1JUQyB3aWxsIGJlIGFjdGl2ZSBhdCB0aGUgKmVuZCogb2YgdGhlIGF0b21pYyB0cmFu c2FjdGlvbiAod2hpY2ggbWF5Cm5vdCBtYXRjaCB0aGUgY3VycmVudGx5IGNvbW1pdHRlZCBzdGF0 ZSkuCgpUaGUgaW4tZmxpZ2h0IHZhbHVlIHdlIHdhbnQgdG8gdXNlIGlzIGdlbmVyYWxseSBpbiBh IGNydGNfc3RhdGUgb2JqZWN0CmFzc29jaWF0ZWQgd2l0aCBvdXIgdG9wLWxldmVsIGF0b21pYyB0 cmFuc2FjdGlvbi4gIEhvd2V2ZXIgb25lIGV4Y2VwdGlvbgp0byBub3RlIGlzIHRoYXQgd2hlbiB1 cGRhdGluZyBwcm9wZXJ0aWVzIG9mIGEgZGlzYWJsZWQgcGxhbmUgKHRoYXQgaXMKc3RheWluZyBk aXNhYmxlZCksIHdlJ2xsIGhhdmUgYSB0b3AtbGV2ZWwgYXRvbWljIHN0YXRlLCBidXQgaXQgbWF5 IG5vdApjb250YWluIHRoZSBDUlRDIHN0YXRlIHdlJ3JlIGxvb2tpbmcgZm9yLiAgVGhpcyBtZWFu cyB3ZSdyZSBub3QgYWN0dWFsbHkKdG91Y2hpbmcgYW55IENSVEMgc3RhdGUgc28gaXQncyBzYWZl IHRvIHVzZSB0aGUgdmFsdWUgZnJvbSBjcnRjLT5zdGF0ZQpkaXJlY3RseS4KCk5vdGUgdGhhdCB3 ZSdyZSBvbmx5IGNoYW5naW5nIHRoZSAnY2hlY2snIHNpZGUgb2YgdXBkYXRlcyB0byByZWFkIG91 dCBvZgppbi1mbGlnaHQgc3RhdGUgdnMgY29tbWl0dGVkIHN0YXRlOyB0aGlzIHRha2VzIGNhcmUg b2YgbWFraW5nIHN1cmUgb3VyCmRlcml2ZWQgc3RhdGUgaXMgdXBkYXRlZCBhcyBleHBlY3RlZC4g IFRoZSAnY29tbWl0JyBjb2RlIHJlc3BvbnNpYmxlIGZvcgphY3R1YWxseSBwcm9ncmFtbWluZyB0 aGUgaGFyZHdhcmUgc3RpbGwgbG9va3MgYXQgaW50ZWxfY3J0Yy0+YWN0aXZlIHNvCnRoYXQgd2Ug d29uJ3QgdHJ5IHRvIHdyaXRlIHBsYW5lIHJlZ2lzdGVycyB3aGlsZSB0aGUgQ1JUQyBpcyBkaXNh YmxlZC4KCnYyOiBSZWJhc2luZyBhbmQgY2xlYW51cAoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3Bl ciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWNfcGxhbmUuYyB8IDExICstLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyAgICAgIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgMyArKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgfCAgNSArKy0tCiA0IGZpbGVzIGNo YW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXggODZiYTRiMi4uNzE0ZWUyNCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTEyNywxNiArMTI3LDcg QEAgc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJaWYgKCFjcnRjKQogCQlyZXR1cm4gMDsKIAotCS8qIEZJWE1FOiB0ZW1wb3Jhcnkg aGFjayBuZWNlc3Nhcnkgd2hpbGUgd2Ugc3RpbGwgdXNlIHRoZSBwbGFuZSB1cGRhdGUKLQkgKiBo ZWxwZXIuICovCi0JaWYgKHN0YXRlLT5zdGF0ZSkgewotCQljcnRjX3N0YXRlID0KLQkJCWludGVs X2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZS0+c3RhdGUsIGludGVsX2NydGMpOwotCQlpZiAo SVNfRVJSKGNydGNfc3RhdGUpKQotCQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7Ci0JfSBl bHNlIHsKLQkJY3J0Y19zdGF0ZSA9IGludGVsX2NydGMtPmNvbmZpZzsKLQl9CisJY3J0Y19zdGF0 ZSA9IGludGVsX2NydGNfc3RhdGVfZm9yX3BsYW5lKGludGVsX3N0YXRlKTsKIAogCS8qCiAJICog VGhlIG9yaWdpbmFsIHNyYy9kZXN0IGNvb3JkaW5hdGVzIGFyZSBzdG9yZWQgaW4gc3RhdGUtPmJh c2UsIGJ1dApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGUxMmI1YTQuLjFh N2QyYTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMDM0LDYgKzEz MDM0LDQ2IEBAIHNrbF9tYXhfc2NhbGUoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsIHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlCiAJcmV0dXJuIG1heF9zY2FsZTsKIH0K IAorLyoqCisgKiBpbnRlbF9jcnRjX3N0YXRlX2Zvcl9wbGFuZSAtIE9idGFpbiBDUlRDIHN0YXRl IGZvciBhIHBsYW5lCisgKiBAcHN0YXRlOiBwbGFuZSBzdGF0ZSB0byBsb29rdXAgY29ycmVzcG9u ZGluZyBjcnRjIHN0YXRlIGZvcgorICoKKyAqIFdoZW4gd29ya2luZyB3aXRoIGEgdG9wLWxldmVs IGF0b21pYyB0cmFuc2FjdGlvbiAoZHJtX2F0b21pY19zdGF0ZSksCisgKiBhIENSVEMgc3RhdGUg c2hvdWxkIGJlIHByZXNlbnQgdGhhdCBjb3JyZXNwb25kcyB0byB0aGUgcHJvdmlkZWQKKyAqIHBs YW5lIHN0YXRlOyB0aGlzIGZ1bmN0aW9uIHByb3ZpZGVzIGEgcXVpY2sgd2F5IHRvIGZldGNoIHRo YXQKKyAqIENSVEMgc3RhdGUuICBJbiBjYXNlcyB3aGVyZSB3ZSBoYXZlIGEgcGxhbmUgc3RhdGUg dW5hc3NvY2lhdGVkIHdpdGggYW55CisgKiB0b3AtbGV2ZWwgYXRvbWljIHRyYW5zYWN0aW9uIChl LmcuLCB3aGlsZSB1c2luZyB0aGUgdHJhbnNpdGlvbmFsIGF0b21pYworICogaGVscGVycyksIHRo ZSBjdXJyZW50IENSVEMgc3RhdGUgZnJvbSBjcnRjLT5zdGF0ZSB3aWxsIGJlIHJldHVybmVkCisg KiBpbnN0ZWFkLgorICovCitzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqCitpbnRlbF9jcnRjX3N0 YXRlX2Zvcl9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSkKK3sKKwlzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBwc3RhdGUtPmJhc2Uuc3RhdGU7CisJc3RydWN0 IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBzdGF0ZS0+YmFzZS5wbGFuZSk7 CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BpcGUocHN0YXRl LT5iYXNlLnBsYW5lLT5kZXYsCisJCQkJCQkJcGxhbmUtPnBpcGUpOworCXN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlOworCisJLyoKKwkgKiBXaGlsZSB1c2luZyB0cmFuc2l0aW9u YWwgcGxhbmUgaGVscGVycywgd2UgbWF5IG5vdCBoYXZlIGEgdG9wLWxldmVsCisJICogYXRvbWlj IHRyYW5zYWN0aW9uLiAgT2YgY291cnNlIHRoYXQgYWxzbyBtZWFucyB0aGF0IHdlJ3JlIG5vdAor CSAqIGFjdHVhbGx5IHRvdWNoaW5nIENSVEMgc3RhdGUsIHNvIGp1c3QgcmV0dXJuIHRoZSBjdXJy ZW50bHkKKwkgKiBjb21taXR0ZWQgc3RhdGUuCisJICoKKwkgKiBGSVhNRTogT25jZSBvdXIgbW9k ZXNldCBjb2RlIHN0b3BzIHVzaW5nIHRyYW5zaXRpb25hbCBoZWxwZXJzCisJICogaW50ZXJuYWxs eSB3ZSBzaG91bGQgYWRkIGEgV0FSTl9PTigpIHRvIHRoaXMgY29uZGl0aW9uLgorCSAqLworCWlm ICghc3RhdGUpCisJCXJldHVybiB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKKwor CWNydGNfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIHRvX2ludGVs X2NydGMoY3J0YykpOworCWlmIChXQVJOX09OKElTX0VSUihjcnRjX3N0YXRlKSkpCisJCWNydGNf c3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKKworCXJldHVybiBjcnRj X3N0YXRlOworfQorCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRl KQpAQCAtMTMwNTQsOCArMTMwOTQsNyBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7 CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JY3J0Y19zdGF0ZSA9IHN0YXRl LT5iYXNlLnN0YXRlID8KLQkJaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNl LnN0YXRlLCBpbnRlbF9jcnRjKSA6IE5VTEw7CisJY3J0Y19zdGF0ZSA9IGludGVsX2NydGNfc3Rh dGVfZm9yX3BsYW5lKHN0YXRlKTsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7 CiAJCW1pbl9zY2FsZSA9IDE7CkBAIC0xMzA3Miw3ICsxMzExMSw3IEBAIGludGVsX2NoZWNrX3By aW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaWYgKHJldCkKIAkJcmV0dXJu IHJldDsKIAotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwlpZiAoY3J0Y19zdGF0ZS0+YmFz ZS5hY3RpdmUpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUgPQogCQkJ dG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKIApAQCAtMTMzNjYsNiArMTM0MDUs NyBAQCBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ Y29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwogCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jcnRjX3N0 YXRlOwogCXVuc2lnbmVkIHN0cmlkZTsKIAlpbnQgcmV0OwogCkBAIC0xMzQwNCw3ICsxMzQ0NCw4 IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl9 CiAKIGZpbmlzaDoKLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJaW50ZWxfY3J0Y19zdGF0 ZSA9IGludGVsX2NydGNfc3RhdGVfZm9yX3BsYW5lKHN0YXRlKTsKKwlpZiAoaW50ZWxfY3J0Y19z dGF0ZS0+YmFzZS5hY3RpdmUpIHsKIAkJaWYgKHBsYW5lLT5zdGF0ZS0+Y3J0Y193ICE9IHN0YXRl LT5iYXNlLmNydGNfdykKIAkJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfd20gPSB0cnVlOwog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGZlOTY2Y2UuLjFlMjJmZmUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMDcyLDYgKzEwNzIsOSBAQCB2b2lkIGludGVsX2NyZWF0 ZV9yb3RhdGlvbl9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiBib29sIGludGVs X3dtX25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpzdGF0ZSk7CitzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqCitpbnRlbF9j cnRjX3N0YXRlX2Zvcl9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSk7CisK IAogLyogc2hhcmVkIGRwbGwgZnVuY3Rpb25zICovCiBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwg KmludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAzOTRjZjM3Li5iZmU5MjEzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNzUzLDggKzc1Myw3IEBAIGludGVsX2NoZWNr X3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpbnQgcmV0OwogCiAJaW50 ZWxfY3J0YyA9IGludGVsX2NydGMgPyBpbnRlbF9jcnRjIDogdG9faW50ZWxfY3J0YyhwbGFuZS0+ Y3J0Yyk7Ci0JY3J0Y19zdGF0ZSA9IHN0YXRlLT5iYXNlLnN0YXRlID8KLQkJaW50ZWxfYXRvbWlj X2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNlLnN0YXRlLCBpbnRlbF9jcnRjKSA6IE5VTEw7CisJ Y3J0Y19zdGF0ZSA9IGludGVsX2NydGNfc3RhdGVfZm9yX3BsYW5lKHN0YXRlKTsKIAogCWlmICgh ZmIpIHsKIAkJc3RhdGUtPnZpc2libGUgPSBmYWxzZTsKQEAgLTkwNSw3ICs5MDQsNyBAQCBmaW5p c2g6CiAJICogSWYgdGhlIHNwcml0ZSBpcyBjb21wbGV0ZWx5IGNvdmVyaW5nIHRoZSBwcmltYXJ5 IHBsYW5lLAogCSAqIHdlIGNhbiBkaXNhYmxlIHRoZSBwcmltYXJ5IGFuZCBzYXZlIHBvd2VyLgog CSAqLwotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKKwlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5h Y3RpdmUpIHsKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KIAkJCUlOVEVMX0ZST05U QlVGRkVSX1NQUklURShpbnRlbF9jcnRjLT5waXBlKTsKIAotLSAKMS44LjUuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK