From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v4 27/38] drm: Rename prev_node to hole in drm_mm_scan_add_block() Date: Thu, 22 Dec 2016 08:36:30 +0000 Message-ID: <20161222083641.2691-28-chris@chris-wilson.co.uk> References: <20161222083641.2691-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161222083641.2691-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QWNrbm93bGVkZ2luZyB0aGF0IHdlIHdlcmUgYnVpbGRpbmcgdXAgdGhlIGhvbGUgd2FzIG1vcmUg dXNlZnVsIHRvIG1lCndoZW4gcmVhZGluZyB0aGUgY29kZSwgdGhhbiBrbm93aW5nIHRoZSByZWxh dGlvbnNoaXAgYmV0d2VlbiB0aGlzIG5vZGUKYW5kIHRoZSBwcmV2aW91cyBub2RlLgoKU2lnbmVk LW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2Vk LWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2RybV9tbS5jIHwgMTYgKysrKysrKystLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vZHJtX21tLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMKaW5kZXgg MjFiZDJlMTM3MzhiLi40NTlmMTBjYTU3MTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fbW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMKQEAgLTgxMSw3ICs4MTEsNyBA QCBib29sIGRybV9tbV9zY2FuX2FkZF9ibG9jayhzdHJ1Y3QgZHJtX21tX3NjYW4gKnNjYW4sCiAJ CQkgICBzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUpCiB7CiAJc3RydWN0IGRybV9tbSAqbW0gPSBz Y2FuLT5tbTsKLQlzdHJ1Y3QgZHJtX21tX25vZGUgKnByZXZfbm9kZTsKKwlzdHJ1Y3QgZHJtX21t X25vZGUgKmhvbGU7CiAJdTY0IGhvbGVfc3RhcnQsIGhvbGVfZW5kOwogCXU2NCBhZGpfc3RhcnQs IGFkal9lbmQ7CiAKQEAgLTgyMSwxNyArODIxLDE3IEBAIGJvb2wgZHJtX21tX3NjYW5fYWRkX2Js b2NrKHN0cnVjdCBkcm1fbW1fc2NhbiAqc2NhbiwKIAlub2RlLT5zY2FubmVkX2Jsb2NrID0gMTsK IAltbS0+c2Nhbl9hY3RpdmUrKzsKIAotCXByZXZfbm9kZSA9IGxpc3RfcHJldl9lbnRyeShub2Rl LCBub2RlX2xpc3QpOworCWhvbGUgPSBsaXN0X3ByZXZfZW50cnkobm9kZSwgbm9kZV9saXN0KTsK IAotCW5vZGUtPnNjYW5uZWRfcHJlY2VlZHNfaG9sZSA9IHByZXZfbm9kZS0+aG9sZV9mb2xsb3dz OwotCXByZXZfbm9kZS0+aG9sZV9mb2xsb3dzID0gMTsKKwlub2RlLT5zY2FubmVkX3ByZWNlZWRz X2hvbGUgPSBob2xlLT5ob2xlX2ZvbGxvd3M7CisJaG9sZS0+aG9sZV9mb2xsb3dzID0gMTsKIAls aXN0X2RlbCgmbm9kZS0+bm9kZV9saXN0KTsKLQlub2RlLT5ub2RlX2xpc3QucHJldiA9ICZwcmV2 X25vZGUtPm5vZGVfbGlzdDsKKwlub2RlLT5ub2RlX2xpc3QucHJldiA9ICZob2xlLT5ub2RlX2xp c3Q7CiAJbm9kZS0+bm9kZV9saXN0Lm5leHQgPSAmc2Nhbi0+cHJldl9zY2FubmVkX25vZGUtPm5v ZGVfbGlzdDsKIAlzY2FuLT5wcmV2X3NjYW5uZWRfbm9kZSA9IG5vZGU7CiAKLQlhZGpfc3RhcnQg PSBob2xlX3N0YXJ0ID0gZHJtX21tX2hvbGVfbm9kZV9zdGFydChwcmV2X25vZGUpOwotCWFkal9l bmQgPSBob2xlX2VuZCA9IGRybV9tbV9ob2xlX25vZGVfZW5kKHByZXZfbm9kZSk7CisJYWRqX3N0 YXJ0ID0gaG9sZV9zdGFydCA9IGRybV9tbV9ob2xlX25vZGVfc3RhcnQoaG9sZSk7CisJYWRqX2Vu ZCA9IGhvbGVfZW5kID0gZHJtX21tX2hvbGVfbm9kZV9lbmQoaG9sZSk7CiAKIAlpZiAoc2Nhbi0+ Y2hlY2tfcmFuZ2UpIHsKIAkJaWYgKGFkal9zdGFydCA8IHNjYW4tPnJhbmdlX3N0YXJ0KQpAQCAt ODQxLDcgKzg0MSw3IEBAIGJvb2wgZHJtX21tX3NjYW5fYWRkX2Jsb2NrKHN0cnVjdCBkcm1fbW1f c2NhbiAqc2NhbiwKIAl9CiAKIAlpZiAobW0tPmNvbG9yX2FkanVzdCkKLQkJbW0tPmNvbG9yX2Fk anVzdChwcmV2X25vZGUsIHNjYW4tPmNvbG9yLCAmYWRqX3N0YXJ0LCAmYWRqX2VuZCk7CisJCW1t LT5jb2xvcl9hZGp1c3QoaG9sZSwgc2Nhbi0+Y29sb3IsICZhZGpfc3RhcnQsICZhZGpfZW5kKTsK IAogCWlmIChjaGVja19mcmVlX2hvbGUoYWRqX3N0YXJ0LCBhZGpfZW5kLAogCQkJICAgIHNjYW4t PnNpemUsIHNjYW4tPmFsaWdubWVudCkpIHsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==