From: Ville Syrjala Subject: [PATCH 4/4] drm: Simplify the setplane/pageflip old_fb handling further Date: Fri, 13 Jul 2018 18:50:35 +0300 Message-ID: <20180713155035.3866-4-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklu c3RlYWQgb2YgZG9pbmcgdGhlIHRoaW5ncyBpbiBhIGNvbnZvbHV0ZWQgd2F5IHdpdGggdGhlIGZh aWx1cmUgYW5kCnN1Y2Nlc3MgcGF0aHMgbWl4ZWQgdXAgbGV0J3MganVzdCBjbGVhciBvbGRfZmIg d2hlbiB3ZSBlbmNvdW50ZXIgYW4KZXJyb3IgYW5kIGJhaWwgb3V0IGltbWVkaWF0ZWx5LgoKU2ln bmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgfCAzMiArKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwppbmRleCBlM2YyZGRmN2RlYWUuLjQwNmYxMTI4MWQ2 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1fcGxhbmUuYwpAQCAtNjU1LDEyICs2NTUsMTMgQEAgc3RhdGljIGludCBfX3Nl dHBsYW5lX2ludGVybmFsKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmICghZmIpIHsKIAkJ cGxhbmUtPm9sZF9mYiA9IHBsYW5lLT5mYjsKIAkJcmV0ID0gcGxhbmUtPmZ1bmNzLT5kaXNhYmxl X3BsYW5lKHBsYW5lLCBjdHgpOwotCQlpZiAoIXJldCkgewotCQkJcGxhbmUtPmNydGMgPSBOVUxM OwotCQkJcGxhbmUtPmZiID0gTlVMTDsKLQkJfSBlbHNlIHsKKwkJaWYgKHJldCkgewogCQkJcGxh bmUtPm9sZF9mYiA9IE5VTEw7CisJCQlyZXR1cm4gcmV0OwogCQl9CisKKwkJcGxhbmUtPmNydGMg PSBOVUxMOworCQlwbGFuZS0+ZmIgPSBOVUxMOwogCQlnb3RvIG91dDsKIAl9CiAKQEAgLTY2OCwy MCArNjY5LDIyIEBAIHN0YXRpYyBpbnQgX19zZXRwbGFuZV9pbnRlcm5hbChzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAkJCSAgICAgICBjcnRjX3gsIGNydGNfeSwgY3J0Y193LCBjcnRjX2gsCiAJ CQkgICAgICAgc3JjX3gsIHNyY195LCBzcmNfdywgc3JjX2gpOwogCWlmIChyZXQpCi0JCWdvdG8g b3V0OworCQlyZXR1cm4gcmV0OwogCiAJcGxhbmUtPm9sZF9mYiA9IHBsYW5lLT5mYjsKKwogCXJl dCA9IHBsYW5lLT5mdW5jcy0+dXBkYXRlX3BsYW5lKHBsYW5lLCBjcnRjLCBmYiwKIAkJCQkJIGNy dGNfeCwgY3J0Y195LCBjcnRjX3csIGNydGNfaCwKIAkJCQkJIHNyY194LCBzcmNfeSwgc3JjX3cs IHNyY19oLCBjdHgpOwotCWlmICghcmV0KSB7Ci0JCXBsYW5lLT5jcnRjID0gY3J0YzsKLQkJcGxh bmUtPmZiID0gZmI7Ci0JCWRybV9mcmFtZWJ1ZmZlcl9nZXQocGxhbmUtPmZiKTsKLQl9IGVsc2Ug eworCWlmIChyZXQpIHsKIAkJcGxhbmUtPm9sZF9mYiA9IE5VTEw7CisJCXJldHVybiByZXQ7CiAJ fQogCisJcGxhbmUtPmNydGMgPSBjcnRjOworCXBsYW5lLT5mYiA9IGZiOworCWRybV9mcmFtZWJ1 ZmZlcl9nZXQocGxhbmUtPmZiKTsKKwogb3V0OgogCWlmIChwbGFuZS0+b2xkX2ZiKQogCQlkcm1f ZnJhbWVidWZmZXJfcHV0KHBsYW5lLT5vbGRfZmIpOwpAQCAtMTA0OSwxNSArMTA1MiwxNCBAQCBz dGF0aWMgaW50IHBhZ2VfZmxpcF9pbnRlcm5hbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJ CQkgICAgdGFyZ2V0X3ZibGFuaywgY3R4KTsKIAllbHNlCiAJCXJldCA9IGNydGMtPmZ1bmNzLT5w YWdlX2ZsaXAoY3J0YywgZmIsIGUsIGZsYWdzLCBjdHgpOwotCiAJaWYgKHJldCkgewotCQkvKiBL ZWVwIHRoZSBvbGQgZmIsIGRvbid0IHVucmVmIGl0LiAqLwogCQlwbGFuZS0+b2xkX2ZiID0gTlVM TDsKLQl9IGVsc2UgewotCQlwbGFuZS0+ZmIgPSBmYjsKLQkJZHJtX2ZyYW1lYnVmZmVyX2dldChw bGFuZS0+ZmIpOworCQlyZXR1cm4gcmV0OwogCX0KIAorCXBsYW5lLT5mYiA9IGZiOworCWRybV9m cmFtZWJ1ZmZlcl9nZXQocGxhbmUtPmZiKTsKKwogCWlmIChwbGFuZS0+b2xkX2ZiKQogCQlkcm1f ZnJhbWVidWZmZXJfcHV0KHBsYW5lLT5vbGRfZmIpOwogCXBsYW5lLT5vbGRfZmIgPSBOVUxMOwot LSAKMi4xNi40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK