From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 01/15] drm/i915: dev_priv and a small cascade of cleanups in i915_gem.c Date: Wed, 16 Nov 2016 08:55:31 +0000 Message-ID: <1479286545-15020-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1479286545-15020-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-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52E386E659 for ; Wed, 16 Nov 2016 08:55:54 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g23so8801524wme.1 for ; Wed, 16 Nov 2016 00:55:54 -0800 (PST) In-Reply-To: <1479286545-15020-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyAgICAgfCAxMiArKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jIHwgMzQgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAgMiArLQogNSBmaWxlcyBjaGFuZ2VkLCAyMiBp bnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRl eCA0ZjBlNTZkM2I0NDEuLjc0ZjU0NWE1MGVhYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBA IC0yNDI2LDcgKzI0MjYsNyBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRpbWVfcmVzdW1lKHN0cnVj dCBkZXZpY2UgKmtkZXYpCiAJICogTm8gcG9pbnQgb2Ygcm9sbGluZyBiYWNrIHRoaW5ncyBpbiBj YXNlIG9mIGFuIGVycm9yLCBhcyB0aGUgYmVzdAogCSAqIHdlIGNhbiBkbyBpcyB0byBob3BlIHRo YXQgdGhpbmdzIHdpbGwgc3RpbGwgd29yayAoYW5kIGRpc2FibGUgUlBNKS4KIAkgKi8KLQlpOTE1 X2dlbV9pbml0X3N3aXp6bGluZyhkZXYpOworCWk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKGRldl9w cml2KTsKIAogCWludGVsX3J1bnRpbWVfcG1fZW5hYmxlX2ludGVycnVwdHMoZGV2X3ByaXYpOwog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwMDY5MTRjYTM2ZmUuLjNmZTM4MTNjNzkzZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMDgwLDcgKzMwODAsNyBAQCB2b2lkIGk5MTVf Z2VtX3NldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQg aTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwg Ym9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7Ci12b2lkIGk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpOwordm9pZCBpOTE1X2dlbV9pbml0X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX3dhaXRfZm9y X2lkbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQl1bnNpZ25lZCBp bnQgZmxhZ3MpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggM2ZiNWU2NmU0ZDY1Li5kNzY4 MWZlMGMwZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDI0MSwxMSArNDI0MSw5IEBA IHZvaWQgaTkxNV9nZW1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJbXV0ZXhfdW5s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKLXZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxp bmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmco c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQotCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA8IDUgfHwKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUgfHwKIAkgICAgZGV2X3By aXYtPm1tLmJpdF82X3N3aXp6bGVfeCA9PSBJOTE1X0JJVF82X1NXSVpaTEVfTk9ORSkKIAkJcmV0 dXJuOwogCkBAIC00MzE2LDE0ICs0MzE0LDE0IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJCXUzMiB0ZW1wID0gSTkxNV9SRUFEKEdFTjdfTVNHX0NUTCk7CiAJ CQl0ZW1wICY9IH4oV0FJVF9GT1JfUENIX0ZMUl9BQ0sgfCBXQUlUX0ZPUl9QQ0hfUkVTRVRfQUNL KTsKIAkJCUk5MTVfV1JJVEUoR0VON19NU0dfQ1RMLCB0ZW1wKTsKLQkJfSBlbHNlIGlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA3KSB7CisJCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA3KSB7CiAJCQl1MzIgdGVtcCA9IEk5MTVfUkVBRChIU1dfTkRFX1JTVFdSTl9PUFQpOwog CQkJdGVtcCAmPSB+UkVTRVRfUENIX0hBTkRTSEFLRV9FTkFCTEU7CiAJCQlJOTE1X1dSSVRFKEhT V19OREVfUlNUV1JOX09QVCwgdGVtcCk7CiAJCX0KIAl9CiAKLQlpOTE1X2dlbV9pbml0X3N3aXp6 bGluZyhkZXYpOworCWk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKGRldl9wcml2KTsKIAogCS8qCiAJ ICogQXQgbGVhc3QgODMwIGNhbiBsZWF2ZSBzb21lIG9mIHRoZSB1bnVzZWQgcmluZ3MKQEAgLTQz MzUsNyArNDMzMyw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAogCUJVR19PTighZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0KTsKIAotCXJldCA9IGk5MTVfcHBn dHRfaW5pdF9odyhkZXYpOworCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXZfcHJpdik7CiAJ aWYgKHJldCkgewogCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSBIVyBmYWlsZWQgJWRcbiIsIHJl dCk7CiAJCWdvdG8gb3V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAwMWYy MzhhZGZiNjcuLjU3ZTYxNzdjMGEzNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK QEAgLTE3OTQsMjIgKzE3OTQsMjEgQEAgc3RhdGljIGludCBnZW42X21tX3N3aXRjaChzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhf cHBndHRfZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBnZW44X3Bw Z3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAogCWZvcl9l YWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgewotCQl1MzIgZm91cl9sZXZlbCA9IFVT RVNfRlVMTF80OEJJVF9QUEdUVChkZXYpID8gR0VOOF9HRlhfUFBHVFRfNDhCIDogMDsKKwkJdTMy IGZvdXJfbGV2ZWwgPSBVU0VTX0ZVTExfNDhCSVRfUFBHVFQoZGV2X3ByaXYpID8KKwkJCQkgR0VO OF9HRlhfUFBHVFRfNDhCIDogMDsKIAkJSTkxNV9XUklURShSSU5HX01PREVfR0VONyhlbmdpbmUp LAogCQkJICAgX01BU0tFRF9CSVRfRU5BQkxFKEdGWF9QUEdUVF9FTkFCTEUgfCBmb3VyX2xldmVs KSk7CiAJfQogfQogCi1zdGF0aWMgdm9pZCBnZW43X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQorc3RhdGljIHZvaWQgZ2VuN19wcGd0dF9lbmFibGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJdWlu dDMyX3QgZWNvY2hrLCBlY29iaXRzOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwpAQCAtMTgz Myw5ICsxODMyLDggQEAgc3RhdGljIHZvaWQgZ2VuN19wcGd0dF9lbmFibGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjZfcHBndHRfZW5hYmxlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2VuYWJsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXVpbnQzMl90IGVjb2NoaywgZ2FiX2N0bCwgZWNv Yml0czsKIAogCWVjb2JpdHMgPSBJOTE1X1JFQUQoR0FDX0VDT19CSVRTKTsKQEAgLTIxOTMsMTAg KzIxOTEsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2FkZHJlc3Nfc3BhY2VfaW5pdChzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAlsaXN0X2FkZF90YWlsKCZ2bS0+Z2xvYmFsX2xpbmssICZk ZXZfcHJpdi0+dm1fbGlzdCk7CiB9CiAKLXN0YXRpYyB2b2lkIGd0dF93cml0ZV93b3JrYXJvdW5k cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgZ3R0X3dyaXRlX3dvcmthcm91 bmRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KIAkvKiBUaGlzIGZ1bmN0aW9u IGlzIGZvciBndHQgcmVsYXRlZCB3b3JrYXJvdW5kcy4gVGhpcyBmdW5jdGlvbiBpcwogCSAqIGNh bGxlZCBvbiBkcml2ZXIgbG9hZCBhbmQgYWZ0ZXIgYSBHUFUgcmVzZXQsIHNvIHlvdSBjYW4gcGxh Y2UKIAkgKiB3b3JrYXJvdW5kcyBoZXJlIGV2ZW4gaWYgdGhleSBnZXQgb3ZlcndyaXR0ZW4gYnkg R1BVIHJlc2V0LgpAQCAtMjIyOSwxMSArMjIyNSw5IEBAIHN0YXRpYyBpbnQgaTkxNV9wcGd0dF9p bml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlyZXR1cm4gcmV0OwogfQogCi1pbnQg aTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaTkxNV9wcGd0 dF9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KLQlndHRfd3JpdGVf d29ya2Fyb3VuZHMoZGV2KTsKKwlndHRfd3JpdGVfd29ya2Fyb3VuZHMoZGV2X3ByaXYpOwogCiAJ LyogSW4gdGhlIGNhc2Ugb2YgZXhlY2xpc3RzLCBQUEdUVCBpcyBlbmFibGVkIGJ5IHRoZSBjb250 ZXh0IGRlc2NyaXB0b3IKIAkgKiBhbmQgdGhlIFBEUHMgYXJlIGNvbnRhaW5lZCB3aXRoaW4gdGhl IGNvbnRleHQgaXRzZWxmLiAgV2UgZG9uJ3QKQEAgLTIyNDEsMTcgKzIyMzUsMTcgQEAgaW50IGk5 MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpCiAJCXJldHVybiAwOwogCi0JaWYgKCFVU0VTX1BQR1RUKGRldikpCisJaWYg KCFVU0VTX1BQR1RUKGRldl9wcml2KSkKIAkJcmV0dXJuIDA7CiAKIAlpZiAoSVNfR0VONihkZXZf cHJpdikpCi0JCWdlbjZfcHBndHRfZW5hYmxlKGRldik7CisJCWdlbjZfcHBndHRfZW5hYmxlKGRl dl9wcml2KTsKIAllbHNlIGlmIChJU19HRU43KGRldl9wcml2KSkKLQkJZ2VuN19wcGd0dF9lbmFi bGUoZGV2KTsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4KQotCQlnZW44X3Bw Z3R0X2VuYWJsZShkZXYpOworCQlnZW43X3BwZ3R0X2VuYWJsZShkZXZfcHJpdik7CisJZWxzZSBp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQorCQlnZW44X3BwZ3R0X2VuYWJsZShkZXZfcHJp dik7CiAJZWxzZQotCQlNSVNTSU5HX0NBU0UoSU5URUxfSU5GTyhkZXYpLT5nZW4pOworCQlNSVNT SU5HX0NBU0UoSU5URUxfR0VOKGRldl9wcml2KSk7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggNTdiNTg0OWM2NTllLi40OGI5NjAzM2M2N2UgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC00OTUsNyArNDk1LDcgQEAgaW50IGk5 MTVfZ2d0dF9lbmFibGVfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGlu dCBpOTE1X2dlbV9pbml0X2dndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK IHZvaWQgaTkxNV9nZ3R0X2NsZWFudXBfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKIAotaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K2ludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIHZvaWQgaTkxNV9wcGd0dF9yZWxlYXNlKHN0cnVjdCBrcmVmICprcmVmKTsKIHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICppOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkJCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZwcml2LAotLSAK Mi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=