From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 01/13] drm/i915: Clean up intel_plane_atomic_check_with_state() Date: Fri, 11 Jan 2019 19:08:11 +0200 Message-ID: <20190111170823.4441-2-ville.syrjala@linux.intel.com> References: <20190111170823.4441-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id E01186F877 for ; Fri, 11 Jan 2019 17:08:30 +0000 (UTC) In-Reply-To: <20190111170823.4441-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl bmFtZSBzb21lIG9mIHRoZSBzdGF0ZSB2YXJpYWJsZXMgaW4KaW50ZWxfcGxhbmVfYXRvbWljX2No ZWNrX3dpdGhfc3RhdGUoKSB0byBtYWtlIGl0IGxlc3MgY29uZnVzaW5nLgoKU2lnbmVkLW9mZi1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8IDM2ICsrKysrKysrKysr LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCA2 ODNhNzVkYWQ0ZmIuLjUwYmUyYzVkZDc2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljX3BsYW5lLmMKQEAgLTExMCw0MSArMTEwLDM5IEBAIGludGVsX3BsYW5lX2Rlc3Ryb3lf c3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiB9CiAKIGludCBpbnRlbF9wbGFuZV9hdG9t aWNfY2hlY2tfd2l0aF9zdGF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhdGUsCi0JCQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJ CQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUsCiAJCQkJCWNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLAotCQkJCQlzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRlKQorCQkJCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKm5ld19wbGFuZV9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IGludGVs X3N0YXRlLT5iYXNlLnBsYW5lOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlID0gJmlu dGVsX3N0YXRlLT5iYXNlOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19p bnRlbF9wbGFuZShwbGFuZSk7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVs X3BsYW5lKG5ld19wbGFuZV9zdGF0ZS0+YmFzZS5wbGFuZSk7CiAJaW50IHJldDsKIAotCWNydGNf c3RhdGUtPmFjdGl2ZV9wbGFuZXMgJj0gfkJJVChpbnRlbF9wbGFuZS0+aWQpOwotCWNydGNfc3Rh dGUtPm52MTJfcGxhbmVzICY9IH5CSVQoaW50ZWxfcGxhbmUtPmlkKTsKLQlpbnRlbF9zdGF0ZS0+ YmFzZS52aXNpYmxlID0gZmFsc2U7CisJbmV3X2NydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMgJj0g fkJJVChwbGFuZS0+aWQpOworCW5ld19jcnRjX3N0YXRlLT5udjEyX3BsYW5lcyAmPSB+QklUKHBs YW5lLT5pZCk7CisJbmV3X3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUgPSBmYWxzZTsKIAotCS8q IElmIHRoaXMgaXMgYSBjdXJzb3IgcGxhbmUsIG5vIGZ1cnRoZXIgY2hlY2tzIGFyZSBuZWVkZWQu ICovCi0JaWYgKCFpbnRlbF9zdGF0ZS0+YmFzZS5jcnRjICYmICFvbGRfcGxhbmVfc3RhdGUtPmJh c2UuY3J0YykKKwlpZiAoIW5ld19wbGFuZV9zdGF0ZS0+YmFzZS5jcnRjICYmICFvbGRfcGxhbmVf c3RhdGUtPmJhc2UuY3J0YykKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBpbnRlbF9wbGFuZS0+Y2hl Y2tfcGxhbmUoY3J0Y19zdGF0ZSwgaW50ZWxfc3RhdGUpOworCXJldCA9IHBsYW5lLT5jaGVja19w bGFuZShuZXdfY3J0Y19zdGF0ZSwgbmV3X3BsYW5lX3N0YXRlKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCiAJLyogRklYTUUgcHJlLWc0eCBkb24ndCB3b3JrIGxpa2UgdGhpcyAqLwotCWlm IChzdGF0ZS0+dmlzaWJsZSkKLQkJY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyB8PSBCSVQoaW50 ZWxfcGxhbmUtPmlkKTsKKwlpZiAobmV3X3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpCisJCW5l d19jcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzIHw9IEJJVChwbGFuZS0+aWQpOwogCi0JaWYgKHN0 YXRlLT52aXNpYmxlICYmIHN0YXRlLT5mYi0+Zm9ybWF0LT5mb3JtYXQgPT0gRFJNX0ZPUk1BVF9O VjEyKQotCQljcnRjX3N0YXRlLT5udjEyX3BsYW5lcyB8PSBCSVQoaW50ZWxfcGxhbmUtPmlkKTsK KwlpZiAobmV3X3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUgJiYKKwkgICAgbmV3X3BsYW5lX3N0 YXRlLT5iYXNlLmZiLT5mb3JtYXQtPmZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpCisJCW5ld19j cnRjX3N0YXRlLT5udjEyX3BsYW5lcyB8PSBCSVQocGxhbmUtPmlkKTsKIAotCWlmIChzdGF0ZS0+ dmlzaWJsZSB8fCBvbGRfcGxhbmVfc3RhdGUtPmJhc2UudmlzaWJsZSkKLQkJY3J0Y19zdGF0ZS0+ dXBkYXRlX3BsYW5lcyB8PSBCSVQoaW50ZWxfcGxhbmUtPmlkKTsKKwlpZiAobmV3X3BsYW5lX3N0 YXRlLT5iYXNlLnZpc2libGUgfHwgb2xkX3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpCisJCW5l d19jcnRjX3N0YXRlLT51cGRhdGVfcGxhbmVzIHw9IEJJVChwbGFuZS0+aWQpOwogCiAJcmV0dXJu IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMob2xkX2NydGNfc3RhdGUsCi0JCQkJCSAg ICAgICAmY3J0Y19zdGF0ZS0+YmFzZSwKKwkJCQkJICAgICAgICZuZXdfY3J0Y19zdGF0ZS0+YmFz ZSwKIAkJCQkJICAgICAgIG9sZF9wbGFuZV9zdGF0ZSwKLQkJCQkJICAgICAgIHN0YXRlKTsKKwkJ CQkJICAgICAgICZuZXdfcGxhbmVfc3RhdGUtPmJhc2UpOwogfQogCiBzdGF0aWMgaW50IGludGVs X3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLS0gCjIuMTkuMgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==