From: Ville Syrjala Subject: [PATCH 27/29] drm/i915: Clear up the types we use for DDI buf trans level/n_entries Date: Mon, 18 Sep 2017 21:26:02 +0300 Message-ID: <20170918182604.9519-28-ville.syrjala@linux.intel.com> References: <20170918182604.9519-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8636A6E3F4 for ; Mon, 18 Sep 2017 18:27:32 +0000 (UTC) In-Reply-To: <20170918182604.9519-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBwbGFpbiBpbnQgZm9yIHRoZSBEREkgYnVmIHRyYW5zIGxldmVscyBhbmQgbnVtYmVyIG9mIGVu dHJpZXMuIFdoaWxlCmF0IGl0IGRyb3AgdGhlIHJlZHVuZGFudCAiaGRtaSIgZnJvbSBzb21lIG9m IHRoZSB2YXJpYWJsZSBuYW1lcy4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGRpLmMgfCA2NSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwppbmRleCBiMzNiMzU3NTdiMzQuLjExMTI4OWQ2ZjQ0ZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTc2Miw0MSArNzYyLDM4IEBAIGNubF9nZXRfYnVmX3Ry YW5zX2VkcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCAqbl9lbnRyaWVz KQogCiBzdGF0aWMgaW50IGludGVsX2RkaV9oZG1pX2xldmVsKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQpCiB7Ci0JaW50IG5faGRtaV9lbnRyaWVzOwot CWludCBoZG1pX2xldmVsOwotCWludCBoZG1pX2RlZmF1bHRfZW50cnk7CisJaW50IG5fZW50cmll cywgbGV2ZWwsIGRlZmF1bHRfZW50cnk7CiAKLQloZG1pX2xldmVsID0gZGV2X3ByaXYtPnZidC5k ZGlfcG9ydF9pbmZvW3BvcnRdLmhkbWlfbGV2ZWxfc2hpZnQ7CisJbGV2ZWwgPSBkZXZfcHJpdi0+ dmJ0LmRkaV9wb3J0X2luZm9bcG9ydF0uaGRtaV9sZXZlbF9zaGlmdDsKIAogCWlmIChJU19DQU5O T05MQUtFKGRldl9wcml2KSkgewotCQljbmxfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAm bl9oZG1pX2VudHJpZXMpOwotCQloZG1pX2RlZmF1bHRfZW50cnkgPSBuX2hkbWlfZW50cmllcyAt IDE7CisJCWNubF9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3ByaXYsICZuX2VudHJpZXMpOworCQlk ZWZhdWx0X2VudHJ5ID0gbl9lbnRyaWVzIC0gMTsKIAl9IGVsc2UgaWYgKElTX0dFTjlfTFAoZGV2 X3ByaXYpKSB7Ci0JCWJ4dF9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3ByaXYsICZuX2hkbWlfZW50 cmllcyk7Ci0JCWhkbWlfZGVmYXVsdF9lbnRyeSA9IG5faGRtaV9lbnRyaWVzIC0gMTsKKwkJYnh0 X2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50cmllcyk7CisJCWRlZmF1bHRfZW50 cnkgPSBuX2VudHJpZXMgLSAxOwogCX0gZWxzZSBpZiAoSVNfR0VOOV9CQyhkZXZfcHJpdikpIHsK LQkJaW50ZWxfZGRpX2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5faGRtaV9lbnRyaWVz KTsKLQkJaGRtaV9kZWZhdWx0X2VudHJ5ID0gODsKKwkJaW50ZWxfZGRpX2dldF9idWZfdHJhbnNf aGRtaShkZXZfcHJpdiwgJm5fZW50cmllcyk7CisJCWRlZmF1bHRfZW50cnkgPSA4OwogCX0gZWxz ZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewotCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFu c19oZG1pKGRldl9wcml2LCAmbl9oZG1pX2VudHJpZXMpOwotCQloZG1pX2RlZmF1bHRfZW50cnkg PSA3OworCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVz KTsKKwkJZGVmYXVsdF9lbnRyeSA9IDc7CiAJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2 KSkgewotCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9oZG1pX2Vu dHJpZXMpOwotCQloZG1pX2RlZmF1bHRfZW50cnkgPSA2OworCQlpbnRlbF9kZGlfZ2V0X2J1Zl90 cmFuc19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKKwkJZGVmYXVsdF9lbnRyeSA9IDY7CiAJ fSBlbHNlIHsKIAkJV0FSTigxLCAiZGRpIHRyYW5zbGF0aW9uIHRhYmxlIG1pc3NpbmdcbiIpOwog CQlyZXR1cm4gMDsKIAl9CiAKIAkvKiBDaG9vc2UgYSBnb29kIGRlZmF1bHQgaWYgVkJUIGlzIGJh ZGx5IHBvcHVsYXRlZCAqLwotCWlmIChoZG1pX2xldmVsID09IEhETUlfTEVWRUxfU0hJRlRfVU5L Tk9XTiB8fAotCSAgICBoZG1pX2xldmVsID49IG5faGRtaV9lbnRyaWVzKQotCQloZG1pX2xldmVs ID0gaGRtaV9kZWZhdWx0X2VudHJ5OworCWlmIChsZXZlbCA9PSBIRE1JX0xFVkVMX1NISUZUX1VO S05PV04gfHwgbGV2ZWwgPj0gbl9lbnRyaWVzKQorCQlsZXZlbCA9IGRlZmF1bHRfZW50cnk7CiAK LQlpZiAoV0FSTl9PTl9PTkNFKGhkbWlfbGV2ZWwgPj0gbl9oZG1pX2VudHJpZXMpKQotCQloZG1p X2xldmVsID0gbl9oZG1pX2VudHJpZXMgLSAxOworCWlmIChXQVJOX09OX09OQ0UobGV2ZWwgPj0g bl9lbnRyaWVzKSkKKwkJbGV2ZWwgPSBuX2VudHJpZXMgLSAxOwogCi0JcmV0dXJuIGhkbWlfbGV2 ZWw7CisJcmV0dXJuIGxldmVsOwogfQogCiAvKgpAQCAtODQyLDIwICs4MzksMjAgQEAgc3RhdGlj IHZvaWQgaW50ZWxfcHJlcGFyZV9kcF9kZGlfYnVmZmVycyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKICAqIEhETUkvRFZJIHVzZSBjYXNlcy4KICAqLwogc3RhdGljIHZvaWQgaW50ZWxf cHJlcGFyZV9oZG1pX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAot CQkJCQkgICBpbnQgaGRtaV9sZXZlbCkKKwkJCQkJICAgaW50IGxldmVsKQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwog CXUzMiBpYm9vc3RfYml0ID0gMDsKLQlpbnQgbl9oZG1pX2VudHJpZXM7CisJaW50IG5fZW50cmll czsKIAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0KGVuY29kZXIp OwotCWNvbnN0IHN0cnVjdCBkZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25zX2hkbWk7CisJ Y29uc3Qgc3RydWN0IGRkaV9idWZfdHJhbnMgKmRkaV90cmFuc2xhdGlvbnM7CiAKLQlkZGlfdHJh bnNsYXRpb25zX2hkbWkgPSBpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAm bl9oZG1pX2VudHJpZXMpOworCWRkaV90cmFuc2xhdGlvbnMgPSBpbnRlbF9kZGlfZ2V0X2J1Zl90 cmFuc19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKIAotCWlmIChXQVJOX09OX09OQ0UoIWRk aV90cmFuc2xhdGlvbnNfaGRtaSkpCisJaWYgKFdBUk5fT05fT05DRSghZGRpX3RyYW5zbGF0aW9u cykpCiAJCXJldHVybjsKLQlpZiAoV0FSTl9PTl9PTkNFKGhkbWlfbGV2ZWwgPj0gbl9oZG1pX2Vu dHJpZXMpKQotCQloZG1pX2xldmVsID0gbl9oZG1pX2VudHJpZXMgLSAxOworCWlmIChXQVJOX09O X09OQ0UobGV2ZWwgPj0gbl9lbnRyaWVzKSkKKwkJbGV2ZWwgPSBuX2VudHJpZXMgLSAxOwogCiAJ LyogSWYgd2UncmUgYm9vc3RpbmcgdGhlIGN1cnJlbnQsIHNldCBiaXQgMzEgb2YgdHJhbnMxICov CiAJaWYgKElTX0dFTjlfQkMoZGV2X3ByaXYpICYmCkBAIC04NjQsOSArODYxLDkgQEAgc3RhdGlj IHZvaWQgaW50ZWxfcHJlcGFyZV9oZG1pX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAogCiAJLyogRW50cnkgOSBpcyBmb3IgSERNSTogKi8KIAlJOTE1X1dSSVRFKERE SV9CVUZfVFJBTlNfTE8ocG9ydCwgOSksCi0JCSAgIGRkaV90cmFuc2xhdGlvbnNfaGRtaVtoZG1p X2xldmVsXS50cmFuczEgfCBpYm9vc3RfYml0KTsKKwkJICAgZGRpX3RyYW5zbGF0aW9uc1tsZXZl bF0udHJhbnMxIHwgaWJvb3N0X2JpdCk7CiAJSTkxNV9XUklURShERElfQlVGX1RSQU5TX0hJKHBv cnQsIDkpLAotCQkgICBkZGlfdHJhbnNsYXRpb25zX2hkbWlbaGRtaV9sZXZlbF0udHJhbnMyKTsK KwkJICAgZGRpX3RyYW5zbGF0aW9uc1tsZXZlbF0udHJhbnMyKTsKIH0KIAogc3RhdGljIHZvaWQg aW50ZWxfd2FpdF9kZGlfYnVmX2lkbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LApAQCAtMTgxMCw3ICsxODA3LDcgQEAgc3RhdGljIHZvaWQgX3NrbF9kZGlfc2V0X2lib29zdChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0YXRpYyB2b2lkIHNrbF9k ZGlfc2V0X2lib29zdChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKLQkJCSAgICAgICB1 MzIgbGV2ZWwsIGludCB0eXBlKQorCQkJICAgICAgIGludCBsZXZlbCwgaW50IHR5cGUpCiB7CiAJ c3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBlbmNfdG9fZGlnX3Bv cnQoJmVuY29kZXItPmJhc2UpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXYpOwpAQCAtMTkxMyw3ICsxOTEw LDcgQEAgdTggaW50ZWxfZGRpX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyKQogfQogCiBzdGF0aWMgdm9pZCBjbmxfZGRpX3Zzd2luZ19wcm9ncmFtKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkgICAgdTMyIGxldmVsLCBlbnVtIHBvcnQg cG9ydCwgaW50IHR5cGUpCisJCQkJICAgaW50IGxldmVsLCBlbnVtIHBvcnQgcG9ydCwgaW50IHR5 cGUpCiB7CiAJY29uc3Qgc3RydWN0IGNubF9kZGlfYnVmX3RyYW5zICpkZGlfdHJhbnNsYXRpb25z ID0gTlVMTDsKIAlpbnQgbl9lbnRyaWVzLCBsbjsKQEAgLTIwNzAsNyArMjA2Nyw3IEBAIHUzMiBi eHRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCXN0cnVjdCBpbnRl bF9kaWdpdGFsX3BvcnQgKmRwb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZHBvcnQtPmJhc2UuYmFzZS5k ZXYpOwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0gJmRwb3J0LT5iYXNlOwotCXUz MiBsZXZlbCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CisJaW50IGxldmVsID0gaW50 ZWxfZGRpX2RwX2xldmVsKGludGVsX2RwKTsKIAogCWlmIChJU19DQU5OT05MQUtFKGRldl9wcml2 KSkKIAkJY25sX2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgbGV2ZWwsIGVuY29kZXItPnR5 cGUpOwpAQCAtMjA4NSw3ICsyMDgyLDcgQEAgdWludDMyX3QgZGRpX3NpZ25hbF9sZXZlbHMoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkcG9y dCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRwb3J0LT5iYXNlLmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciA9ICZkcG9ydC0+YmFzZTsKLQl1aW50MzJfdCBsZXZlbCA9IGludGVs X2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CisJaW50IGxldmVsID0gaW50ZWxfZGRpX2RwX2xldmVs KGludGVsX2RwKTsKIAogCWlmIChJU19HRU45X0JDKGRldl9wcml2KSkKIAkJc2tsX2RkaV9zZXRf aWJvb3N0KGVuY29kZXIsIGxldmVsLCBlbmNvZGVyLT50eXBlKTsKQEAgLTIxNTgsNyArMjE1NSw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyLAogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3Bv cnQoZW5jb2Rlcik7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqZGlnX3BvcnQgPSBlbmNf dG9fZGlnX3BvcnQoJmVuY29kZXItPmJhc2UpOwogCWJvb2wgaXNfbXN0ID0gaW50ZWxfY3J0Y19o YXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfRFBfTVNUKTsKLQl1aW50MzJfdCBsZXZl bCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CisJaW50IGxldmVsID0gaW50ZWxfZGRp X2RwX2xldmVsKGludGVsX2RwKTsKIAogCVdBUk5fT04oaXNfbXN0ICYmIChwb3J0ID09IFBPUlRf QSB8fCBwb3J0ID09IFBPUlRfRSkpOwogCi0tIAoyLjEzLjUKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=