From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: clean up aliasing_gtt_bind_vma Date: Wed, 23 Mar 2016 16:18:33 +0000 Message-ID: <1458749913-12273-1-git-send-email-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D36FC6E3EC for ; Wed, 23 Mar 2016 16:18:44 +0000 (UTC) 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 Tm8gcG9pbnQgaW4gaW5pdGlhbGlzaW5nIHBhZ2VzIHdpdGggb2JqLT5wYWdlcywgb25seSB0byBv dmVyd3JpdGUgaXQgd2l0aApnZ3R0X3ZpZXcucGFnZXMgbGF0ZXIuIFNvIGxldHMganVzdCBnZXQg cmlkIG9mIHBhZ2VzIGFsdG9nZXRoZXIuCgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFo dGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRo ZXcuYXVsZEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMgfCAxMCArKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMDcxNWJiNy4u MzAyMjk2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTI2MTYsMjkgKzI2 MTYsMjUgQEAgc3RhdGljIGludCBhbGlhc2luZ19ndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1h ICp2bWEsCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHZtYS0+dm0tPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9iajsKLQlzdHJ1Y3Qgc2dfdGFibGUgKnBh Z2VzID0gb2JqLT5wYWdlczsKIAl1MzIgcHRlX2ZsYWdzID0gMDsKIAlpbnQgcmV0OwogCiAJcmV0 ID0gaTkxNV9nZXRfZ2d0dF92bWFfcGFnZXModm1hKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0 OwotCXBhZ2VzID0gdm1hLT5nZ3R0X3ZpZXcucGFnZXM7CiAKIAkvKiBDdXJyZW50bHkgYXBwbGlj YWJsZSBvbmx5IHRvIFZMViAqLwogCWlmIChvYmotPmd0X3JvKQogCQlwdGVfZmxhZ3MgfD0gUFRF X1JFQURfT05MWTsKIAotCi0JaWYgKGZsYWdzICYgR0xPQkFMX0JJTkQpIHsKLQkJdm1hLT52bS0+ aW5zZXJ0X2VudHJpZXModm1hLT52bSwgcGFnZXMsCisJaWYgKGZsYWdzICYgR0xPQkFMX0JJTkQp CisJCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYS0+Z2d0dF92aWV3LnBhZ2Vz LAogCQkJCQl2bWEtPm5vZGUuc3RhcnQsCiAJCQkJCWNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOwot CX0KIAogCWlmIChmbGFncyAmIExPQ0FMX0JJTkQpIHsKIAkJc3RydWN0IGk5MTVfaHdfcHBndHQg KmFwcGd0dCA9IGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dDsKLQkJYXBwZ3R0LT5iYXNlLmlu c2VydF9lbnRyaWVzKCZhcHBndHQtPmJhc2UsIHBhZ2VzLAorCQlhcHBndHQtPmJhc2UuaW5zZXJ0 X2VudHJpZXMoJmFwcGd0dC0+YmFzZSwgdm1hLT5nZ3R0X3ZpZXcucGFnZXMsCiAJCQkJCSAgICB2 bWEtPm5vZGUuc3RhcnQsCiAJCQkJCSAgICBjYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKIAl9Ci0t IAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==