From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 05/15] drm/i915: dev_priv cleanup in i915_gem_stolen.c Date: Wed, 16 Nov 2016 08:55:35 +0000 Message-ID: <1479286545-15020-6-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id B60A26E663 for ; Wed, 16 Nov 2016 08:55:57 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id u144so8748937wmu.0 for ; Wed, 16 Nov 2016 00:55:57 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFuZCBhIGxp dHRsZSBiaXQgb2YgY2FzY2FkZWQgZnVuY3Rpb24gcHJvdG90eXBlIGNoYW5nZXMuCgpTaWduZWQt b2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3N0b2xlbi5jIHwgMTQgKysrKysrLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg OCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCBkYmM0M2QyYmI3ZmYuLjFmMzZlMGYwMDIxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CkBAIC0zMjY0LDcgKzMyNjQsNyBAQCBpbnQgaTkxNV9nZW1fc3RvbGVuX2luc2VydF9ub2RlX2lu X3JhbmdlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJIHU2NCBlbmQp Owogdm9pZCBpOTE1X2dlbV9zdG9sZW5fcmVtb3ZlX25vZGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQkJCSBzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUpOwotaW50IGk5MTVf Z2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IGk5MTVfZ2VtX2lu aXRfc3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVf Z2VtX2NsZWFudXBfc3RvbGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKgogaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdTMyIHNpemUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp bmRleCAxMzM0ZGExNzI5NDUuLjc1YTBmMmQ0ZTYyZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKQEAgLTMyNTIsNyArMzI1Miw3IEBAIGludCBpOTE1X2dndHRfaW5pdF9odyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogSW5pdGlhbGlzZSBzdG9sZW4gZWFy bHkgc28gdGhhdCB3ZSBtYXkgcmVzZXJ2ZSBwcmVhbGxvY2F0ZWQKIAkgKiBvYmplY3RzIGZvciB0 aGUgQklPUyB0byBLTVMgdHJhbnNpdGlvbi4KIAkgKi8KLQlyZXQgPSBpOTE1X2dlbV9pbml0X3N0 b2xlbigmZGV2X3ByaXYtPmRybSk7CisJcmV0ID0gaTkxNV9nZW1faW5pdF9zdG9sZW4oZGV2X3By aXYpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0X2d0dF9jbGVhbnVwOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3N0b2xlbi5jCmluZGV4IDU0MDg1ZGYxZjIyNy4uYzE1NTE5ODhkYzZjIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwpAQCAtODksOSArODksOCBAQCB2 b2lkIGk5MTVfZ2VtX3N0b2xlbl9yZW1vdmVfbm9kZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+bW0uc3RvbGVuX2xvY2spOwogfQog Ci1zdGF0aWMgdW5zaWduZWQgbG9uZyBpOTE1X3N0b2xlbl90b19waHlzaWNhbChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQorc3RhdGljIHVuc2lnbmVkIGxvbmcgaTkxNV9zdG9sZW5fdG9fcGh5c2lj YWwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRl diA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9w cml2LT5nZ3R0OwogCXN0cnVjdCByZXNvdXJjZSAqcjsKQEAgLTI1Myw3ICsyNTIsNyBAQCBzdGF0 aWMgdW5zaWduZWQgbG9uZyBpOTE1X3N0b2xlbl90b19waHlzaWNhbChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCSAqIGtlcm5lbC4gU28gaWYgdGhlIHJlZ2lvbiBpcyBhbHJlYWR5IG1hcmtlZCBh cyBidXN5LCBzb21ldGhpbmcKIAkgKiBpcyBzZXJpb3VzbHkgd3JvbmcuCiAJICovCi0JciA9IGRl dm1fcmVxdWVzdF9tZW1fcmVnaW9uKGRldi0+ZGV2LCBiYXNlLCBnZ3R0LT5zdG9sZW5fc2l6ZSwK KwlyID0gZGV2bV9yZXF1ZXN0X21lbV9yZWdpb24oZGV2X3ByaXYtPmRybS5kZXYsIGJhc2UsIGdn dHQtPnN0b2xlbl9zaXplLAogCQkJCSAgICAiR3JhcGhpY3MgU3RvbGVuIE1lbW9yeSIpOwogCWlm IChyID09IE5VTEwpIHsKIAkJLyoKQEAgLTI2NCw3ICsyNjMsNyBAQCBzdGF0aWMgdW5zaWduZWQg bG9uZyBpOTE1X3N0b2xlbl90b19waHlzaWNhbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkg KiBQQ0kgYnVzLCBidXQgaGF2ZSBhbiBvZmYtYnktb25lIGVycm9yLiBIZW5jZSByZXRyeSB0aGUK IAkJICogcmVzZXJ2YXRpb24gc3RhcnRpbmcgZnJvbSAxIGluc3RlYWQgb2YgMC4KIAkJICovCi0J CXIgPSBkZXZtX3JlcXVlc3RfbWVtX3JlZ2lvbihkZXYtPmRldiwgYmFzZSArIDEsCisJCXIgPSBk ZXZtX3JlcXVlc3RfbWVtX3JlZ2lvbihkZXZfcHJpdi0+ZHJtLmRldiwgYmFzZSArIDEsCiAJCQkJ CSAgICBnZ3R0LT5zdG9sZW5fc2l6ZSAtIDEsCiAJCQkJCSAgICAiR3JhcGhpY3MgU3RvbGVuIE1l bW9yeSIpOwogCQkvKgpAQCAtNDA4LDkgKzQwNyw4IEBAIHN0YXRpYyB2b2lkIGJkd19nZXRfc3Rv bGVuX3Jlc2VydmVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJKnNpemUg PSBzdG9sZW5fdG9wIC0gKmJhc2U7CiB9CiAKLWludCBpOTE1X2dlbV9pbml0X3N0b2xlbihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQoraW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9ICZkZXZfcHJp di0+Z2d0dDsKIAl1bnNpZ25lZCBsb25nIHJlc2VydmVkX3RvdGFsLCByZXNlcnZlZF9iYXNlID0g MCwgcmVzZXJ2ZWRfc2l6ZTsKIAl1bnNpZ25lZCBsb25nIHN0b2xlbl90b3A7CkBAIC00MTgsNyAr NDE2LDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPm1tLnN0b2xlbl9sb2NrKTsKIAogI2lmZGVmIENPTkZJ R19JTlRFTF9JT01NVQotCWlmIChpbnRlbF9pb21tdV9nZnhfbWFwcGVkICYmIElOVEVMX0lORk8o ZGV2KS0+Z2VuIDwgOCkgeworCWlmIChpbnRlbF9pb21tdV9nZnhfbWFwcGVkICYmIElOVEVMX0dF TihkZXZfcHJpdikgPCA4KSB7CiAJCURSTV9JTkZPKCJETUFSIGFjdGl2ZSwgZGlzYWJsaW5nIHVz ZSBvZiBzdG9sZW4gbWVtb3J5XG4iKTsKIAkJcmV0dXJuIDA7CiAJfQpAQCAtNDI3LDcgKzQyNSw3 IEBAIGludCBpOTE1X2dlbV9pbml0X3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlm IChnZ3R0LT5zdG9sZW5fc2l6ZSA9PSAwKQogCQlyZXR1cm4gMDsKIAotCWRldl9wcml2LT5tbS5z dG9sZW5fYmFzZSA9IGk5MTVfc3RvbGVuX3RvX3BoeXNpY2FsKGRldik7CisJZGV2X3ByaXYtPm1t LnN0b2xlbl9iYXNlID0gaTkxNV9zdG9sZW5fdG9fcGh5c2ljYWwoZGV2X3ByaXYpOwogCWlmIChk ZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgPT0gMCkKIAkJcmV0dXJuIDA7CiAKLS0gCjIuNy40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK