From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v4 02/38] drm: Use drm_mm_nodes() as shorthand for the list of nodes under struct drm_mm Date: Thu, 22 Dec 2016 08:36:05 +0000 Message-ID: <20161222083641.2691-3-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: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RmFpcmx5IGNvbW1vbmx5IHdlIHdhbnQgdG8gaW5zcGVjdCB0aGUgbm9kZSBsaXN0IG9uIHRoZSBz dHJ1Y3QgZHJtX21tLAp3aGljaCBpcyBidXJpZWQgd2l0aGluIGFuIGVtYmVkZGVkIG5vZGUuIEJy aW5nIGl0IHRvIHRoZSBzdXJmYWNlIHdpdGggYQpiaXQgb2Ygc3ludGF0aWMgc3VnYXIuCgpOb3Rl IHRoaXMgd2FzIGludGVuZGVkIHRvIGJlIHNwbGl0IGZyb20gY29tbWl0IGFkNTc5MDAyYzhlYyAo ImRybTogQWRkCmRybV9tbV9mb3JfZWFjaF9ub2RlX3NhZmUoKSIpIGJlZm9yZSBiZWluZyBhcHBs aWVkLCBidXQgbXkgdGltaW5nIHN1Y2tzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpv b25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fbW0uYyB8ICA4ICsrKyst LS0tCiBpbmNsdWRlL2RybS9kcm1fbW0uaCAgICAgfCAxOCArKysrKysrKysrKysrKystLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMK aW5kZXggNzU3MzY2MTMwMmE0Li40MjU3Yzg2Y2MzMDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fbW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21tLmMKQEAgLTEzOCw3ICsx MzgsNyBAQCBzdGF0aWMgdm9pZCBzaG93X2xlYWtzKHN0cnVjdCBkcm1fbW0gKm1tKQogCWlmICgh YnVmKQogCQlyZXR1cm47CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG5vZGUsIF9fZHJtX21tX25v ZGVzKG1tKSwgbm9kZV9saXN0KSB7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShub2RlLCBkcm1fbW1f bm9kZXMobW0pLCBub2RlX2xpc3QpIHsKIAkJc3RydWN0IHN0YWNrX3RyYWNlIHRyYWNlID0gewog CQkJLmVudHJpZXMgPSBlbnRyaWVzLAogCQkJLm1heF9lbnRyaWVzID0gU1RBQ0tERVBUSApAQCAt MzIwLDcgKzMyMCw3IEBAIGludCBkcm1fbW1fcmVzZXJ2ZV9ub2RlKHN0cnVjdCBkcm1fbW0gKm1t LCBzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUpCiAJCWlmIChob2xlLT5zdGFydCA8IGVuZCkKIAkJ CXJldHVybiAtRU5PU1BDOwogCX0gZWxzZSB7Ci0JCWhvbGUgPSBsaXN0X2VudHJ5KF9fZHJtX21t X25vZGVzKG1tKSwgdHlwZW9mKCpob2xlKSwgbm9kZV9saXN0KTsKKwkJaG9sZSA9IGxpc3RfZW50 cnkoZHJtX21tX25vZGVzKG1tKSwgdHlwZW9mKCpob2xlKSwgbm9kZV9saXN0KTsKIAl9CiAKIAlo b2xlID0gbGlzdF9sYXN0X2VudHJ5KCZob2xlLT5ub2RlX2xpc3QsIHR5cGVvZigqaG9sZSksIG5v ZGVfbGlzdCk7CkBAIC04ODMsNyArODgzLDcgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW1fc2Nhbl9y ZW1vdmVfYmxvY2spOwogICovCiBib29sIGRybV9tbV9jbGVhbihjb25zdCBzdHJ1Y3QgZHJtX21t ICptbSkKIHsKLQljb25zdCBzdHJ1Y3QgbGlzdF9oZWFkICpoZWFkID0gX19kcm1fbW1fbm9kZXMo bW0pOworCWNvbnN0IHN0cnVjdCBsaXN0X2hlYWQgKmhlYWQgPSBkcm1fbW1fbm9kZXMobW0pOwog CiAJcmV0dXJuIChoZWFkLT5uZXh0LT5uZXh0ID09IGhlYWQpOwogfQpAQCAtOTI5LDcgKzkyOSw3 IEBAIEVYUE9SVF9TWU1CT0woZHJtX21tX2luaXQpOwogICovCiB2b2lkIGRybV9tbV90YWtlZG93 bihzdHJ1Y3QgZHJtX21tICptbSkKIHsKLQlpZiAoV0FSTighbGlzdF9lbXB0eShfX2RybV9tbV9u b2RlcyhtbSkpLAorCWlmIChXQVJOKCFsaXN0X2VtcHR5KGRybV9tbV9ub2RlcyhtbSkpLAogCQkg Ik1lbW9yeSBtYW5hZ2VyIG5vdCBjbGVhbiBkdXJpbmcgdGFrZWRvd24uXG4iKSkKIAkJc2hvd19s ZWFrcyhtbSk7CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9tbS5oIGIvaW5jbHVkZS9k cm0vZHJtX21tLmgKaW5kZXggNWM3ZjE1ODc1YjZhLi5mNmE2OGVkNWVjYWYgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvZHJtL2RybV9tbS5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9tbS5oCkBAIC0xODAs NyArMTgwLDE5IEBAIHN0YXRpYyBpbmxpbmUgdTY0IGRybV9tbV9ob2xlX25vZGVfZW5kKGNvbnN0 IHN0cnVjdCBkcm1fbW1fbm9kZSAqaG9sZV9ub2RlKQogCXJldHVybiBfX2RybV9tbV9ob2xlX25v ZGVfZW5kKGhvbGVfbm9kZSk7CiB9CiAKLSNkZWZpbmUgX19kcm1fbW1fbm9kZXMobW0pICgmKG1t KS0+aGVhZF9ub2RlLm5vZGVfbGlzdCkKKy8qKgorICogZHJtX21tX25vZGVzIC0gbGlzdCBvZiBu b2RlcyB1bmRlciB0aGUgZHJtX21tIHJhbmdlIG1hbmFnZXIKKyAqIEBtbTogdGhlIHN0cnVjdCBk cm1fbW0gcmFuZ2UgbWFuZ2VyCisgKgorICogQXMgdGhlIGRybV9tbSByYW5nZSBtYW5hZ2VyIGhp ZGVzIGl0cyBub2RlX2xpc3QgZGVlcCB3aXRoIGl0cworICogc3RydWN0dXJlLCBleHRyYWN0aW5n IGl0IGxvb2tzIHBhaW5mdWwgYW5kIHJlcGV0aXRpdmUuIFRoaXMgaXMKKyAqIG5vdCBleHBlY3Rl ZCB0byBiZSB1c2VkIG91dHNpZGUgb2YgdGhlIGRybV9tbV9mb3JfZWFjaF9ub2RlKCkKKyAqIG1h Y3JvcyBhbmQgc2ltaWxhciBpbnRlcm5hbCBmdW5jdGlvbnMuCisgKgorICogUmV0dXJuczoKKyAq IFRoZSBub2RlIGxpc3QsIG1heSBiZSBlbXB0eS4KKyAqLworI2RlZmluZSBkcm1fbW1fbm9kZXMo bW0pICgmKG1tKS0+aGVhZF9ub2RlLm5vZGVfbGlzdCkKIAogLyoqCiAgKiBkcm1fbW1fZm9yX2Vh Y2hfbm9kZSAtIGl0ZXJhdG9yIHRvIHdhbGsgb3ZlciBhbGwgYWxsb2NhdGVkIG5vZGVzCkBAIC0x OTEsNyArMjAzLDcgQEAgc3RhdGljIGlubGluZSB1NjQgZHJtX21tX2hvbGVfbm9kZV9lbmQoY29u c3Qgc3RydWN0IGRybV9tbV9ub2RlICpob2xlX25vZGUpCiAgKiB3aXRoIGxpc3RfZm9yX2VhY2gs IHNvIG5vdCBzYXZlIGFnYWluc3QgcmVtb3ZhbCBvZiBlbGVtZW50cy4KICAqLwogI2RlZmluZSBk cm1fbW1fZm9yX2VhY2hfbm9kZShlbnRyeSwgbW0pIFwKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGVu dHJ5LCBfX2RybV9tbV9ub2RlcyhtbSksIG5vZGVfbGlzdCkKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5 KGVudHJ5LCBkcm1fbW1fbm9kZXMobW0pLCBub2RlX2xpc3QpCiAKIC8qKgogICogZHJtX21tX2Zv cl9lYWNoX25vZGVfc2FmZSAtIGl0ZXJhdG9yIHRvIHdhbGsgb3ZlciBhbGwgYWxsb2NhdGVkIG5v ZGVzCkBAIC0yMDMsNyArMjE1LDcgQEAgc3RhdGljIGlubGluZSB1NjQgZHJtX21tX2hvbGVfbm9k ZV9lbmQoY29uc3Qgc3RydWN0IGRybV9tbV9ub2RlICpob2xlX25vZGUpCiAgKiB3aXRoIGxpc3Rf Zm9yX2VhY2hfc2FmZSwgc28gc2F2ZSBhZ2FpbnN0IHJlbW92YWwgb2YgZWxlbWVudHMuCiAgKi8K ICNkZWZpbmUgZHJtX21tX2Zvcl9lYWNoX25vZGVfc2FmZShlbnRyeSwgbmV4dCwgbW0pIFwKLQls aXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZW50cnksIG5leHQsIF9fZHJtX21tX25vZGVzKG1tKSwg bm9kZV9saXN0KQorCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShlbnRyeSwgbmV4dCwgZHJtX21t X25vZGVzKG1tKSwgbm9kZV9saXN0KQogCiAjZGVmaW5lIF9fZHJtX21tX2Zvcl9lYWNoX2hvbGUo ZW50cnksIG1tLCBob2xlX3N0YXJ0LCBob2xlX2VuZCwgYmFja3dhcmRzKSBcCiAJZm9yIChlbnRy eSA9IGxpc3RfZW50cnkoKGJhY2t3YXJkcykgPyAobW0pLT5ob2xlX3N0YWNrLnByZXYgOiAobW0p LT5ob2xlX3N0YWNrLm5leHQsIHN0cnVjdCBkcm1fbW1fbm9kZSwgaG9sZV9zdGFjayk7IFwKLS0g CjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==