From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 2/7] drm/atomic: Clean up drm_atomic_helper_async_check Date: Wed, 19 Jul 2017 16:39:15 +0200 Message-ID: <20170719143920.25685-3-maarten.lankhorst@linux.intel.com> References: <20170719143920.25685-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170719143920.25685-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Gustavo Padovan , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW5zdGVhZCBvZiBhc3NpZ25pbmcgcGxhbmUgdG8gX19wbGFuZSwgaXRlcmF0ZSBvdmVyIHBsYW5l CndoaWNoIGlzIHRoZSBzYW1lIHRoaW5nLiBTaW1wbGlmeSB0aGUgY2hlY2sgZm9yIG5fcGxhbmVz ICE9IDEsCmF0IHRoYXQgcG9pbnQgd2Uga25vdyBwbGFuZSAhPSBOVUxMIGFzIHdlbGwuCgpSZW5h bWUgb2JqX3N0YXRlIHRvIG5ld19vYmpfc3RhdGUsIGFuZCBnZXQgcmlkIG9mIHRoZSBib2d1cyBz dHVmZi4KY3J0Yy0+c3RhdGUtPnN0YXRlIGlzIE5FVkVSIG5vbi1udWxsLCBpZiBpdCBpcywgdGhl cmUgaXMgYSBidWcuCldlIHNob3VsZCBkZWZpbml0ZWx5IHRyeSB0byBwcmV2ZW50IGFzeW5jIHVw ZGF0ZXMgaWYgdGhlcmUgYXJlIGZsaXBzCnF1ZXVlZCwgYnV0IHRoaXMgY29kZSB3aWxsIHNpbXBs eSBub3QgYmUgZXhlY3V0ZWQgYW5kIG5lZWRzIHRvIGJlCnJldGhvdWdodC4KCkFsc28gcmVtb3Zl IHRoZSBsb29wIHRvbywgYmVjYXVzZSB3ZSdyZSB0cnlpbmcgdG8gbG9vcCBvdmVyIHRoZSBjcnRj IHVudGlsCndlIGZpbmQgcGxhbmVfc3RhdGUtPmNydGMgPT0gY3J0Yywgd2hpY2ggd2UgYWxyZWFk eSBrbm93IGlzIG5vbi16ZXJvLgpJdCdzIGRlYWQgY29kZSBhbnl3YXkuIDopCgpTaWduZWQtb2Zm LWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgpDYzogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDU2ICsrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCsp LCA0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IGE0 NmI1MTI5MTAwNi4uYzUzODUyOGE3OTRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YwpAQCAtMTM3Miw2OCArMTM3Miw0MiBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfYXN5bmNfY2hl Y2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZTsKLQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7Ci0Jc3Ry dWN0IGRybV9wbGFuZSAqX19wbGFuZSwgKnBsYW5lID0gTlVMTDsKLQlzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpfX3BsYW5lX3N0YXRlLCAqcGxhbmVfc3RhdGUgPSBOVUxMOworCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CisJ c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlOwogCWNvbnN0IHN0cnVjdCBk cm1fcGxhbmVfaGVscGVyX2Z1bmNzICpmdW5jczsKLQlpbnQgaSwgaiwgbl9wbGFuZXMgPSAwOwor CWludCBpLCBuX3BsYW5lcyA9IDA7CiAKLQlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0 ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlpZiAoZHJtX2F0b21pY19jcnRjX25lZWRzX21v ZGVzZXQoY3J0Y19zdGF0ZSkpCisJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy dGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCWlmIChkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9k ZXNldChuZXdfY3J0Y19zdGF0ZSkpCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlmb3JfZWFj aF9uZXdfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIF9fcGxhbmUsIF9fcGxhbmVfc3RhdGUsIGkpIHsK Kwlmb3JfZWFjaF9uZXdfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBuZXdfcGxhbmVfc3Rh dGUsIGkpCiAJCW5fcGxhbmVzKys7Ci0JCXBsYW5lID0gX19wbGFuZTsKLQkJcGxhbmVfc3RhdGUg PSBfX3BsYW5lX3N0YXRlOwotCX0KIAogCS8qIEZJWE1FOiB3ZSBzdXBwb3J0IG9ubHkgc2luZ2xl IHBsYW5lIHVwZGF0ZXMgZm9yIG5vdyAqLwotCWlmICghcGxhbmUgfHwgbl9wbGFuZXMgIT0gMSkK KwlpZiAobl9wbGFuZXMgIT0gMSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlpZiAoIXBsYW5lX3N0 YXRlLT5jcnRjKQorCWlmICghbmV3X3BsYW5lX3N0YXRlLT5jcnRjKQogCQlyZXR1cm4gLUVJTlZB TDsKIAogCWZ1bmNzID0gcGxhbmUtPmhlbHBlcl9wcml2YXRlOwogCWlmICghZnVuY3MtPmF0b21p Y19hc3luY191cGRhdGUpCiAJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKHBsYW5lX3N0YXRlLT5m ZW5jZSkKKwlpZiAobmV3X3BsYW5lX3N0YXRlLT5mZW5jZSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAK IAkvKgotCSAqIERvbid0IGRvIGFuIGFzeW5jIHVwZGF0ZSBpZiB0aGVyZSBpcyBhbiBvdXRzdGFu ZGluZyBjb21taXQgbW9kaWZ5aW5nCi0JICogdGhlIHBsYW5lLiAgVGhpcyBwcmV2ZW50cyBvdXIg YXN5bmMgdXBkYXRlJ3MgY2hhbmdlcyBmcm9tIGdldHRpbmcKLQkgKiBvdmVycmlkZGVuIGJ5IGEg cHJldmlvdXMgc3luY2hyb25vdXMgdXBkYXRlJ3Mgc3RhdGUuCisJICogRklYTUU6IFdlIHNob3Vs ZCBwcmV2ZW50IGFuIGFzeW5jIHVwZGF0ZSBpZiB0aGVyZSBpcyBhbiBvdXRzdGFuZGluZworCSAq IGNvbW1pdCBtb2RpZnlpbmcgdGhlIHBsYW5lLiAgVGhpcyBwcmV2ZW50cyBvdXIgYXN5bmMgdXBk YXRlJ3MKKwkgKiBjaGFuZ2VzIGZyb20gZ2V0dGluZyBvdmVyd3JpdHRlbiBieSBhIHByZXZpb3Vz IHN5bmNocm9ub3VzIHVwZGF0ZSdzCisJICogc3RhdGUuCiAJICovCi0JZm9yX2VhY2hfbmV3X2Ny dGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJaWYgKHBsYW5lLT5j cnRjICE9IGNydGMpCi0JCQljb250aW51ZTsKLQotCQlzcGluX2xvY2soJmNydGMtPmNvbW1pdF9s b2NrKTsKLQkJY29tbWl0ID0gbGlzdF9maXJzdF9lbnRyeV9vcl9udWxsKCZjcnRjLT5jb21taXRf bGlzdCwKLQkJCQkJCSAgc3RydWN0IGRybV9jcnRjX2NvbW1pdCwKLQkJCQkJCSAgY29tbWl0X2Vu dHJ5KTsKLQkJaWYgKCFjb21taXQpIHsKLQkJCXNwaW5fdW5sb2NrKCZjcnRjLT5jb21taXRfbG9j ayk7Ci0JCQljb250aW51ZTsKLQkJfQotCQlzcGluX3VubG9jaygmY3J0Yy0+Y29tbWl0X2xvY2sp OwotCi0JCWlmICghY3J0Yy0+c3RhdGUtPnN0YXRlKQotCQkJY29udGludWU7Ci0KLQkJZm9yX2Vh Y2hfcGxhbmVfaW5fc3RhdGUoY3J0Yy0+c3RhdGUtPnN0YXRlLCBfX3BsYW5lLAotCQkJCQlfX3Bs YW5lX3N0YXRlLCBqKSB7Ci0JCQlpZiAoX19wbGFuZSA9PSBwbGFuZSkKLQkJCQlyZXR1cm4gLUVJ TlZBTDsKLQkJfQotCX0KIAotCXJldHVybiBmdW5jcy0+YXRvbWljX2FzeW5jX2NoZWNrKHBsYW5l LCBwbGFuZV9zdGF0ZSk7CisJcmV0dXJuIGZ1bmNzLT5hdG9taWNfYXN5bmNfY2hlY2socGxhbmUs IG5ld19wbGFuZV9zdGF0ZSk7CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX2Fz eW5jX2NoZWNrKTsKIAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK