From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH 4/4] drm/msm: Switch to atomic_helper_commit() Date: Tue, 27 Mar 2018 12:31:54 -0400 Message-ID: <20180327163154.40374-5-seanpaul@chromium.org> References: <20180327163154.40374-1-seanpaul@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180327163154.40374-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Sean Paul , hoegsberg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, abhinavk-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org Tm93IHRoYXQgYWxsIG9mIHRoZSBtc20tc3BlY2lmaWMgZ29vIGlzIHR1Y2tlZCBzYWZlbHkgYXdh eSB3ZSBjYW4gc3dpdGNoCm92ZXIgdG8gdXNpbmcgdGhlIGF0b21pYyBoZWxwZXIgY29tbWl0IGRp cmVjdGx5LiBcby8KCkNjOiBBYmhpbmF2IEt1bWFyIDxhYmhpbmF2a0Bjb2RlYXVyb3JhLm9yZz4K U2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL21zbS9tc21fYXRvbWljLmMgfCAxMjAgKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMgICAgfCAgIDcgKy0KIGRy aXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oICAgIHwgICAzICstCiAzIGZpbGVzIGNoYW5nZWQs IDggaW5zZXJ0aW9ucygrKSwgMTIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9tc20vbXNtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fYXRvbWlj LmMKaW5kZXggYWY4MjhkZjZlMDYwLi4wYTYzY2U4ZjMzYTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9tc20vbXNtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2F0 b21pYy5jCkBAIC0xNyw4ICsxNyw2IEBACiAKICNpbmNsdWRlICJtc21fZHJ2LmgiCiAjaW5jbHVk ZSAibXNtX2ttcy5oIgotI2luY2x1ZGUgIm1zbV9nZW0uaCIKLSNpbmNsdWRlICJtc21fZmVuY2Uu aCIKIAogc3RhdGljIHZvaWQgbXNtX2F0b21pY193YWl0X2Zvcl9jb21taXRfZG9uZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQpA QCAtMzcsNyArMzUsNyBAQCBzdGF0aWMgdm9pZCBtc21fYXRvbWljX3dhaXRfZm9yX2NvbW1pdF9k b25lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogfQogCi1zdGF0aWMgdm9pZCBtc21fYXRv bWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3ZvaWQgbXNt X2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7CiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CiAJc3RydWN0IG1zbV9kcm1fcHJp dmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC03NCwxMTkgKzcyLDMgQEAgc3RhdGlj IHZvaWQgbXNtX2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUpCiAKIAlrbXMtPmZ1bmNzLT5jb21wbGV0ZV9jb21taXQoa21zLCBzdGF0ZSk7CiB9Ci0KLS8q IFRoZSAocG90ZW50aWFsbHkpIGFzeW5jaHJvbm91cyBwYXJ0IG9mIHRoZSBjb21taXQuICBBdCB0 aGlzIHBvaW50Ci0gKiBub3RoaW5nIGNhbiBmYWlsIHNob3J0IG9mIGFybWFnZWRkb24uCi0gKi8K LXN0YXRpYyB2b2lkIGNvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK LXsKLQlkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9mZW5jZXMoc3RhdGUtPmRldiwgc3RhdGUs IGZhbHNlKTsKLQotCWRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX2RlcGVuZGVuY2llcyhzdGF0 ZSk7Ci0KLQltc21fYXRvbWljX2NvbW1pdF90YWlsKHN0YXRlKTsKLQotCWRybV9hdG9taWNfaGVs cGVyX2NvbW1pdF9jbGVhbnVwX2RvbmUoc3RhdGUpOwotCi0JZHJtX2F0b21pY19zdGF0ZV9wdXQo c3RhdGUpOwotfQotCi1zdGF0aWMgdm9pZCBjb21taXRfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3Qg KndvcmspCi17Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY29udGFpbmVyX29m KHdvcmssCi0JCQkJCQkgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSwKLQkJCQkJCSAgICAg IGNvbW1pdF93b3JrKTsKLQljb21taXRfdGFpbChzdGF0ZSk7Ci19Ci0KLS8qKgotICogZHJtX2F0 b21pY19oZWxwZXJfY29tbWl0IC0gY29tbWl0IHZhbGlkYXRlZCBzdGF0ZSBvYmplY3QKLSAqIEBk ZXY6IERSTSBkZXZpY2UKLSAqIEBzdGF0ZTogdGhlIGRyaXZlciBzdGF0ZSBvYmplY3QKLSAqIEBu b25ibG9jazogbm9uYmxvY2tpbmcgY29tbWl0Ci0gKgotICogVGhpcyBmdW5jdGlvbiBjb21taXRz IGEgd2l0aCBkcm1fYXRvbWljX2hlbHBlcl9jaGVjaygpIHByZS12YWxpZGF0ZWQgc3RhdGUKLSAq IG9iamVjdC4gVGhpcyBjYW4gc3RpbGwgZmFpbCB3aGVuIGUuZy4gdGhlIGZyYW1lYnVmZmVyIHJl c2VydmF0aW9uIGZhaWxzLgotICoKLSAqIFJFVFVSTlMKLSAqIFplcm8gZm9yIHN1Y2Nlc3Mgb3Ig LWVycm5vLgotICovCi1pbnQgbXNtX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKLQkJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBib29sIG5vbmJsb2NrKQotewot CXN0cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVj dCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0J c3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3Bs YW5lX3N0YXRlLCAqbmV3X3BsYW5lX3N0YXRlOwotCWludCBpLCByZXQ7Ci0KLQkvKgotCSAqIE5v dGUgdGhhdCBwbGFuZS0+YXRvbWljX2FzeW5jX2NoZWNrKCkgc2hvdWxkIGZhaWwgaWYgd2UgbmVl ZAotCSAqIHRvIHJlLWFzc2lnbiBod3BpcGUgb3IgYW55dGhpbmcgdGhhdCB0b3VjaGVzIGdsb2Jh bCBhdG9taWMKLQkgKiBzdGF0ZSwgc28gd2UnbGwgbmV2ZXIgZ28gZG93biB0aGUgYXN5bmMgdXBk YXRlIHBhdGggaW4gdGhvc2UKLQkgKiBjYXNlcy4KLQkgKi8KLQlpZiAoc3RhdGUtPmFzeW5jX3Vw ZGF0ZSkgewotCQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3BsYW5lcyhkZXYsIHN0 YXRlKTsKLQkJaWYgKHJldCkKLQkJCXJldHVybiByZXQ7Ci0KLQkJZHJtX2F0b21pY19oZWxwZXJf YXN5bmNfY29tbWl0KGRldiwgc3RhdGUpOwotCQlkcm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3Bs YW5lcyhkZXYsIHN0YXRlKTsKLQkJcmV0dXJuIDA7Ci0JfQotCi0JcmV0ID0gZHJtX2F0b21pY19o ZWxwZXJfc2V0dXBfY29tbWl0KHN0YXRlLCBub25ibG9jayk7Ci0JaWYgKHJldCkKLQkJcmV0dXJu IHJldDsKLQotCUlOSVRfV09SSygmc3RhdGUtPmNvbW1pdF93b3JrLCBjb21taXRfd29yayk7Ci0K LQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3BsYW5lcyhkZXYsIHN0YXRlKTsKLQlp ZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKCFub25ibG9jaykgewotCQlyZXQgPSBkcm1f YXRvbWljX2hlbHBlcl93YWl0X2Zvcl9mZW5jZXMoZGV2LCBzdGF0ZSwgdHJ1ZSk7Ci0JCWlmIChy ZXQpCi0JCQlnb3RvIGVycm9yOwotCX0KLQotCS8qCi0JICogVGhpcyBpcyB0aGUgcG9pbnQgb2Yg bm8gcmV0dXJuIC0gZXZlcnl0aGluZyBiZWxvdyBuZXZlciBmYWlscyBleGNlcHQKLQkgKiB3aGVu IHRoZSBodyBnb2VzIGJvbmdoaXRzLiBXaGljaCBtZWFucyB3ZSBjYW4gY29tbWl0IHRoZSBuZXcg c3RhdGUgb24KLQkgKiB0aGUgc29mdHdhcmUgc2lkZSBub3cuCi0JICoKLQkgKiBzd2FwIGRyaXZl ciBwcml2YXRlIHN0YXRlIHdoaWxlIHN0aWxsIGhvbGRpbmcgc3RhdGVfbG9jawotCSAqLwotCUJV R19PTihkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRlKHN0YXRlLCBmYWxzZSkgPCAwKTsKLQot CS8qCi0JICogRXZlcnl0aGluZyBiZWxvdyBjYW4gYmUgcnVuIGFzeW5jaHJvbm91c2x5IHdpdGhv dXQgdGhlIG5lZWQgdG8gZ3JhYgotCSAqIGFueSBtb2Rlc2V0IGxvY2tzIGF0IGFsbCB1bmRlciBv bmUgY29uZGl0aW9uczogSXQgbXVzdCBiZSBndWFyYW50ZWVkCi0JICogdGhhdCB0aGUgYXN5bmNo cm9ub3VzIHdvcmsgaGFzIGVpdGhlciBiZWVuIGNhbmNlbGxlZCAoaWYgdGhlIGRyaXZlcgotCSAq IHN1cHBvcnRzIGl0LCB3aGljaCBhdCBsZWFzdCByZXF1aXJlcyB0aGF0IHRoZSBmcmFtZWJ1ZmZl cnMgZ2V0Ci0JICogY2xlYW5lZCB1cCB3aXRoIGRybV9hdG9taWNfaGVscGVyX2NsZWFudXBfcGxh bmVzKCkpIG9yIGNvbXBsZXRlZAotCSAqIGJlZm9yZSB0aGUgbmV3IHN0YXRlIGdldHMgY29tbWl0 dGVkIG9uIHRoZSBzb2Z0d2FyZSBzaWRlIHdpdGgKLQkgKiBkcm1fYXRvbWljX2hlbHBlcl9zd2Fw X3N0YXRlKCkuCi0JICoKLQkgKiBUaGlzIHNjaGVtZSBhbGxvd3MgbmV3IGF0b21pYyBzdGF0ZSB1 cGRhdGVzIHRvIGJlIHByZXBhcmVkIGFuZAotCSAqIGNoZWNrZWQgaW4gcGFyYWxsZWwgdG8gdGhl IGFzeW5jaHJvbm91cyBjb21wbGV0aW9uIG9mIHRoZSBwcmV2aW91cwotCSAqIHVwZGF0ZS4gV2hp Y2ggaXMgaW1wb3J0YW50IHNpbmNlIGNvbXBvc2l0b3JzIG5lZWQgdG8gZmlndXJlIG91dCB0aGUK LQkgKiBjb21wb3NpdGlvbiBvZiB0aGUgbmV4dCBmcmFtZSByaWdodCBhZnRlciBoYXZpbmcgc3Vi bWl0dGVkIHRoZQotCSAqIGN1cnJlbnQgbGF5b3V0LgotCSAqLwotCi0JZHJtX2F0b21pY19zdGF0 ZV9nZXQoc3RhdGUpOwotCWlmIChub25ibG9jaykKLQkJcXVldWVfd29yayhzeXN0ZW1fdW5ib3Vu ZF93cSwgJnN0YXRlLT5jb21taXRfd29yayk7Ci0JZWxzZQotCQljb21taXRfdGFpbChzdGF0ZSk7 Ci0KLQlyZXR1cm4gMDsKLQotZXJyb3I6Ci0JZHJtX2F0b21pY19oZWxwZXJfY2xlYW51cF9wbGFu ZXMoZGV2LCBzdGF0ZSk7Ci0JcmV0dXJuIHJldDsKLX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKaW5kZXgg ZDFhNDVhNjhjMjg3Li5lYjU1NjlkNGRkNTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9t c20vbXNtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5jCkBAIC00MSw3 ICs0MSwxMSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9tb2RlX2NvbmZpZ19mdW5jcyBtb2Rl X2NvbmZpZ19mdW5jcyA9IHsKIAkuZmJfY3JlYXRlID0gbXNtX2ZyYW1lYnVmZmVyX2NyZWF0ZSwK IAkub3V0cHV0X3BvbGxfY2hhbmdlZCA9IGRybV9mYl9oZWxwZXJfb3V0cHV0X3BvbGxfY2hhbmdl ZCwKIAkuYXRvbWljX2NoZWNrID0gZHJtX2F0b21pY19oZWxwZXJfY2hlY2ssCi0JLmF0b21pY19j b21taXQgPSBtc21fYXRvbWljX2NvbW1pdCwKKwkuYXRvbWljX2NvbW1pdCA9IGRybV9hdG9taWNf aGVscGVyX2NvbW1pdCwKK307CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmln X2hlbHBlcl9mdW5jcyBtb2RlX2NvbmZpZ19oZWxwZXJfZnVuY3MgPSB7CisJLmF0b21pY19jb21t aXRfdGFpbCA9IG1zbV9hdG9taWNfY29tbWl0X3RhaWwsCiB9OwogCiBzdGF0aWMgaW5saW5lCkBA IC01MjAsNiArNTI0LDcgQEAgc3RhdGljIGludCBtc21fZHJtX2luaXQoc3RydWN0IGRldmljZSAq ZGV2LCBzdHJ1Y3QgZHJtX2RyaXZlciAqZHJ2KQogCX0KIAogCWRkZXYtPm1vZGVfY29uZmlnLmZ1 bmNzID0gJm1vZGVfY29uZmlnX2Z1bmNzOworCWRkZXYtPm1vZGVfY29uZmlnLmhlbHBlcl9wcml2 YXRlID0gJm1vZGVfY29uZmlnX2hlbHBlcl9mdW5jczsKIAogCXJldCA9IGRybV92YmxhbmtfaW5p dChkZGV2LCBwcml2LT5udW1fY3J0Y3MpOwogCWlmIChyZXQgPCAwKSB7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Ry di5oCmluZGV4IGI4OWZhNTE4NmViOC4uM2U4OWQ3ZWFjMDJmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbXNtL21zbV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYu aApAQCAtMTU2LDggKzE1Niw3IEBAIHN0cnVjdCBtc21fZm9ybWF0IHsKIAl1aW50MzJfdCBwaXhl bF9mb3JtYXQ7CiB9OwogCi1pbnQgbXNtX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKLQkJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBib29sIG5vbmJsb2NrKTsK K3ZvaWQgbXNtX2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUpOwogCiB2b2lkIG1zbV9nZW1fdW5tYXBfdm1hKHN0cnVjdCBtc21fZ2VtX2FkZHJlc3Nfc3Bh Y2UgKmFzcGFjZSwKIAkJc3RydWN0IG1zbV9nZW1fdm1hICp2bWEsIHN0cnVjdCBzZ190YWJsZSAq c2d0KTsKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVt IE9TCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVl ZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K