From: Ville Syrjala Subject: [PATCH 3/4] drm: Extract page_flip_{internal, atomic}() Date: Fri, 13 Jul 2018 18:50:34 +0300 Message-ID: <20180713155035.3866-3-ville.syrjala@linux.intel.com> References: <20180713155035.3866-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180713155035.3866-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCllh bmsgb3V0IHRoZSBjb2RlIGZvciB0aGUgcGxhbmUtPmZiL29sZF9mYi9jcnRjIGhhbmRsaW5nIGZy b20KdGhlIHBhZ2UgZmxpcCBwYXRoIGludG8gcGFnZV9mbGlwX2ludGVybmFsKCksIGFuZCBwcm92 aWRlIGEKc2ltcGxlciB2YXJpYW50IGZvciBhdG9taWMgZHJpdmVycy4KCldlJ2xsIGFsc28gbW92 ZSB0aGUgZmIgdnMuIHNyYyB2aWV3cG9ydCBjaGVja3MgaW50byB0aGUgbmV3CmZ1bmN0aW9ucyBh cyB0aGV5IGFyZSBzbGlnaHRseSBkaWZmZXJlbnQgYmV0d2VlbiB0aGUgdHdvIHBhdGhzLgpJZiB0 aGUgYXRvbWljIC5wYWdlX2ZsaXAoKSBpbXBsZW1lbnRhdGlvbnMgYXJlIGd1YXJhbnRlZWQKdG8g Y2FsbCBkcm1fYXRvbWljX3BsYW5lX2NoZWNrKCkgd2UgY291bGQgZXZlbiBkcm9wIHRoZSBjaGVj awplbnRpcmVseSBmcm9tIHBhZ2VfZmxpcF9hdG9taWMoKS4gRm9yIG5vdyB0b3NzIGluIGEgRklY TUUuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYyB8IDE2MiArKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEw NSBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMKaW5kZXggZDI2 OTIzMWQ2M2M1Li5lM2YyZGRmN2RlYWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f cGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMKQEAgLTEwMDMsMTMgKzEw MDMsMTEyIEBAIGludCBkcm1fbW9kZV9jdXJzb3IyX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJcmV0dXJuIGRybV9tb2RlX2N1cnNvcl9jb21tb24oZGV2LCByZXEsIGZpbGVfcHJpdik7 CiB9CiAKK3N0YXRpYyBpbnQgcGFnZV9mbGlwX2NoZWNrX2Zicyhjb25zdCBzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpmYiwKKwkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpv bGRfZmIpCit7CisJLyogVGhlIGZyYW1lYnVmZmVyIGlzIGN1cnJlbnRseSB1bmJvdW5kLCBwcmVz dW1hYmx5CisJICogZHVlIHRvIGEgaG90cGx1ZyBldmVudCwgdGhhdCB1c2Vyc3BhY2UgaGFzIG5v dAorCSAqIHlldCBkaXNjb3ZlcmVkLgorCSAqLworCWlmICghb2xkX2ZiKQorCQlyZXR1cm4gLUVC VVNZOworCisJaWYgKG9sZF9mYi0+Zm9ybWF0ICE9IGZiLT5mb3JtYXQpIHsKKwkJRFJNX0RFQlVH X0tNUygiUGFnZSBmbGlwIGlzIG5vdCBhbGxvd2VkIHRvIGNoYW5nZSBmcmFtZSBidWZmZXIgZm9y bWF0LlxuIik7CisJCXJldHVybiAtRUlOVkFMOworCX0KKworCXJldHVybiAwOworfQorCitzdGF0 aWMgaW50IHBhZ2VfZmxpcF9pbnRlcm5hbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgICAg ICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJCSAgICAgIHN0cnVjdCBkcm1fcGVuZGlu Z192YmxhbmtfZXZlbnQgKmUsCisJCQkgICAgICB1MzIgZmxhZ3MsCisJCQkgICAgICB1MzIgdGFy Z2V0X3ZibGFuaywKKwkJCSAgICAgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4 KQoreworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gY3J0Yy0+cHJpbWFyeTsKKwlpbnQgcmV0 OworCisJV0FSTl9PTihkcm1fZHJ2X3VzZXNfYXRvbWljX21vZGVzZXQoY3J0Yy0+ZGV2KSk7CisK KwlyZXQgPSBkcm1fY3J0Y19jaGVja192aWV3cG9ydChjcnRjLCBjcnRjLT54LCBjcnRjLT55LAor CQkJCSAgICAgICZjcnRjLT5tb2RlLCBmYik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwor CXJldCA9IHBhZ2VfZmxpcF9jaGVja19mYnMoZmIsIHBsYW5lLT5mYik7CisJaWYgKHJldCkKKwkJ cmV0dXJuIHJldDsKKworCXBsYW5lLT5vbGRfZmIgPSBwbGFuZS0+ZmI7CisKKwlpZiAoY3J0Yy0+ ZnVuY3MtPnBhZ2VfZmxpcF90YXJnZXQpCisJCXJldCA9IGNydGMtPmZ1bmNzLT5wYWdlX2ZsaXBf dGFyZ2V0KGNydGMsIGZiLCBlLCBmbGFncywKKwkJCQkJCSAgICB0YXJnZXRfdmJsYW5rLCBjdHgp OworCWVsc2UKKwkJcmV0ID0gY3J0Yy0+ZnVuY3MtPnBhZ2VfZmxpcChjcnRjLCBmYiwgZSwgZmxh Z3MsIGN0eCk7CisKKwlpZiAocmV0KSB7CisJCS8qIEtlZXAgdGhlIG9sZCBmYiwgZG9uJ3QgdW5y ZWYgaXQuICovCisJCXBsYW5lLT5vbGRfZmIgPSBOVUxMOworCX0gZWxzZSB7CisJCXBsYW5lLT5m YiA9IGZiOworCQlkcm1fZnJhbWVidWZmZXJfZ2V0KHBsYW5lLT5mYik7CisJfQorCisJaWYgKHBs YW5lLT5vbGRfZmIpCisJCWRybV9mcmFtZWJ1ZmZlcl9wdXQocGxhbmUtPm9sZF9mYik7CisJcGxh bmUtPm9sZF9mYiA9IE5VTEw7CisKKwlyZXR1cm4gcmV0OworfQorCitzdGF0aWMgaW50IHBhZ2Vf ZmxpcF9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJICAgIHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmZiLAorCQkJICAgIHN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmUs CisJCQkgICAgdTMyIGZsYWdzLAorCQkJICAgIHUzMiB0YXJnZXRfdmJsYW5rLAorCQkJICAgIHN0 cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4KQoreworCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lID0gY3J0Yy0+cHJpbWFyeTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9z dGF0ZSA9IHBsYW5lLT5zdGF0ZTsKKwlpbnQgcmV0OworCisJV0FSTl9PTighZHJtX2Rydl91c2Vz X2F0b21pY19tb2Rlc2V0KGNydGMtPmRldikpOworCisJLyoKKwkgKiBGSVhNRTogQ2FuIHdlIGFz c3VtZSBhbGwgZHJpdmVycyBlbmQgdXAgY2FsbGluZworCSAqIGRybV9hdG9taWNfcGxhbmVfY2hl Y2soKSBpbiB0aGVpciBwYWdlIGZsaXAgcGF0aHM/CisJICogSWYgc28gd2UgY291bGQgcmVtb3Zl IHRoaXMuCisJICovCisJcmV0ID0gZHJtX2ZyYW1lYnVmZmVyX2NoZWNrX3NyY19jb29yZHMocGxh bmVfc3RhdGUtPnNyY194LAorCQkJCQkgICAgICAgcGxhbmVfc3RhdGUtPnNyY195LAorCQkJCQkg ICAgICAgcGxhbmVfc3RhdGUtPnNyY193LAorCQkJCQkgICAgICAgcGxhbmVfc3RhdGUtPnNyY19o LAorCQkJCQkgICAgICAgZmIpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBw YWdlX2ZsaXBfY2hlY2tfZmJzKGZiLCBwbGFuZV9zdGF0ZS0+ZmIpOworCWlmIChyZXQpCisJCXJl dHVybiByZXQ7CisKKwlpZiAoY3J0Yy0+ZnVuY3MtPnBhZ2VfZmxpcF90YXJnZXQpCisJCXJldHVy biBjcnRjLT5mdW5jcy0+cGFnZV9mbGlwX3RhcmdldChjcnRjLCBmYiwgZSwgZmxhZ3MsCisJCQkJ CQkgICAgIHRhcmdldF92YmxhbmssIGN0eCk7CisJZWxzZQorCQlyZXR1cm4gY3J0Yy0+ZnVuY3Mt PnBhZ2VfZmxpcChjcnRjLCBmYiwgZSwgZmxhZ3MsIGN0eCk7Cit9CisKIGludCBkcm1fbW9kZV9w YWdlX2ZsaXBfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgICAgdm9pZCAqZGF0 YSwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CiAJc3RydWN0IGRybV9tb2RlX2NydGNf cGFnZV9mbGlwX3RhcmdldCAqcGFnZV9mbGlwID0gZGF0YTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNy dGM7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIsICpvbGRfZmI7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJc3RydWN0IGRybV9w ZW5kaW5nX3ZibGFua19ldmVudCAqZSA9IE5VTEw7CiAJdTMyIHRhcmdldF92YmxhbmsgPSBwYWdl X2ZsaXAtPnNlcXVlbmNlOwogCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CkBA IC0xMTE0LDY1ICsxMjEzLDE0IEBAIGludCBkcm1fbW9kZV9wYWdlX2ZsaXBfaW9jdGwoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAotCWlmIChwbGFuZS0+ c3RhdGUpCi0JCW9sZF9mYiA9IHBsYW5lLT5zdGF0ZS0+ZmI7Ci0JZWxzZQotCQlvbGRfZmIgPSBw bGFuZS0+ZmI7Ci0KLQlpZiAob2xkX2ZiID09IE5VTEwpIHsKLQkJLyogVGhlIGZyYW1lYnVmZmVy IGlzIGN1cnJlbnRseSB1bmJvdW5kLCBwcmVzdW1hYmx5Ci0JCSAqIGR1ZSB0byBhIGhvdHBsdWcg ZXZlbnQsIHRoYXQgdXNlcnNwYWNlIGhhcyBub3QKLQkJICogeWV0IGRpc2NvdmVyZWQuCi0JCSAq LwotCQlyZXQgPSAtRUJVU1k7Ci0JCWdvdG8gb3V0OwotCX0KLQotCWlmIChwbGFuZS0+c3RhdGUp IHsKLQkJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBwbGFuZS0+c3RhdGU7 Ci0KLQkJcmV0ID0gZHJtX2ZyYW1lYnVmZmVyX2NoZWNrX3NyY19jb29yZHMoc3RhdGUtPnNyY194 LAotCQkJCQkJICAgICAgIHN0YXRlLT5zcmNfeSwKLQkJCQkJCSAgICAgICBzdGF0ZS0+c3JjX3cs Ci0JCQkJCQkgICAgICAgc3RhdGUtPnNyY19oLAotCQkJCQkJICAgICAgIGZiKTsKLQl9IGVsc2Ug ewotCQlyZXQgPSBkcm1fY3J0Y19jaGVja192aWV3cG9ydChjcnRjLCBjcnRjLT54LCBjcnRjLT55 LAotCQkJCQkgICAgICAmY3J0Yy0+bW9kZSwgZmIpOwotCX0KLQlpZiAocmV0KQotCQlnb3RvIG91 dDsKLQotCWlmIChvbGRfZmItPmZvcm1hdCAhPSBmYi0+Zm9ybWF0KSB7Ci0JCURSTV9ERUJVR19L TVMoIlBhZ2UgZmxpcCBpcyBub3QgYWxsb3dlZCB0byBjaGFuZ2UgZnJhbWUgYnVmZmVyIGZvcm1h dC5cbiIpOwotCQlyZXQgPSAtRUlOVkFMOwotCQlnb3RvIG91dDsKLQl9Ci0KLQlwbGFuZS0+b2xk X2ZiID0gcGxhbmUtPmZiOwotCWlmIChjcnRjLT5mdW5jcy0+cGFnZV9mbGlwX3RhcmdldCkKLQkJ cmV0ID0gY3J0Yy0+ZnVuY3MtPnBhZ2VfZmxpcF90YXJnZXQoY3J0YywgZmIsIGUsCi0JCQkJCQkg ICAgcGFnZV9mbGlwLT5mbGFncywKLQkJCQkJCSAgICB0YXJnZXRfdmJsYW5rLAotCQkJCQkJICAg ICZjdHgpOworCWlmIChkcm1fZHJ2X3VzZXNfYXRvbWljX21vZGVzZXQoZGV2KSkKKwkJcmV0ID0g cGFnZV9mbGlwX2F0b21pYyhjcnRjLCBmYiwgZSwgcGFnZV9mbGlwLT5mbGFncywKKwkJCQkgICAg ICAgdGFyZ2V0X3ZibGFuaywgJmN0eCk7CiAJZWxzZQotCQlyZXQgPSBjcnRjLT5mdW5jcy0+cGFn ZV9mbGlwKGNydGMsIGZiLCBlLCBwYWdlX2ZsaXAtPmZsYWdzLAotCQkJCQkgICAgICZjdHgpOwot CWlmIChyZXQpIHsKLQkJLyogS2VlcCB0aGUgb2xkIGZiLCBkb24ndCB1bnJlZiBpdC4gKi8KLQkJ cGxhbmUtPm9sZF9mYiA9IE5VTEw7Ci0JfSBlbHNlIHsKLQkJaWYgKCFwbGFuZS0+c3RhdGUpIHsK LQkJCXBsYW5lLT5mYiA9IGZiOwotCQkJZHJtX2ZyYW1lYnVmZmVyX2dldChmYik7Ci0JCX0KLQl9 CisJCXJldCA9IHBhZ2VfZmxpcF9pbnRlcm5hbChjcnRjLCBmYiwgZSwgcGFnZV9mbGlwLT5mbGFn cywKKwkJCQkJIHRhcmdldF92YmxhbmssICZjdHgpOwogCiBvdXQ6Ci0JaWYgKHBsYW5lLT5vbGRf ZmIpCi0JCWRybV9mcmFtZWJ1ZmZlcl9wdXQocGxhbmUtPm9sZF9mYik7Ci0JcGxhbmUtPm9sZF9m YiA9IE5VTEw7Ci0KIAlpZiAocmV0ID09IC1FREVBRExLKSB7CiAJCXJldCA9IGRybV9tb2Rlc2V0 X2JhY2tvZmYoJmN0eCk7CiAJCWlmICghcmV0KQotLSAKMi4xNi40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK