From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH v2.1 01/12] drm/i915: Make the force_thru workaround atomic, v2. Date: Tue, 28 Jul 2015 11:04:45 +0200 Message-ID: <55B745AD.7090105@linux.intel.com> References: <1438000541-3219-1-git-send-email-maarten.lankhorst@linux.intel.com> <1438000541-3219-2-git-send-email-maarten.lankhorst@linux.intel.com> <20150727140436.GY16722@phenom.ffwll.local> <55B735F1.4050404@linux.intel.com> <20150728082511.GE16722@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FF6E6E885 for ; Tue, 28 Jul 2015 02:04:47 -0700 (PDT) In-Reply-To: <20150728082511.GE16722@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U2V0IGNvbm5lY3RvcnNfY2hhbmdlZCB0byBmb3JjZSBhIG1vZGVzZXQgaWYgdGhlIHBhbmVsIGZp dHRlcidzIGZvcmNlCmVuYWJsZWQgb24gZURQLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBVc2UgY29u bmVjdG9yc19jaGFuZ2VkIGluc3RlYWQgb2YgYWN0aXZlX2NoYW5nZWQgYmVjYXVzZSBpdCdzIGEK ICByb3V0aW5nIHVwZGF0ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYwppbmRleCAyM2E2OTMwN2UxMmUuLmQxYzY0M2E4MjI2NyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTM2NDUsNzQgKzM2NDUsNDAgQEAgc3RhdGljIGludCBpbGtf cGlwZV9jcmNfY3RsX3JlZyhlbnVtIGludGVsX3BpcGVfY3JjX3NvdXJjZSAqc291cmNlLAogCXJl dHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBoc3dfdHJhbnNfZWRwX3BpcGVfQV9jcmNfd2Eoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIGhzd190cmFuc19lZHBfcGlwZV9BX2Ny Y193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIGVuYWJsZSkKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRl bF9jcnRjICpjcnRjID0KIAkJdG9faW50ZWxfY3J0YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21h cHBpbmdbUElQRV9BXSk7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnOwor CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKKwlpbnQgcmV0ID0gMDsKIAogCWRybV9t b2Rlc2V0X2xvY2tfYWxsKGRldik7Ci0JcGlwZV9jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRl KGNydGMtPmJhc2Uuc3RhdGUpOwotCi0JLyoKLQkgKiBJZiB3ZSB1c2UgdGhlIGVEUCB0cmFuc2Nv ZGVyIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHRoYXQgd2UgZG9uJ3QKLQkgKiBieXBhc3MgdGhlIHBm aXQsIHNpbmNlIG90aGVyd2lzZSB0aGUgcGlwZSBDUkMgc291cmNlIHdvbid0IHdvcmsuIE9ubHkK LQkgKiByZWxldmFudCBvbiBoc3cgd2l0aCBwaXBlIEEgd2hlbiB1c2luZyB0aGUgYWx3YXlzLW9u IHBvd2VyIHdlbGwKLQkgKiByb3V0aW5nLgotCSAqLwotCWlmIChwaXBlX2NvbmZpZy0+Y3B1X3Ry YW5zY29kZXIgPT0gVFJBTlNDT0RFUl9FRFAgJiYKLQkgICAgIXBpcGVfY29uZmlnLT5wY2hfcGZp dC5lbmFibGVkKSB7Ci0JCWJvb2wgYWN0aXZlID0gcGlwZV9jb25maWctPmJhc2UuYWN0aXZlOwot Ci0JCWlmIChhY3RpdmUpIHsKLQkJCWludGVsX2NydGNfY29udHJvbCgmY3J0Yy0+YmFzZSwgZmFs c2UpOwotCQkJcGlwZV9jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3Rh dGUpOwotCQl9Ci0KLQkJcGlwZV9jb25maWctPnBjaF9wZml0LmZvcmNlX3RocnUgPSB0cnVlOwot Ci0JCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LAotCQkJCQlQT1dFUl9ET01BSU5f UElQRV9QQU5FTF9GSVRURVIoUElQRV9BKSk7Ci0KLQkJaWYgKGFjdGl2ZSkKLQkJCWludGVsX2Ny dGNfY29udHJvbCgmY3J0Yy0+YmFzZSwgdHJ1ZSk7CisJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRl X2FsbG9jKGRldik7CisJaWYgKCFzdGF0ZSkgeworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIG91 dDsKIAl9Ci0JZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwotfQogCi1zdGF0aWMgdm9pZCBo c3dfdW5kb190cmFuc19lZHBfcGlwZV9BX2NyY193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQot ewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPQotCQl0b19pbnRlbF9jcnRjKGRldl9wcml2LT5w aXBlX3RvX2NydGNfbWFwcGluZ1tQSVBFX0FdKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq cGlwZV9jb25maWc7Ci0KLQlkcm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwotCS8qCi0JICogSWYg d2UgdXNlIHRoZSBlRFAgdHJhbnNjb2RlciB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0IHdlIGRv bid0Ci0JICogYnlwYXNzIHRoZSBwZml0LCBzaW5jZSBvdGhlcndpc2UgdGhlIHBpcGUgQ1JDIHNv dXJjZSB3b24ndCB3b3JrLiBPbmx5Ci0JICogcmVsZXZhbnQgb24gaHN3IHdpdGggcGlwZSBBIHdo ZW4gdXNpbmcgdGhlIGFsd2F5cy1vbiBwb3dlciB3ZWxsCi0JICogcm91dGluZy4KLQkgKi8KLQlw aXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7Ci0JaWYg KHBpcGVfY29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1KSB7Ci0JCWJvb2wgYWN0aXZlID0gcGlw ZV9jb25maWctPmJhc2UuYWN0aXZlOwotCi0JCWlmIChhY3RpdmUpIHsKLQkJCWludGVsX2NydGNf Y29udHJvbCgmY3J0Yy0+YmFzZSwgZmFsc2UpOwotCQkJcGlwZV9jb25maWcgPSB0b19pbnRlbF9j cnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOwotCQl9Ci0KLQkJcGlwZV9jb25maWctPnBjaF9w Zml0LmZvcmNlX3RocnUgPSBmYWxzZTsKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkcm1fbW9kZXNl dF9sZWdhY3lfYWNxdWlyZV9jdHgoJmNydGMtPmJhc2UpOworCXBpcGVfY29uZmlnID0gaW50ZWxf YXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlpZiAoSVNfRVJSKHBpcGVfY29u ZmlnKSkgeworCQlyZXQgPSBQVFJfRVJSKHBpcGVfY29uZmlnKTsKKwkJZ290byBvdXQ7CisJfQog Ci0JCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LAotCQkJCQlQT1dFUl9ET01BSU5f UElQRV9QQU5FTF9GSVRURVIoUElQRV9BKSk7CisJcGlwZV9jb25maWctPnBjaF9wZml0LmZvcmNl X3RocnUgPSBlbmFibGU7CisJaWYgKHBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2RlciA9PSBUUkFO U0NPREVSX0VEUCAmJgorCSAgICBwaXBlX2NvbmZpZy0+cGNoX3BmaXQuZW5hYmxlZCAhPSBlbmFi bGUpCisJCXBpcGVfY29uZmlnLT5iYXNlLmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAKLQkJ aWYgKGFjdGl2ZSkKLQkJCWludGVsX2NydGNfY29udHJvbCgmY3J0Yy0+YmFzZSwgdHJ1ZSk7Ci0J fQorCXJldCA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKK291dDoKIAlkcm1fbW9kZXNldF91 bmxvY2tfYWxsKGRldik7CisJV0FSTihyZXQsICJUb2dnbGluZyB3b3JrYXJvdW5kIHRvICVpIHJl dHVybnMgJWlcbiIsIGVuYWJsZSwgcmV0KTsKKwlpZiAocmV0KQorCQlkcm1fYXRvbWljX3N0YXRl X2ZyZWUoc3RhdGUpOwogfQogCiBzdGF0aWMgaW50IGl2Yl9waXBlX2NyY19jdGxfcmVnKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCkBAIC0zNzMyLDcgKzM2OTgsNyBAQCBzdGF0aWMgaW50IGl2Yl9w aXBlX2NyY19jdGxfcmVnKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWJyZWFrOwogCWNhc2Ug SU5URUxfUElQRV9DUkNfU09VUkNFX1BGOgogCQlpZiAoSVNfSEFTV0VMTChkZXYpICYmIHBpcGUg PT0gUElQRV9BKQotCQkJaHN3X3RyYW5zX2VkcF9waXBlX0FfY3JjX3dhKGRldik7CisJCQloc3df dHJhbnNfZWRwX3BpcGVfQV9jcmNfd2EoZGV2LCB0cnVlKTsKIAogCQkqdmFsID0gUElQRV9DUkNf RU5BQkxFIHwgUElQRV9DUkNfU09VUkNFX1BGX0lWQjsKIAkJYnJlYWs7CkBAIC0zODQ0LDcgKzM4 MTAsNyBAQCBzdGF0aWMgaW50IHBpcGVfY3JjX3NldF9zb3VyY2Uoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgZW51bSBwaXBlIHBpcGUsCiAJCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKIAkJ CXZsdl91bmRvX3BpcGVfc2NyYW1ibGVfcmVzZXQoZGV2LCBwaXBlKTsKIAkJZWxzZSBpZiAoSVNf SEFTV0VMTChkZXYpICYmIHBpcGUgPT0gUElQRV9BKQotCQkJaHN3X3VuZG9fdHJhbnNfZWRwX3Bp cGVfQV9jcmNfd2EoZGV2KTsKKwkJCWhzd190cmFuc19lZHBfcGlwZV9BX2NyY193YShkZXYsIGZh bHNlKTsKIAogCQloc3dfZW5hYmxlX2lwcyhjcnRjKTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggNDNiMGYxN2FkMWZhLi43NzQ3NTIwYmY5ZjYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMTYwLDYgKzEyMTYwLDcgQEAgY2xlYXJfaW50 ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlzdHJ1 Y3QgaW50ZWxfZHBsbF9od19zdGF0ZSBkcGxsX2h3X3N0YXRlOwogCWVudW0gaW50ZWxfZHBsbF9p ZCBzaGFyZWRfZHBsbDsKIAl1aW50MzJfdCBkZGlfcGxsX3NlbDsKKwlib29sIGZvcmNlX3RocnU7 CiAKIAkvKiBGSVhNRTogYmVmb3JlIHRoZSBzd2l0Y2ggdG8gYXRvbWljIHN0YXJ0ZWQsIGEgbmV3 IHBpcGVfY29uZmlnIHdhcwogCSAqIGt6YWxsb2MnZC4gQ29kZSB0aGF0IGRlcGVuZHMgb24gYW55 IGZpZWxkIGJlaW5nIHplcm8gc2hvdWxkIGJlCkBAIC0xMjE3MSw2ICsxMjE3Miw3IEBAIGNsZWFy X2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJ c2hhcmVkX2RwbGwgPSBjcnRjX3N0YXRlLT5zaGFyZWRfZHBsbDsKIAlkcGxsX2h3X3N0YXRlID0g Y3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZTsKIAlkZGlfcGxsX3NlbCA9IGNydGNfc3RhdGUtPmRk aV9wbGxfc2VsOworCWZvcmNlX3RocnUgPSBjcnRjX3N0YXRlLT5wY2hfcGZpdC5mb3JjZV90aHJ1 OwogCiAJbWVtc2V0KGNydGNfc3RhdGUsIDAsIHNpemVvZiAqY3J0Y19zdGF0ZSk7CiAKQEAgLTEy MTc5LDYgKzEyMTgxLDcgQEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAljcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9IHNoYXJlZF9k cGxsOwogCWNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUgPSBkcGxsX2h3X3N0YXRlOwogCWNydGNf c3RhdGUtPmRkaV9wbGxfc2VsID0gZGRpX3BsbF9zZWw7CisJY3J0Y19zdGF0ZS0+cGNoX3BmaXQu Zm9yY2VfdGhydSA9IGZvcmNlX3RocnU7CiB9CiAKIHN0YXRpYyBpbnQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==