From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hyungwon Hwang Subject: [PATCH 2/6] xf86drmMode: separate drmModeAtomicCommit() and drmModeAtomicCleanup() Date: Wed, 19 Aug 2015 09:58:40 +0900 Message-ID: <1439945924-22630-2-git-send-email-human.hwang@samsung.com> References: <1439945924-22630-1-git-send-email-human.hwang@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39B106E723 for ; Tue, 18 Aug 2015 17:58:53 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NTB02K571E3WU40@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 19 Aug 2015 09:58:51 +0900 (KST) In-reply-to: <1439945924-22630-1-git-send-email-human.hwang@samsung.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, human.hwang@samsung.com List-Id: dri-devel@lists.freedesktop.org VGhpcyBwYXRjaCBzZXByYXRlcyB0aGUgY29kZSwgd2hpY2ggc29ydHMgcHJvcHJ0eSBzZXRzIGFu ZCBlbGltaW5hdGVzCmR1cGxpY2F0ZSBwcm9wZXJ0aWVzLCBmcm9tIGRybU1vZGVBdG9taWNDb21t aXQoKS4gTm93CmRybU1vZGVBdG9taWNDbGVhbnVwKCkgaGFzIHRvIGRvIHRoZSBqb2IgYmVmb3Jl IGNhbGxpbmcKZHJtTW9kZUF0b21pY0NvbW1pdCgpLCBhbmQgZHJtTW9kZUF0b21pY0NvbW1pdCgp IGp1c3QgY29udmVydHMgdGhlIGNsZWFuZWQKcmVxdWVzdCB0byBJT0NUTCBhcmd1bWVudC4KClNp Z25lZC1vZmYtYnk6IEh5dW5nd29uIEh3YW5nIDxodW1hbi5od2FuZ0BzYW1zdW5nLmNvbT4KLS0t CiB4Zjg2ZHJtTW9kZS5jIHwgNzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhmODZkcm1Nb2RlLmggfCAgMSArCiAyIGZpbGVzIGNo YW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hm ODZkcm1Nb2RlLmMgYi94Zjg2ZHJtTW9kZS5jCmluZGV4IGQ0ZWQ1YzEuLjgyYzRjOTEgMTAwNjQ0 Ci0tLSBhL3hmODZkcm1Nb2RlLmMKKysrIGIveGY4NmRybU1vZGUuYwpAQCAtMTMwMywxMCArMTMw MywzOSBAQCBzdGF0aWMgaW50IHNvcnRfcmVxX2xpc3QoY29uc3Qgdm9pZCAqbWlzYywgY29uc3Qg dm9pZCAqb3RoZXIpCiAJCXJldHVybiBzZWNvbmQtPnByb3BlcnR5X2lkIC0gZmlyc3QtPnByb3Bl cnR5X2lkOwogfQogCit2b2lkIGRybU1vZGVBdG9taWNDbGVhbnVwKGRybU1vZGVBdG9taWNSZXFQ dHIgcmVxKQoreworCXVpbnQzMl90IGxhc3Rfb2JqX2lkID0gMDsKKwl1aW50MzJfdCBpOworCisJ aWYgKHJlcS0+Y3Vyc29yID09IDApCisJCXJldHVybjsKKworCS8qIFNvcnQgdGhlIGxpc3QgYnkg b2JqZWN0IElELCB0aGVuIGJ5IHByb3BlcnR5IElELiAqLworCXFzb3J0KHJlcS0+aXRlbXMsIHJl cS0+Y3Vyc29yLCBzaXplb2YoKnJlcS0+aXRlbXMpLAorCSAgICAgIHNvcnRfcmVxX2xpc3QpOwor CisJLyogRWxpbWluYXRlIGR1cGxpY2F0ZSBwcm9wZXJ0eSBzZXRzLiAqLworCWZvciAoaSA9IDA7 IGkgPCByZXEtPmN1cnNvcjsgaSsrKSB7CisJCWlmIChyZXEtPml0ZW1zW2ldLm9iamVjdF9pZCAh PSBsYXN0X29ial9pZCkKKwkJCWxhc3Rfb2JqX2lkID0gcmVxLT5pdGVtc1tpXS5vYmplY3RfaWQ7 CisKKwkJaWYgKGkgPT0gcmVxLT5jdXJzb3IgLSAxKQorCQkJY29udGludWU7CisKKwkJaWYgKHJl cS0+aXRlbXNbaV0ub2JqZWN0X2lkICE9IHJlcS0+aXRlbXNbaSArIDFdLm9iamVjdF9pZCB8fAor CQkgICAgcmVxLT5pdGVtc1tpXS5wcm9wZXJ0eV9pZCAhPSByZXEtPml0ZW1zW2kgKyAxXS5wcm9w ZXJ0eV9pZCkKKwkJCWNvbnRpbnVlOworCisJCW1lbW1vdmUoJnJlcS0+aXRlbXNbaV0sICZyZXEt Pml0ZW1zW2kgKyAxXSwKKwkJCShyZXEtPmN1cnNvciAtIGkgLSAxKSAqIHNpemVvZigqcmVxLT5p dGVtcykpOworCQlyZXEtPmN1cnNvci0tOworCX0KK30KKwogaW50IGRybU1vZGVBdG9taWNDb21t aXQoaW50IGZkLCBkcm1Nb2RlQXRvbWljUmVxUHRyIHJlcSwgdWludDMyX3QgZmxhZ3MsCiAJCQl2 b2lkICp1c2VyX2RhdGEpCiB7Ci0JZHJtTW9kZUF0b21pY1JlcVB0ciBzb3J0ZWQ7CiAJc3RydWN0 IGRybV9tb2RlX2F0b21pYyBhdG9taWM7CiAJdWludDMyX3QgKm9ianNfcHRyID0gTlVMTDsKIAl1 aW50MzJfdCAqY291bnRfcHJvcHNfcHRyID0gTlVMTDsKQEAgLTEzMjAsMzMgKzEzNDksMTMgQEAg aW50IGRybU1vZGVBdG9taWNDb21taXQoaW50IGZkLCBkcm1Nb2RlQXRvbWljUmVxUHRyIHJlcSwg dWludDMyX3QgZmxhZ3MsCiAJaWYgKHJlcS0+Y3Vyc29yID09IDApCiAJCXJldHVybiAwOwogCi0J c29ydGVkID0gZHJtTW9kZUF0b21pY0R1cGxpY2F0ZShyZXEpOwotCWlmIChzb3J0ZWQgPT0gTlVM TCkKLQkJcmV0dXJuIC1FTk9NRU07Ci0KIAltZW1jbGVhcihhdG9taWMpOwogCi0JLyogU29ydCB0 aGUgbGlzdCBieSBvYmplY3QgSUQsIHRoZW4gYnkgcHJvcGVydHkgSUQuICovCi0JcXNvcnQoc29y dGVkLT5pdGVtcywgc29ydGVkLT5jdXJzb3IsIHNpemVvZigqc29ydGVkLT5pdGVtcyksCi0JICAg ICAgc29ydF9yZXFfbGlzdCk7Ci0KLQkvKiBOb3cgdGhlIGxpc3QgaXMgc29ydGVkLCBlbGltaW5h dGUgZHVwbGljYXRlIHByb3BlcnR5IHNldHMuICovCi0JZm9yIChpID0gMDsgaSA8IHNvcnRlZC0+ Y3Vyc29yOyBpKyspIHsKLQkJaWYgKHNvcnRlZC0+aXRlbXNbaV0ub2JqZWN0X2lkICE9IGxhc3Rf b2JqX2lkKSB7CisJZm9yIChpID0gMDsgaSA8IHJlcS0+Y3Vyc29yOyBpKyspIHsKKwkJaWYgKHJl cS0+aXRlbXNbaV0ub2JqZWN0X2lkICE9IGxhc3Rfb2JqX2lkKSB7CiAJCQlhdG9taWMuY291bnRf b2JqcysrOwotCQkJbGFzdF9vYmpfaWQgPSBzb3J0ZWQtPml0ZW1zW2ldLm9iamVjdF9pZDsKKwkJ CWxhc3Rfb2JqX2lkID0gcmVxLT5pdGVtc1tpXS5vYmplY3RfaWQ7CiAJCX0KLQotCQlpZiAoaSA9 PSBzb3J0ZWQtPmN1cnNvciAtIDEpCi0JCQljb250aW51ZTsKLQotCQlpZiAoc29ydGVkLT5pdGVt c1tpXS5vYmplY3RfaWQgIT0gc29ydGVkLT5pdGVtc1tpICsgMV0ub2JqZWN0X2lkIHx8Ci0JCSAg ICBzb3J0ZWQtPml0ZW1zW2ldLnByb3BlcnR5X2lkICE9IHNvcnRlZC0+aXRlbXNbaSArIDFdLnBy b3BlcnR5X2lkKQotCQkJY29udGludWU7Ci0KLQkJbWVtbW92ZSgmc29ydGVkLT5pdGVtc1tpXSwg JnNvcnRlZC0+aXRlbXNbaSArIDFdLAotCQkJKHNvcnRlZC0+Y3Vyc29yIC0gaSAtIDEpICogc2l6 ZW9mKCpzb3J0ZWQtPml0ZW1zKSk7Ci0JCXNvcnRlZC0+Y3Vyc29yLS07CiAJfQogCiAJb2Jqc19w dHIgPSBkcm1NYWxsb2MoYXRvbWljLmNvdW50X29ianMgKiBzaXplb2Ygb2Jqc19wdHJbMF0pOwpA QCAtMTM2MSwyOCArMTM3MCwyOCBAQCBpbnQgZHJtTW9kZUF0b21pY0NvbW1pdChpbnQgZmQsIGRy bU1vZGVBdG9taWNSZXFQdHIgcmVxLCB1aW50MzJfdCBmbGFncywKIAkJZ290byBvdXQ7CiAJfQog Ci0JcHJvcHNfcHRyID0gZHJtTWFsbG9jKHNvcnRlZC0+Y3Vyc29yICogc2l6ZW9mIHByb3BzX3B0 clswXSk7CisJcHJvcHNfcHRyID0gZHJtTWFsbG9jKHJlcS0+Y3Vyc29yICogc2l6ZW9mIHByb3Bz X3B0clswXSk7CiAJaWYgKCFwcm9wc19wdHIpIHsKIAkJZXJybm8gPSBFTk9NRU07CiAJCWdvdG8g b3V0OwogCX0KIAotCXByb3BfdmFsdWVzX3B0ciA9IGRybU1hbGxvYyhzb3J0ZWQtPmN1cnNvciAq IHNpemVvZiBwcm9wX3ZhbHVlc19wdHJbMF0pOworCXByb3BfdmFsdWVzX3B0ciA9IGRybU1hbGxv YyhyZXEtPmN1cnNvciAqIHNpemVvZiBwcm9wX3ZhbHVlc19wdHJbMF0pOwogCWlmICghcHJvcF92 YWx1ZXNfcHRyKSB7CiAJCWVycm5vID0gRU5PTUVNOwogCQlnb3RvIG91dDsKIAl9CiAKLQlmb3Ig KGkgPSAwLCBsYXN0X29ial9pZCA9IDA7IGkgPCBzb3J0ZWQtPmN1cnNvcjsgaSsrKSB7Ci0JCWlm IChzb3J0ZWQtPml0ZW1zW2ldLm9iamVjdF9pZCAhPSBsYXN0X29ial9pZCkgeworCWZvciAoaSA9 IDAsIGxhc3Rfb2JqX2lkID0gMDsgaSA8IHJlcS0+Y3Vyc29yOyBpKyspIHsKKwkJaWYgKHJlcS0+ aXRlbXNbaV0ub2JqZWN0X2lkICE9IGxhc3Rfb2JqX2lkKSB7CiAJCQlvYmpfaWR4Kys7Ci0JCQlv YmpzX3B0cltvYmpfaWR4XSA9IHNvcnRlZC0+aXRlbXNbaV0ub2JqZWN0X2lkOworCQkJb2Jqc19w dHJbb2JqX2lkeF0gPSByZXEtPml0ZW1zW2ldLm9iamVjdF9pZDsKIAkJCWxhc3Rfb2JqX2lkID0g b2Jqc19wdHJbb2JqX2lkeF07CiAJCX0KIAogCQljb3VudF9wcm9wc19wdHJbb2JqX2lkeF0rKzsK LQkJcHJvcHNfcHRyW2ldID0gc29ydGVkLT5pdGVtc1tpXS5wcm9wZXJ0eV9pZDsKLQkJcHJvcF92 YWx1ZXNfcHRyW2ldID0gc29ydGVkLT5pdGVtc1tpXS52YWx1ZTsKKwkJcHJvcHNfcHRyW2ldID0g cmVxLT5pdGVtc1tpXS5wcm9wZXJ0eV9pZDsKKwkJcHJvcF92YWx1ZXNfcHRyW2ldID0gcmVxLT5p dGVtc1tpXS52YWx1ZTsKIAogCX0KIApAQCAtMTQwMCw3ICsxNDA5LDYgQEAgb3V0OgogCWRybUZy ZWUoY291bnRfcHJvcHNfcHRyKTsKIAlkcm1GcmVlKHByb3BzX3B0cik7CiAJZHJtRnJlZShwcm9w X3ZhbHVlc19wdHIpOwotCWRybU1vZGVBdG9taWNGcmVlKHNvcnRlZCk7CiAKIAlyZXR1cm4gcmV0 OwogfQpkaWZmIC0tZ2l0IGEveGY4NmRybU1vZGUuaCBiL3hmODZkcm1Nb2RlLmgKaW5kZXggNGRl N2JiYi4uZmUxNDA3OCAxMDA2NDQKLS0tIGEveGY4NmRybU1vZGUuaAorKysgYi94Zjg2ZHJtTW9k ZS5oCkBAIC00OTgsNiArNDk4LDcgQEAgZXh0ZXJuIGludCBkcm1Nb2RlQXRvbWljQWRkUHJvcGVy dHkoZHJtTW9kZUF0b21pY1JlcVB0ciByZXEsCiAJCQkJICAgIHVpbnQzMl90IG9iamVjdF9pZCwK IAkJCQkgICAgdWludDMyX3QgcHJvcGVydHlfaWQsCiAJCQkJICAgIHVpbnQ2NF90IHZhbHVlKTsK K2V4dGVybiB2b2lkIGRybU1vZGVBdG9taWNDbGVhbnVwKGRybU1vZGVBdG9taWNSZXFQdHIgcmVx KTsKIGV4dGVybiBpbnQgZHJtTW9kZUF0b21pY0NvbW1pdChpbnQgZmQsCiAJCQkgICAgICAgZHJt TW9kZUF0b21pY1JlcVB0ciByZXEsCiAJCQkgICAgICAgdWludDMyX3QgZmxhZ3MsCi0tIAoyLjQu MwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK