From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville Syrjala <ville.syrjala@linux.intel.com>
Subject: [PATCH 2/3] drm/atomic: Use explicit old/new state in
 drm_atomic_crtc_check()
Date: Thu,  1 Nov 2018 20:46:45 +0200
Message-ID: <20181101184646.14753-2-ville.syrjala@linux.intel.com>
References: <20181101184646.14753-1-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <20181101184646.14753-1-ville.syrjala@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNv
bnZlcnQgZHJtX2F0b21pY19jcnRjX2NoZWNrKCkgb3ZlciB0byB1c2luZyBleHBsaWNpdCBvbGQg
dnMuIG5ldwpjcnRjIHN0YXRlcy4gQXZvaWRzIHRoZSBjb25mdXNpb24gb2YgIndoYXQgZG9lcyBj
cnRjLT5zdGF0ZSBtZWFuCmFnYWluPyIuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6Qg
PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1f
YXRvbWljLmMgfCAyNiArKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs
IDE1IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCmluZGV4
IDA2NGM0ODA3NTkxNy4uZGRlNjk2MTgxZWZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
ZHJtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKQEAgLTMxNSw5
ICszMTUsMTEgQEAgZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19z
dGF0ZSAqc3RhdGUsCiB9CiBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUp
OwogCi1zdGF0aWMgaW50IGRybV9hdG9taWNfY3J0Y19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNy
dGMsCi0JCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCitzdGF0aWMgaW50IGRybV9hdG9t
aWNfY3J0Y19jaGVjayhjb25zdCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl
LAorCQkJCSBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlKQogewor
CXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IG5ld19jcnRjX3N0YXRlLT5jcnRjOworCiAJLyogTk9U
RTogd2UgZXhwbGljaXRseSBkb24ndCBlbmZvcmNlIGNvbnN0cmFpbnRzIHN1Y2ggYXMgcHJpbWFy
eQogCSAqIGxheWVyIGNvdmVyaW5nIGVudGlyZSBzY3JlZW4sIHNpbmNlIHRoYXQgaXMgc29tZXRo
aW5nIHdlIHdhbnQKIAkgKiB0byBhbGxvdyAob24gaHcgdGhhdCBzdXBwb3J0cyBpdCkuICBGb3Ig
aHcgdGhhdCBkb2VzIG5vdCwgaXQKQEAgLTMyNiw3ICszMjgsNyBAQCBzdGF0aWMgaW50IGRybV9h
dG9taWNfY3J0Y19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICogVE9ETzogQWRkIGdl
bmVyaWMgbW9kZXNldCBzdGF0ZSBjaGVja3Mgb25jZSB3ZSBzdXBwb3J0IHRob3NlLgogCSAqLwog
Ci0JaWYgKHN0YXRlLT5hY3RpdmUgJiYgIXN0YXRlLT5lbmFibGUpIHsKKwlpZiAobmV3X2NydGNf
c3RhdGUtPmFjdGl2ZSAmJiAhbmV3X2NydGNfc3RhdGUtPmVuYWJsZSkgewogCQlEUk1fREVCVUdf
QVRPTUlDKCJbQ1JUQzolZDolc10gYWN0aXZlIHdpdGhvdXQgZW5hYmxlZFxuIiwKIAkJCQkgY3J0
Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMzM2LDE0ICsz
MzgsMTQgQEAgc3RhdGljIGludCBkcm1fYXRvbWljX2NydGNfY2hlY2soc3RydWN0IGRybV9jcnRj
ICpjcnRjLAogCSAqIGFzIHRoaXMgaXMgYSBrZXJuZWwtaW50ZXJuYWwgZGV0YWlsIHRoYXQgdXNl
cnNwYWNlIHNob3VsZCBuZXZlcgogCSAqIGJlIGFibGUgdG8gdHJpZ2dlci4gKi8KIAlpZiAoZHJt
X2NvcmVfY2hlY2tfZmVhdHVyZShjcnRjLT5kZXYsIERSSVZFUl9BVE9NSUMpICYmCi0JICAgIFdB
Uk5fT04oc3RhdGUtPmVuYWJsZSAmJiAhc3RhdGUtPm1vZGVfYmxvYikpIHsKKwkgICAgV0FSTl9P
TihuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlICYmICFuZXdfY3J0Y19zdGF0ZS0+bW9kZV9ibG9iKSkg
ewogCQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gZW5hYmxlZCB3aXRob3V0IG1vZGUg
YmxvYlxuIiwKIAkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CiAJCXJldHVybiAtRUlO
VkFMOwogCX0KIAogCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGNydGMtPmRldiwgRFJJVkVS
X0FUT01JQykgJiYKLQkgICAgV0FSTl9PTighc3RhdGUtPmVuYWJsZSAmJiBzdGF0ZS0+bW9kZV9i
bG9iKSkgeworCSAgICBXQVJOX09OKCFuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlICYmIG5ld19jcnRj
X3N0YXRlLT5tb2RlX2Jsb2IpKSB7CiAJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVzXSBk
aXNhYmxlZCB3aXRoIG1vZGUgYmxvYlxuIiwKIAkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFt
ZSk7CiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMzU5LDcgKzM2MSw4IEBAIHN0YXRpYyBpbnQgZHJt
X2F0b21pY19jcnRjX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKiBhbmQgbGVnYWN5
IHBhZ2VfZmxpcCBJT0NUTCB3aGljaCBhbHNvIHJlamVjdCBzZXJ2aWNlIG9uIGEgZGlzYWJsZWQK
IAkgKiBwaXBlLgogCSAqLwotCWlmIChzdGF0ZS0+ZXZlbnQgJiYgIXN0YXRlLT5hY3RpdmUgJiYg
IWNydGMtPnN0YXRlLT5hY3RpdmUpIHsKKwlpZiAobmV3X2NydGNfc3RhdGUtPmV2ZW50ICYmCisJ
ICAgICFuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlICYmICFvbGRfY3J0Y19zdGF0ZS0+YWN0aXZlKSB7
CiAJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVzXSByZXF1ZXN0aW5nIGV2ZW50IGJ1dCBv
ZmZcbiIsCiAJCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwogCQlyZXR1cm4gLUVJTlZB
TDsKQEAgLTk2NSw3ICs5NjgsOCBAQCBpbnQgZHJtX2F0b21pY19jaGVja19vbmx5KHN0cnVjdCBk
cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlzdHJ1
Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7
Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19z
dGF0ZSAqb2xkX2NydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19z
dGF0ZTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv
cl9zdGF0ZSAqY29ubl9zdGF0ZTsKIAlpbnQgaSwgcmV0ID0gMDsKQEAgLTk4MSw4ICs5ODUsOCBA
QCBpbnQgZHJtX2F0b21pY19jaGVja19vbmx5KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0
ZSkKIAkJfQogCX0KIAotCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBj
cnRjX3N0YXRlLCBpKSB7Ci0JCXJldCA9IGRybV9hdG9taWNfY3J0Y19jaGVjayhjcnRjLCBjcnRj
X3N0YXRlKTsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xk
X2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCXJldCA9IGRybV9hdG9taWNfY3J0
Y19jaGVjayhvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUpOwogCQlpZiAocmV0KSB7CiAJ
CQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gYXRvbWljIGNvcmUgY2hlY2sgZmFpbGVk
XG4iLAogCQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CkBAIC0xMDEwLDggKzEwMTQs
OCBAQCBpbnQgZHJtX2F0b21pY19jaGVja19vbmx5KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz
dGF0ZSkKIAl9CiAKIAlpZiAoIXN0YXRlLT5hbGxvd19tb2Rlc2V0KSB7Ci0JCWZvcl9lYWNoX25l
d19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0JCQlpZiAoZHJt
X2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpIHsKKwkJZm9yX2VhY2hfbmV3
X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCQlpZiAo
ZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpKSB7CiAJCQkJRFJN
X0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIHJlcXVpcmVzIGZ1bGwgbW9kZXNldFxuIiwKIAkJ
CQkJCSBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKIAkJCQlyZXR1cm4gLUVJTlZBTDsKLS0g
CjIuMTguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K
SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0
dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==