From: James Xiong Subject: [PATCH libdrm 2/5] intel: reorganize internal function Date: Thu, 15 Mar 2018 18:20:11 -0700 Message-ID: <1521163214-13521-3-git-send-email-james.xiong@intel.com> References: <1521163214-13521-1-git-send-email-james.xiong@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1521163214-13521-1-git-send-email-james.xiong@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: chris@chris-wilson.co.uk, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: james.xiong@intel.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogIlhpb25nLCBKYW1lcyIgPGphbWVzLnhpb25nQGludGVsLmNvbT4KCnNwbGl0IGRybV9p bnRlbF9nZW1fYm9fYWxsb2NfaW50ZXJuYWwsIGFuZCBhZGQgYSBmdW5jdGlvbiB0bwpzZWFyY2gg Zm9yIGEgc3VpdGFibGUgYnVmZmVyIGZvciBnaXZlbiBzaXplIGZvciByZXVzZS4KClNpZ25lZC1v ZmYtYnk6IFhpb25nLCBKYW1lcyA8amFtZXMueGlvbmdAaW50ZWwuY29tPgotLS0KIGludGVsL2lu dGVsX2J1Zm1ncl9nZW0uYyB8IDE0MSArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDczIGluc2VydGlvbnMoKyksIDY4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2ludGVsL2ludGVsX2J1Zm1ncl9nZW0uYyBiL2ludGVsL2lu dGVsX2J1Zm1ncl9nZW0uYwppbmRleCAzODZkYTMwLi4yZmNiMGEwIDEwMDY0NAotLS0gYS9pbnRl bC9pbnRlbF9idWZtZ3JfZ2VtLmMKKysrIGIvaW50ZWwvaW50ZWxfYnVmbWdyX2dlbS5jCkBAIC03 MDQsNiArNzA0LDcxIEBAIGRybV9pbnRlbF9nZW1fYm9fY2FjaGVfcHVyZ2VfYnVja2V0KGRybV9p bnRlbF9idWZtZ3JfZ2VtICpidWZtZ3JfZ2VtLAogCX0KIH0KIAorc3RhdGljIGRybV9pbnRlbF9i b19nZW0gKgorZHJtX2ludGVsX2dlbV9ib19jYWNoZWRfZm9yX3NpemUoZHJtX2ludGVsX2J1Zm1n cl9nZW0gKmJ1Zm1ncl9nZW0sCisJCQkJIHVuc2lnbmVkIGxvbmcgc2l6ZSwKKwkJCQkgdWludDMy X3QgdGlsaW5nX21vZGUsCisJCQkJIHVuc2lnbmVkIGxvbmcgc3RyaWRlLAorCQkJCSB1bnNpZ25l ZCBsb25nIGFsaWdubWVudCwKKwkJCQkgYm9vbCBmb3JfcmVuZGVyKQoreworCXN0cnVjdCBkcm1f aW50ZWxfZ2VtX2JvX2J1Y2tldCAqYnVja2V0ID0KKwkJZHJtX2ludGVsX2dlbV9ib19idWNrZXRf Zm9yX3NpemUoYnVmbWdyX2dlbSwgc2l6ZSk7CisKKyAgICAgICAgaWYgKGJ1Y2tldCAhPSBOVUxM KSB7CisJCWRybV9pbnRlbF9ib19nZW0gKmJvX2dlbSwgKnRlbXBfYm9fZ2VtOworcmV0cnk6CisJ CWJvX2dlbSA9IE5VTEw7CisJCWlmIChmb3JfcmVuZGVyKSB7CisJCQkvKiBBbGxvY2F0ZSBuZXcg cmVuZGVyLXRhcmdldCBCT3MgZnJvbSB0aGUgdGFpbCAoTVJVKQorCQkJICogb2YgdGhlIGxpc3Qs IGFzIGl0IHdpbGwgbGlrZWx5IGJlIGhvdCBpbiB0aGUgR1BVCisJCQkgKiBjYWNoZSBhbmQgaW4g dGhlIGFwZXJ0dXJlIGZvciB1cy4KKwkJCSAqLworCQkJYm9fZ2VtID0gRFJNTElTVEVOVFJZKGRy bV9pbnRlbF9ib19nZW0sCisJCQkJCSAgICAgIGJ1Y2tldC0+aGVhZC5wcmV2LCBoZWFkKTsKKwkJ CURSTUxJU1RERUwoJmJvX2dlbS0+aGVhZCk7CisJCQlib19nZW0tPmJvLmFsaWduID0gYWxpZ25t ZW50OworCQl9IGVsc2UgeworCQkJYXNzZXJ0KGFsaWdubWVudCA9PSAwKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIC8qIEZvciBub24tcmVuZGVyLXRhcmdldCBCT3MgKHdoZXJlIHdlJ3JlIHBy b2JhYmx5CisJCQkgKiBnb2luZyB0byBtYXAgaXQgZmlyc3QgdGhpbmcgaW4gb3JkZXIgdG8gZmls bCBpdAorCQkJICogd2l0aCBkYXRhKSwgY2hlY2sgaWYgdGhlIGxhc3QgQk8gaW4gdGhlIGNhY2hl IGlzCisJCQkgKiB1bmJ1c3ksIGFuZCBvbmx5IHJldXNlIGluIHRoYXQgY2FzZS4gT3RoZXJ3aXNl LAorCQkJICogYWxsb2NhdGluZyBhIG5ldyBidWZmZXIgaXMgcHJvYmFibHkgZmFzdGVyIHRoYW4K KwkJCSAqIHdhaXRpbmcgZm9yIHRoZSBHUFUgdG8gZmluaXNoLgorCQkJICovCisJCQlib19nZW0g PSBEUk1MSVNURU5UUlkoZHJtX2ludGVsX2JvX2dlbSwKKwkJCQkJICAgICAgYnVja2V0LT5oZWFk Lm5leHQsIGhlYWQpOworCQkJaWYgKCFkcm1faW50ZWxfZ2VtX2JvX2J1c3koJmJvX2dlbS0+Ym8p KSB7CisJCQkJRFJNTElTVERFTCgmYm9fZ2VtLT5oZWFkKTsKKwkJCX0gZWxzZSB7CisJCQkJYm9f Z2VtID0gTlVMTDsKKwkJCX0KKwkJfQorCisJCWlmIChib19nZW0pIHsKKwkJCWlmICghZHJtX2lu dGVsX2dlbV9ib19tYWR2aXNlX2ludGVybmFsCisJCQkJKGJ1Zm1ncl9nZW0sIGJvX2dlbSwgSTkx NV9NQURWX1dJTExORUVEKSkgeworCQkJCWRybV9pbnRlbF9nZW1fYm9fZnJlZSgmYm9fZ2VtLT5i byk7CisJCQkJZHJtX2ludGVsX2dlbV9ib19jYWNoZV9wdXJnZV9idWNrZXQoYnVmbWdyX2dlbSwK KwkJCQkJCQkJICAgIGJ1Y2tldCk7CisJCQkJcmV0dXJuIE5VTEw7CisJCQl9CisKKwkJCWlmIChk cm1faW50ZWxfZ2VtX2JvX3NldF90aWxpbmdfaW50ZXJuYWwoJmJvX2dlbS0+Ym8sCisJCQkJCQkJ CSB0aWxpbmdfbW9kZSwKKwkJCQkJCQkJIHN0cmlkZSkpIHsKKwkJCQlkcm1faW50ZWxfZ2VtX2Jv X2ZyZWUoJmJvX2dlbS0+Ym8pOworCQkJCWdvdG8gcmV0cnk7CisJCQl9CisJCX0KKworCQlyZXR1 cm4gYm9fZ2VtOworCX0KKworCXJldHVybiBOVUxMOworfQorCiBzdGF0aWMgZHJtX2ludGVsX2Jv ICoKIGRybV9pbnRlbF9nZW1fYm9fYWxsb2NfaW50ZXJuYWwoZHJtX2ludGVsX2J1Zm1nciAqYnVm bWdyLAogCQkJCWNvbnN0IGNoYXIgKm5hbWUsCkBAIC03MTUsODEgKzc4MCwyMSBAQCBkcm1faW50 ZWxfZ2VtX2JvX2FsbG9jX2ludGVybmFsKGRybV9pbnRlbF9idWZtZ3IgKmJ1Zm1nciwKIHsKIAlk cm1faW50ZWxfYnVmbWdyX2dlbSAqYnVmbWdyX2dlbSA9IChkcm1faW50ZWxfYnVmbWdyX2dlbSAq KSBidWZtZ3I7CiAJZHJtX2ludGVsX2JvX2dlbSAqYm9fZ2VtOwotCXVuc2lnbmVkIGludCBwYWdl X3NpemUgPSBnZXRwYWdlc2l6ZSgpOwogCWludCByZXQ7Ci0Jc3RydWN0IGRybV9pbnRlbF9nZW1f Ym9fYnVja2V0ICpidWNrZXQ7Ci0JYm9vbCBhbGxvY19mcm9tX2NhY2hlOwotCXVuc2lnbmVkIGxv bmcgYm9fc2l6ZTsKIAlib29sIGZvcl9yZW5kZXIgPSBmYWxzZTsKIAogCWlmIChmbGFncyAmIEJP X0FMTE9DX0ZPUl9SRU5ERVIpCiAJCWZvcl9yZW5kZXIgPSB0cnVlOwogCi0JLyogUm91bmQgdGhl IGFsbG9jYXRlZCBzaXplIHVwIHRvIGEgcG93ZXIgb2YgdHdvIG51bWJlciBvZiBwYWdlcy4gKi8K LQlidWNrZXQgPSBkcm1faW50ZWxfZ2VtX2JvX2J1Y2tldF9mb3Jfc2l6ZShidWZtZ3JfZ2VtLCBz aXplKTsKLQotCS8qIElmIHdlIGRvbid0IGhhdmUgY2FjaGluZyBhdCB0aGlzIHNpemUsIGRvbid0 IGFjdHVhbGx5IHJvdW5kIHRoZQotCSAqIGFsbG9jYXRpb24gdXAuCi0JICovCi0JaWYgKGJ1Y2tl dCA9PSBOVUxMKSB7Ci0JCWJvX3NpemUgPSBzaXplOwotCQlpZiAoYm9fc2l6ZSA8IHBhZ2Vfc2l6 ZSkKLQkJCWJvX3NpemUgPSBwYWdlX3NpemU7Ci0JfSBlbHNlIHsKLQkJYm9fc2l6ZSA9IGJ1Y2tl dC0+c2l6ZTsKLQl9CisJLyogZmlyc3QgYWxpZ24gdGhlIHNpemUgb24gcGFnZSBib3VuZGFyeSAq LworCXNpemUgPSBBTElHTihzaXplLCBnZXRwYWdlc2l6ZSgpKTsKIAogCXB0aHJlYWRfbXV0ZXhf bG9jaygmYnVmbWdyX2dlbS0+bG9jayk7CiAJLyogR2V0IGEgYnVmZmVyIG91dCBvZiB0aGUgY2Fj aGUgaWYgYXZhaWxhYmxlICovCi1yZXRyeToKLQlhbGxvY19mcm9tX2NhY2hlID0gZmFsc2U7Ci0J aWYgKGJ1Y2tldCAhPSBOVUxMICYmICFEUk1MSVNURU1QVFkoJmJ1Y2tldC0+aGVhZCkpIHsKLQkJ aWYgKGZvcl9yZW5kZXIpIHsKLQkJCS8qIEFsbG9jYXRlIG5ldyByZW5kZXItdGFyZ2V0IEJPcyBm cm9tIHRoZSB0YWlsIChNUlUpCi0JCQkgKiBvZiB0aGUgbGlzdCwgYXMgaXQgd2lsbCBsaWtlbHkg YmUgaG90IGluIHRoZSBHUFUKLQkJCSAqIGNhY2hlIGFuZCBpbiB0aGUgYXBlcnR1cmUgZm9yIHVz LgotCQkJICovCi0JCQlib19nZW0gPSBEUk1MSVNURU5UUlkoZHJtX2ludGVsX2JvX2dlbSwKLQkJ CQkJICAgICAgYnVja2V0LT5oZWFkLnByZXYsIGhlYWQpOwotCQkJRFJNTElTVERFTCgmYm9fZ2Vt LT5oZWFkKTsKLQkJCWFsbG9jX2Zyb21fY2FjaGUgPSB0cnVlOwotCQkJYm9fZ2VtLT5iby5hbGln biA9IGFsaWdubWVudDsKLQkJfSBlbHNlIHsKLQkJCWFzc2VydChhbGlnbm1lbnQgPT0gMCk7Ci0J CQkvKiBGb3Igbm9uLXJlbmRlci10YXJnZXQgQk9zICh3aGVyZSB3ZSdyZSBwcm9iYWJseQotCQkJ ICogZ29pbmcgdG8gbWFwIGl0IGZpcnN0IHRoaW5nIGluIG9yZGVyIHRvIGZpbGwgaXQKLQkJCSAq IHdpdGggZGF0YSksIGNoZWNrIGlmIHRoZSBsYXN0IEJPIGluIHRoZSBjYWNoZSBpcwotCQkJICog dW5idXN5LCBhbmQgb25seSByZXVzZSBpbiB0aGF0IGNhc2UuIE90aGVyd2lzZSwKLQkJCSAqIGFs bG9jYXRpbmcgYSBuZXcgYnVmZmVyIGlzIHByb2JhYmx5IGZhc3RlciB0aGFuCi0JCQkgKiB3YWl0 aW5nIGZvciB0aGUgR1BVIHRvIGZpbmlzaC4KLQkJCSAqLwotCQkJYm9fZ2VtID0gRFJNTElTVEVO VFJZKGRybV9pbnRlbF9ib19nZW0sCi0JCQkJCSAgICAgIGJ1Y2tldC0+aGVhZC5uZXh0LCBoZWFk KTsKLQkJCWlmICghZHJtX2ludGVsX2dlbV9ib19idXN5KCZib19nZW0tPmJvKSkgewotCQkJCWFs bG9jX2Zyb21fY2FjaGUgPSB0cnVlOwotCQkJCURSTUxJU1RERUwoJmJvX2dlbS0+aGVhZCk7Ci0J CQl9Ci0JCX0KKwlib19nZW0gPSBkcm1faW50ZWxfZ2VtX2JvX2NhY2hlZF9mb3Jfc2l6ZShidWZt Z3JfZ2VtLCBzaXplLCB0aWxpbmdfbW9kZSwKKwkJCQkJCSAgc3RyaWRlLCBhbGlnbm1lbnQsIGZv cl9yZW5kZXIpOwogCi0JCWlmIChhbGxvY19mcm9tX2NhY2hlKSB7Ci0JCQlpZiAoIWRybV9pbnRl bF9nZW1fYm9fbWFkdmlzZV9pbnRlcm5hbAotCQkJICAgIChidWZtZ3JfZ2VtLCBib19nZW0sIEk5 MTVfTUFEVl9XSUxMTkVFRCkpIHsKLQkJCQlkcm1faW50ZWxfZ2VtX2JvX2ZyZWUoJmJvX2dlbS0+ Ym8pOwotCQkJCWRybV9pbnRlbF9nZW1fYm9fY2FjaGVfcHVyZ2VfYnVja2V0KGJ1Zm1ncl9nZW0s Ci0JCQkJCQkJCSAgICBidWNrZXQpOwotCQkJCWdvdG8gcmV0cnk7Ci0JCQl9Ci0KLQkJCWlmIChk cm1faW50ZWxfZ2VtX2JvX3NldF90aWxpbmdfaW50ZXJuYWwoJmJvX2dlbS0+Ym8sCi0JCQkJCQkJ CSB0aWxpbmdfbW9kZSwKLQkJCQkJCQkJIHN0cmlkZSkpIHsKLQkJCQlkcm1faW50ZWxfZ2VtX2Jv X2ZyZWUoJmJvX2dlbS0+Ym8pOwotCQkJCWdvdG8gcmV0cnk7Ci0JCQl9Ci0JCX0KLQl9Ci0KLQlp ZiAoIWFsbG9jX2Zyb21fY2FjaGUpIHsKKwlpZiAoYm9fZ2VtID09IE5VTEwpIHsKIAkJc3RydWN0 IGRybV9pOTE1X2dlbV9jcmVhdGUgY3JlYXRlOwogCiAJCWJvX2dlbSA9IGNhbGxvYygxLCBzaXpl b2YoKmJvX2dlbSkpOwpAQCAtODAwLDEwICs4MDUsMTAgQEAgcmV0cnk6CiAJCSAgIGxpc3QgKHZt YV9saXN0KSwgc28gYmV0dGVyIHNldCB0aGUgbGlzdCBoZWFkIGhlcmUgKi8KIAkJRFJNSU5JVExJ U1RIRUFEKCZib19nZW0tPnZtYV9saXN0KTsKIAotCQlib19nZW0tPmJvLnNpemUgPSBib19zaXpl OworCQlib19nZW0tPmJvLnNpemUgPSBzaXplOwogCiAJCW1lbWNsZWFyKGNyZWF0ZSk7Ci0JCWNy ZWF0ZS5zaXplID0gYm9fc2l6ZTsKKwkJY3JlYXRlLnNpemUgPSBzaXplOwogCiAJCXJldCA9IGRy bUlvY3RsKGJ1Zm1ncl9nZW0tPmZkLAogCQkJICAgICAgIERSTV9JT0NUTF9JOTE1X0dFTV9DUkVB VEUsCkBAIC04NDQsNyArODQ5LDcgQEAgcmV0cnk6CiAJcHRocmVhZF9tdXRleF91bmxvY2soJmJ1 Zm1ncl9nZW0tPmxvY2spOwogCiAJREJHKCJib19jcmVhdGU6IGJ1ZiAlZCAoJXMpICVsZGJcbiIs Ci0JICAgIGJvX2dlbS0+Z2VtX2hhbmRsZSwgYm9fZ2VtLT5uYW1lLCBzaXplKTsKKwkgICAgYm9f Z2VtLT5nZW1faGFuZGxlLCBib19nZW0tPm5hbWUsIGJvX2dlbS0+Ym8uc2l6ZSk7CiAKIAlyZXR1 cm4gJmJvX2dlbS0+Ym87CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK