From: Tvrtko Ursulin Subject: [RFC 1/7] drm/i915: Extract sg creation into a helper Date: Thu, 13 Oct 2016 10:03:58 +0100 Message-ID: <1476349444-7331-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476349444-7331-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B10E76E3E3 for ; Thu, 13 Oct 2016 09:04:16 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id b75so11439235lfg.3 for ; Thu, 13 Oct 2016 02:04:16 -0700 (PDT) In-Reply-To: <1476349444-7331-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkluIG9yZGVy IHRvIHJldXNlIHRoZSBzYW1lIGxvZ2ljIGluIHNldmVyYWwgcGxhY2VzIGluIHRoZSBkcml2ZXIs CmV4dHJhY3QgdGhlIGxvZ2ljIHdoaWNoIGFkZHMgcGFnZXMgdG8gdGhlIHNnIGxpc3QgYW5kIGRv ZXMgdGhlCnBvdGVudGlhbCBjb2FsZXNjaW5nLCBpbnRvIHNlcGFyYXRlIGZ1bmN0aW9ucy4KCkNv ZGUgd2FudGluZyB0byBidWlsZCB0aGUgc2cgdGFibGUgbmVlZHMgdG8gZG8gdGhlIGZvbGxvd2lu ZzoKCjEuIENhbGwgaTkxNV9zZ19jcmVhdGUgdG8gY3JlYXRlIHRoZSBzdGF0ZSBvYmplY3QgZm9y IGEgZ2l2ZW4KICAgbWF4aW11bSBudW1iZXIgb2YgcGFnZXMuCjIuIEl0ZXJhdGUgdXNpbmcgaTkx NV9zZ19mb3JfZWFjaF9wYWdlCjMuIENhbGwgaTkxNV9zZ19hZGRfcGFnZSB0byBhZGQgYWxsIHRo ZSBwYWdlcyBpbiBvcmRlcgo0LiBPbiBzdWNjZXNzIGNhbGwgaTkxNV9zZ19jb21wbGV0ZSwgb3Ig b24gZmFpbHVyZSBpOTE1X3NnX2Fib3J0CgpJbiB0aGlzIHBhdGNoIG9ubHkgaTkxNV9nZW1fb2Jq ZWN0X2dldF9wYWdlc19ndHQgZ2V0cyBjb252ZXJ0ZWQKdG8gdXNlIHRoZSBuZXcgZnVuY3Rpb25z LgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgMTUzICsrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMDkgaW5zZXJ0 aW9ucygrKSwgNDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZmRk NDk2ZTZjMDgxLi45M2IwNDc3MzVlNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjIx NiwxOCArMjIxNiwxMDQgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgc3dpb3RsYl9tYXhfc2l6ZSh2 b2lkKQogI2VuZGlmCiB9CiAKK3N0cnVjdCBpOTE1X3NnX2NyZWF0ZV9zdGF0ZSB7CisJc3RydWN0 IHNnX3RhYmxlICpzdDsKKwlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOworCXVuc2lnbmVkIGludCBp ZHg7CisJdW5zaWduZWQgaW50IHBhZ2VfY291bnQ7CisJdW5zaWduZWQgbG9uZyBtYXhfc2VnbWVu dDsKKwl1bnNpZ25lZCBsb25nIGxhc3RfcGZuOworfTsKKworc3RhdGljIHN0cnVjdCBpOTE1X3Nn X2NyZWF0ZV9zdGF0ZSAqCitpOTE1X3NnX2NyZWF0ZSh1bnNpZ25lZCBpbnQgcGFnZV9jb3VudCkK K3sKKwlzdHJ1Y3QgaTkxNV9zZ19jcmVhdGVfc3RhdGUgKnN0YXRlOworCXN0cnVjdCBzZ190YWJs ZSAqc3Q7CisKKwlzdGF0ZSA9IGttYWxsb2Moc2l6ZW9mKCpzdGF0ZSksIEdGUF9LRVJORUwpOwor CWlmICghc3RhdGUpCisJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOworCisJc3QgPSBrbWFsbG9j KHNpemVvZigqc3QpLCBHRlBfS0VSTkVMKTsKKwlpZiAoIXN0KSB7CisJCWtmcmVlKHN0YXRlKTsK KwkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisJfQorCisJaWYgKHNnX2FsbG9jX3RhYmxlKHN0 LCBwYWdlX2NvdW50LCBHRlBfS0VSTkVMKSkgeworCQlrZnJlZShzdCk7CisJCWtmcmVlKHN0YXRl KTsKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisJfQorCisJc3QtPm5lbnRzID0gMDsKKwlz dGF0ZS0+c3QgPSBzdDsKKwlzdGF0ZS0+c2cgPSBzdC0+c2dsOworCXN0YXRlLT5wYWdlX2NvdW50 ID0gcGFnZV9jb3VudDsKKwlzdGF0ZS0+aWR4ID0gMDsKKwlzdGF0ZS0+bWF4X3NlZ21lbnQgPSBz d2lvdGxiX21heF9zaXplKCk7CisJaWYgKCFzdGF0ZS0+bWF4X3NlZ21lbnQpCisJCXN0YXRlLT5t YXhfc2VnbWVudCA9IHBhZ2VfY291bnQgKiBQQUdFX1NJWkU7CisJc3RhdGUtPmxhc3RfcGZuID0g MDsKKworCXJldHVybiBzdGF0ZTsKK30KKworc3RhdGljIHZvaWQKK2k5MTVfc2dfYWRkX3BhZ2Uo c3RydWN0IGk5MTVfc2dfY3JlYXRlX3N0YXRlICpzdGF0ZSwgc3RydWN0IHBhZ2UgKnBhZ2UpCit7 CisJdW5zaWduZWQgbG9uZyBwZm4gPSBwYWdlX3RvX3BmbihwYWdlKTsKKwlzdHJ1Y3Qgc2NhdHRl cmxpc3QgKnNnID0gc3RhdGUtPnNnOworCisJaWYgKCFzdGF0ZS0+aWR4IHx8CisJICAgIHNnLT5s ZW5ndGggPj0gc3RhdGUtPm1heF9zZWdtZW50IHx8CisJICAgIHBmbiAhPSBzdGF0ZS0+bGFzdF9w Zm4gKyAxKSB7CisJCWlmIChzdGF0ZS0+aWR4KQorCQkJc2cgPSBzZ19uZXh0KHNnKTsKKwkJc3Rh dGUtPnN0LT5uZW50cysrOworCQlzZ19zZXRfcGFnZShzZywgcGFnZSwgUEFHRV9TSVpFLCAwKTsK Kwl9IGVsc2UgeworCQlzZy0+bGVuZ3RoICs9IFBBR0VfU0laRTsKKwl9CisKKwlzdGF0ZS0+bGFz dF9wZm4gPSBwZm47CisJc3RhdGUtPnNnID0gc2c7CisJc3RhdGUtPmlkeCsrOworfQorCitzdGF0 aWMgc3RydWN0IHNnX3RhYmxlICoKK2k5MTVfc2dfY29tcGxldGUoc3RydWN0IGk5MTVfc2dfY3Jl YXRlX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3Qgc2dfdGFibGUgKnN0ID0gc3RhdGUtPnN0Owor CisJaWYgKHN0YXRlLT5zZykgLyogZmV3ZXIgc2cgZW50cmllcyB3cml0dGVuIHRoYW4gbWF4IGFs bG9jYXRlZCAqLworCQlzZ19tYXJrX2VuZChzdGF0ZS0+c2cpOworCisJa2ZyZWUoc3RhdGUpOwor CisJcmV0dXJuIHN0OworfQorCitzdGF0aWMgdm9pZAoraTkxNV9zZ19hYm9ydChzdHJ1Y3QgaTkx NV9zZ19jcmVhdGVfc3RhdGUgKnN0YXRlKQoreworCXNnX2ZyZWVfdGFibGUoc3RhdGUtPnN0KTsK KwlrZnJlZShzdGF0ZS0+c3QpOworCWtmcmVlKHN0YXRlKTsKK30KKworI2RlZmluZSBpOTE1X3Nn X2Zvcl9lYWNoX3BhZ2Uoc3RhdGUpIFwKKwlmb3IoIDsgKHN0YXRlKS0+aWR4IDwgKHN0YXRlKS0+ cGFnZV9jb3VudDsgKQorCiBzdGF0aWMgaW50CiBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2d0 dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUob2JqLT5iYXNlLmRldik7Ci0JaW50IHBhZ2VfY291 bnQsIGk7CiAJc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmc7Ci0Jc3RydWN0IHNnX3RhYmxl ICpzdDsKLQlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOworCXN0cnVjdCBpOTE1X3NnX2NyZWF0ZV9z dGF0ZSAqc3RhdGU7CiAJc3RydWN0IHNndF9pdGVyIHNndF9pdGVyOwogCXN0cnVjdCBwYWdlICpw YWdlOwotCXVuc2lnbmVkIGxvbmcgbGFzdF9wZm4gPSAwOwkvKiBzdXBwcmVzcyBnY2Mgd2Fybmlu ZyAqLwotCXVuc2lnbmVkIGxvbmcgbWF4X3NlZ21lbnQ7CiAJaW50IHJldDsKIAlnZnBfdCBnZnA7 CiAKQEAgLTIyMzgsMTkgKzIzMjQsOSBAQCBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2d0dChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCUJVR19PTihvYmotPmJhc2UucmVhZF9k b21haW5zICYgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwogCUJVR19PTihvYmotPmJhc2Uud3JpdGVf ZG9tYWluICYgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwogCi0JbWF4X3NlZ21lbnQgPSBzd2lvdGxi X21heF9zaXplKCk7Ci0JaWYgKCFtYXhfc2VnbWVudCkKLQkJbWF4X3NlZ21lbnQgPSBvYmotPmJh c2Uuc2l6ZTsKLQotCXN0ID0ga21hbGxvYyhzaXplb2YoKnN0KSwgR0ZQX0tFUk5FTCk7Ci0JaWYg KHN0ID09IE5VTEwpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JcGFnZV9jb3VudCA9IG9iai0+YmFz ZS5zaXplIC8gUEFHRV9TSVpFOwotCWlmIChzZ19hbGxvY190YWJsZShzdCwgcGFnZV9jb3VudCwg R0ZQX0tFUk5FTCkpIHsKLQkJa2ZyZWUoc3QpOwotCQlyZXR1cm4gLUVOT01FTTsKLQl9CisJc3Rh dGUgPSBpOTE1X3NnX2NyZWF0ZShvYmotPmJhc2Uuc2l6ZSAvIFBBR0VfU0laRSk7CisJaWYgKElT X0VSUihzdGF0ZSkpCisJCXJldHVybiBQVFJfRVJSKHN0YXRlKTsKIAogCS8qIEdldCB0aGUgbGlz dCBvZiBwYWdlcyBvdXQgb2Ygb3VyIHN0cnVjdCBmaWxlLiAgVGhleSdsbCBiZSBwaW5uZWQKIAkg KiBhdCB0aGlzIHBvaW50IHVudGlsIHdlIHJlbGVhc2UgdGhlbS4KQEAgLTIyNjAsNDcgKzIzMzYs MzcgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19ndHQoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaikKIAltYXBwaW5nID0gb2JqLT5iYXNlLmZpbHAtPmZfbWFwcGluZzsKIAlnZnAg PSBtYXBwaW5nX2dmcF9jb25zdHJhaW50KG1hcHBpbmcsIH4oX19HRlBfSU8gfCBfX0dGUF9SRUNM QUlNKSk7CiAJZ2ZwIHw9IF9fR0ZQX05PUkVUUlkgfCBfX0dGUF9OT1dBUk47Ci0Jc2cgPSBzdC0+ c2dsOwotCXN0LT5uZW50cyA9IDA7Ci0JZm9yIChpID0gMDsgaSA8IHBhZ2VfY291bnQ7IGkrKykg ewotCQlwYWdlID0gc2htZW1fcmVhZF9tYXBwaW5nX3BhZ2VfZ2ZwKG1hcHBpbmcsIGksIGdmcCk7 CisJaTkxNV9zZ19mb3JfZWFjaF9wYWdlKHN0YXRlKSB7CisJCXBhZ2UgPSBzaG1lbV9yZWFkX21h cHBpbmdfcGFnZV9nZnAobWFwcGluZywgc3RhdGUtPmlkeCwgZ2ZwKTsKIAkJaWYgKElTX0VSUihw YWdlKSkgewogCQkJaTkxNV9nZW1fc2hyaW5rKGRldl9wcml2LAotCQkJCQlwYWdlX2NvdW50LAor CQkJCQlzdGF0ZS0+cGFnZV9jb3VudCwKIAkJCQkJSTkxNV9TSFJJTktfQk9VTkQgfAogCQkJCQlJ OTE1X1NIUklOS19VTkJPVU5EIHwKIAkJCQkJSTkxNV9TSFJJTktfUFVSR0VBQkxFKTsKLQkJCXBh Z2UgPSBzaG1lbV9yZWFkX21hcHBpbmdfcGFnZV9nZnAobWFwcGluZywgaSwgZ2ZwKTsKKwkJCXBh Z2UgPSBzaG1lbV9yZWFkX21hcHBpbmdfcGFnZV9nZnAobWFwcGluZywgc3RhdGUtPmlkeCwKKwkJ CQkJCQkgICBnZnApOwogCQl9CiAJCWlmIChJU19FUlIocGFnZSkpIHsKIAkJCS8qIFdlJ3ZlIHRy aWVkIGhhcmQgdG8gYWxsb2NhdGUgdGhlIG1lbW9yeSBieSByZWFwaW5nCiAJCQkgKiBvdXIgb3du IGJ1ZmZlciwgbm93IGxldCB0aGUgcmVhbCBWTSBkbyBpdHMgam9iIGFuZAogCQkJICogZ28gZG93 biBpbiBmbGFtZXMgaWYgdHJ1bHkgT09NLgogCQkJICovCi0JCQlwYWdlID0gc2htZW1fcmVhZF9t YXBwaW5nX3BhZ2UobWFwcGluZywgaSk7CisJCQlwYWdlID0gc2htZW1fcmVhZF9tYXBwaW5nX3Bh Z2UobWFwcGluZywgc3RhdGUtPmlkeCk7CiAJCQlpZiAoSVNfRVJSKHBhZ2UpKSB7CiAJCQkJcmV0 ID0gUFRSX0VSUihwYWdlKTsKIAkJCQlnb3RvIGVycl9wYWdlczsKIAkJCX0KIAkJfQotCQlpZiAo IWkgfHwKLQkJICAgIHNnLT5sZW5ndGggPj0gbWF4X3NlZ21lbnQgfHwKLQkJICAgIHBhZ2VfdG9f cGZuKHBhZ2UpICE9IGxhc3RfcGZuICsgMSkgewotCQkJaWYgKGkpCi0JCQkJc2cgPSBzZ19uZXh0 KHNnKTsKLQkJCXN0LT5uZW50cysrOwotCQkJc2dfc2V0X3BhZ2Uoc2csIHBhZ2UsIFBBR0VfU0la RSwgMCk7Ci0JCX0gZWxzZSB7Ci0JCQlzZy0+bGVuZ3RoICs9IFBBR0VfU0laRTsKLQkJfQotCQls YXN0X3BmbiA9IHBhZ2VfdG9fcGZuKHBhZ2UpOworCisJCWk5MTVfc2dfYWRkX3BhZ2Uoc3RhdGUs IHBhZ2UpOwogCiAJCS8qIENoZWNrIHRoYXQgdGhlIGk5NjVnL2dtIHdvcmthcm91bmQgd29ya3Mu ICovCi0JCVdBUk5fT04oKGdmcCAmIF9fR0ZQX0RNQTMyKSAmJiAobGFzdF9wZm4gPj0gMHgwMDEw MDAwMFVMKSk7CisJCVdBUk5fT04oKGdmcCAmIF9fR0ZQX0RNQTMyKSAmJgorCQkJKHN0YXRlLT5s YXN0X3BmbiA+PSAweDAwMTAwMDAwVUwpKTsKIAl9Ci0JaWYgKHNnKSAvKiBsb29wIHRlcm1pbmF0 ZWQgZWFybHk7IHNob3J0IHNnIHRhYmxlICovCi0JCXNnX21hcmtfZW5kKHNnKTsKLQlvYmotPnBh Z2VzID0gc3Q7CisKKwlvYmotPnBhZ2VzID0gaTkxNV9zZ19jb21wbGV0ZShzdGF0ZSk7CiAKIAly ZXQgPSBpOTE1X2dlbV9ndHRfcHJlcGFyZV9vYmplY3Qob2JqKTsKIAlpZiAocmV0KQpAQCAtMjMx NiwxMSArMjM4MiwxMCBAQCBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2d0dChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCXJldHVybiAwOwogCiBlcnJfcGFnZXM6Ci0Jc2dfbWFy a19lbmQoc2cpOwotCWZvcl9lYWNoX3NndF9wYWdlKHBhZ2UsIHNndF9pdGVyLCBzdCkKKwlzZ19t YXJrX2VuZChzdGF0ZS0+c2cpOworCWZvcl9lYWNoX3NndF9wYWdlKHBhZ2UsIHNndF9pdGVyLCBz dGF0ZS0+c3QpCiAJCXB1dF9wYWdlKHBhZ2UpOwotCXNnX2ZyZWVfdGFibGUoc3QpOwotCWtmcmVl KHN0KTsKKwlpOTE1X3NnX2Fib3J0KHN0YXRlKTsKIAogCS8qIHNobWVtZnMgZmlyc3QgY2hlY2tz IGlmIHRoZXJlIGlzIGVub3VnaCBtZW1vcnkgdG8gYWxsb2NhdGUgdGhlIHBhZ2UKIAkgKiBhbmQg cmVwb3J0cyBFTk9TUEMgc2hvdWxkIHRoZXJlIGJlIGluc3VmZmljaWVudCwgYWxvbmcgd2l0aCB0 aGUgdXN1YWwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK