From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH 25/34] drm/i915: Convert vgpus_idr to XArray Date: Thu, 21 Feb 2019 10:42:07 -0800 Message-ID: <20190221184226.2149-48-willy@infradead.org> References: <20190221184226.2149-1-willy@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 662B88915E for ; Thu, 21 Feb 2019 18:42:36 +0000 (UTC) In-Reply-To: <20190221184226.2149-1-willy@infradead.org> 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: Matthew Wilcox List-Id: dri-devel@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWF0dGhldyBXaWxjb3ggPHdpbGx5QGluZnJhZGVhZC5vcmc+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2Rpc3BsYXkuYyAgICAgIHwgIDUgKysrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2d2dC9ndnQuYyAgICAgICAgICB8ICA0ICstLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2d2dC9ndnQuaCAgICAgICAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9ndnQva3ZtZ3QuYyAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0 L3NjaGVkX3BvbGljeS5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC92Z3B1LmMg ICAgICAgICB8IDIwICsrKysrKysrKystLS0tLS0tLS0tCiA2IGZpbGVzIGNoYW5nZWQsIDE5IGlu c2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d2dC9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZGlzcGxheS5j CmluZGV4IGRmMWUxNDE0NTc0Ny4uZTBiMjVlZmQ5ZmVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndnQvZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9k aXNwbGF5LmMKQEAgLTM1OSw3ICszNTksOCBAQCB2b2lkIGludGVsX2d2dF9jaGVja192Ymxhbmtf ZW11bGF0aW9uKHN0cnVjdCBpbnRlbF9ndnQgKmd2dCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZ3Z0X2ly cSAqaXJxID0gJmd2dC0+aXJxOwogCXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1OwotCWludCBwaXBl LCBpZDsKKwl1bnNpZ25lZCBsb25nIGlkOworCWludCBwaXBlOwogCWludCBmb3VuZCA9IGZhbHNl OwogCiAJbXV0ZXhfbG9jaygmZ3Z0LT5sb2NrKTsKQEAgLTQzNCw3ICs0MzUsNyBAQCBzdGF0aWMg dm9pZCBlbXVsYXRlX3ZibGFuayhzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSkKIHZvaWQgaW50ZWxf Z3Z0X2VtdWxhdGVfdmJsYW5rKHN0cnVjdCBpbnRlbF9ndnQgKmd2dCkKIHsKIAlzdHJ1Y3QgaW50 ZWxfdmdwdSAqdmdwdTsKLQlpbnQgaWQ7CisJdW5zaWduZWQgbG9uZyBpZDsKIAogCW11dGV4X2xv Y2soJmd2dC0+bG9jayk7CiAJZm9yX2VhY2hfYWN0aXZlX3ZncHUoZ3Z0LCB2Z3B1LCBpZCkKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndnQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d2dC9ndnQuYwppbmRleCA3MzNhMmEwZDBjMzAuLmVmNmM2MmViYzJiZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d2dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d2dC9ndnQuYwpAQCAtMzI5LDcgKzMyOSw2IEBAIHZvaWQgaW50ZWxfZ3Z0X2NsZWFu X2RldmljZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaW50ZWxfZ3Z0X2Ns ZWFuX2lycShndnQpOwogCWludGVsX2d2dF9mcmVlX2Zpcm13YXJlKGd2dCk7CiAJaW50ZWxfZ3Z0 X2NsZWFuX21taW9faW5mbyhndnQpOwotCWlkcl9kZXN0cm95KCZndnQtPnZncHVfaWRyKTsKIAog CWtmcmVlKGRldl9wcml2LT5ndnQpOwogCWRldl9wcml2LT5ndnQgPSBOVUxMOwpAQCAtMzY4LDcg KzM2Nyw3IEBAIGludCBpbnRlbF9ndnRfaW5pdF9kZXZpY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCiAJZ3Z0X2RiZ19jb3JlKCJpbml0IGd2dCBkZXZpY2VcbiIpOwogCi0J aWRyX2luaXQoJmd2dC0+dmdwdV9pZHIpOworCXhhX2luaXRfZmxhZ3MoJmd2dC0+dmdwdXMsIFhB X0ZMQUdTX0FMTE9DMSk7CiAJc3Bpbl9sb2NrX2luaXQoJmd2dC0+c2NoZWR1bGVyLm1taW9fY29u dGV4dF9sb2NrKTsKIAltdXRleF9pbml0KCZndnQtPmxvY2spOwogCW11dGV4X2luaXQoJmd2dC0+ c2NoZWRfbG9jayk7CkBAIC00NjIsNyArNDYxLDYgQEAgaW50IGludGVsX2d2dF9pbml0X2Rldmlj ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBvdXRfY2xlYW5fbW1pb19pbmZv OgogCWludGVsX2d2dF9jbGVhbl9tbWlvX2luZm8oZ3Z0KTsKIG91dF9jbGVhbl9pZHI6Ci0JaWRy X2Rlc3Ryb3koJmd2dC0+dmdwdV9pZHIpOwogCWtmcmVlKGd2dCk7CiAJcmV0dXJuIHJldDsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndnQuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2d2dC9ndnQuaAppbmRleCBmZmIxODFhMDg2YmUuLjg0M2QxOTlkYzgyYSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d2dC5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2d2dC9ndnQuaApAQCAtMzE0LDcgKzMxNCw3IEBAIHN0cnVjdCBpbnRlbF9ndnQg ewogCXN0cnVjdCBtdXRleCBzY2hlZF9sb2NrOwogCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2OwotCXN0cnVjdCBpZHIgdmdwdV9pZHI7CS8qIHZHUFUgSURSIHBvb2wgKi8KKwlz dHJ1Y3QgeGFycmF5IHZncHVzOwkvKiB2R1BVIElEUiBwb29sICovCiAKIAlzdHJ1Y3QgaW50ZWxf Z3Z0X2RldmljZV9pbmZvIGRldmljZV9pbmZvOwogCXN0cnVjdCBpbnRlbF9ndnRfZ20gZ207CkBA IC00NTgsOCArNDU4LDkgQEAgdm9pZCBpbnRlbF92Z3B1X3dyaXRlX2ZlbmNlKHN0cnVjdCBpbnRl bF92Z3B1ICp2Z3B1LAogI2RlZmluZSB2Z3B1X3NyZWcodmdwdSwgb2Zmc2V0KSBcCiAJKCoodTMy ICopKHZncHUtPm1taW8uc3JlZyArIChvZmZzZXQpKSkKIAorLyogQ2FuIHRoaXMgdXNlIGFuIFhB cnJheSBtYXJrIGluc3RlYWQ/ICovCiAjZGVmaW5lIGZvcl9lYWNoX2FjdGl2ZV92Z3B1KGd2dCwg dmdwdSwgaWQpIFwKLQlpZHJfZm9yX2VhY2hfZW50cnkoKCYoZ3Z0KS0+dmdwdV9pZHIpLCAodmdw dSksIChpZCkpIFwKKwl4YV9mb3JfZWFjaCgoJihndnQpLT52Z3B1cyksIChpZCksICh2Z3B1KSkg XAogCQlmb3JfZWFjaF9pZih2Z3B1LT5hY3RpdmUpCiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRl bF92Z3B1X3dyaXRlX3BjaV9iYXIoc3RydWN0IGludGVsX3ZncHUgKnZncHUsCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2d2dC9rdm1ndC5jCmluZGV4IGRkM2RmZDAwZjRlNi4uN2Y3NjE4NzljMTRhIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9ndnQva3ZtZ3QuYwpAQCAtMTU4Nyw3ICsxNTg3LDcgQEAgc3RhdGljIGJvb2wgX19rdm1n dF92Z3B1X2V4aXN0KHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCBzdHJ1Y3Qga3ZtICprdm0pCiB7 CiAJc3RydWN0IGludGVsX3ZncHUgKml0cjsKIAlzdHJ1Y3Qga3ZtZ3RfZ3Vlc3RfaW5mbyAqaW5m bzsKLQlpbnQgaWQ7CisJdW5zaWduZWQgbG9uZyBpZDsKIAlib29sIHJldCA9IGZhbHNlOwogCiAJ bXV0ZXhfbG9jaygmdmdwdS0+Z3Z0LT5sb2NrKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d2dC9zY2hlZF9wb2xpY3kuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9zY2hl ZF9wb2xpY3kuYwppbmRleCBjMzJlN2Q1ZTg2MjkuLmYwMjIzZTBhMWEyMyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkX3BvbGljeS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2d2dC9zY2hlZF9wb2xpY3kuYwpAQCAtMzM0LDcgKzMzNCw3IEBAIHN0YXRpYyB2 b2lkIHRic19zY2hlZF9jbGVhbl92Z3B1KHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1KQogCXZncHUt PnNjaGVkX2RhdGEgPSBOVUxMOwogCiAJLyogdGhpcyB2Z3B1IGlkIGhhcyBiZWVuIHJlbW92ZWQg Ki8KLQlpZiAoaWRyX2lzX2VtcHR5KCZndnQtPnZncHVfaWRyKSkKKwlpZiAoeGFfZW1wdHkoJmd2 dC0+dmdwdXMpKQogCQlocnRpbWVyX2NhbmNlbCgmc2NoZWRfZGF0YS0+dGltZXIpOwogfQogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvdmdwdS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZ3Z0L3ZncHUuYwppbmRleCBjMWRiOWE2YTEyODEuLjVkZmRmYTIwMzMxZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3ZncHUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndnQvdmdwdS5jCkBAIC0yOTAsOCArMjkwLDggQEAgdm9pZCBpbnRlbF9ndnRf ZGVzdHJveV92Z3B1KHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1KQogCW11dGV4X3VubG9jaygmdmdw dS0+dmdwdV9sb2NrKTsKIAogCW11dGV4X2xvY2soJmd2dC0+bG9jayk7Ci0JaWRyX3JlbW92ZSgm Z3Z0LT52Z3B1X2lkciwgdmdwdS0+aWQpOwotCWlmIChpZHJfaXNfZW1wdHkoJmd2dC0+dmdwdV9p ZHIpKQorCXhhX2VyYXNlKCZndnQtPnZncHVzLCB2Z3B1LT5pZCk7CisJaWYgKHhhX2VtcHR5KCZn dnQtPnZncHVzKSkKIAkJaW50ZWxfZ3Z0X2NsZWFuX2lycShndnQpOwogCWludGVsX2d2dF91cGRh dGVfdmdwdV90eXBlcyhndnQpOwogCW11dGV4X3VubG9jaygmZ3Z0LT5sb2NrKTsKQEAgLTI5OSw3 ICsyOTksOCBAQCB2b2lkIGludGVsX2d2dF9kZXN0cm95X3ZncHUoc3RydWN0IGludGVsX3ZncHUg KnZncHUpCiAJdmZyZWUodmdwdSk7CiB9CiAKLSNkZWZpbmUgSURMRV9WR1BVX0lEUiAwCisvKiBE b24ndCBjaGFuZ2UgdGhpcyB3aXRob3V0IGNoYW5naW5nIHRoZSBYQV9GTEFHU19BTExPQzEgaW5p dGlhbGlzYXRpb24gKi8KKyNkZWZpbmUgSURMRV9WR1BVX0lEIDAKIAogLyoqCiAgKiBpbnRlbF9n dnRfY3JlYXRlX2lkbGVfdmdwdSAtIGNyZWF0ZSBhbiBpZGxlIHZpcnR1YWwgR1BVCkBAIC0zMjAs NyArMzIxLDcgQEAgc3RydWN0IGludGVsX3ZncHUgKmludGVsX2d2dF9jcmVhdGVfaWRsZV92Z3B1 KHN0cnVjdCBpbnRlbF9ndnQgKmd2dCkKIAlpZiAoIXZncHUpCiAJCXJldHVybiBFUlJfUFRSKC1F Tk9NRU0pOwogCi0JdmdwdS0+aWQgPSBJRExFX1ZHUFVfSURSOworCXZncHUtPmlkID0gSURMRV9W R1BVX0lEOwogCXZncHUtPmd2dCA9IGd2dDsKIAltdXRleF9pbml0KCZ2Z3B1LT52Z3B1X2xvY2sp OwogCkBAIC0zNzAsMTIgKzM3MSwxMSBAQCBzdGF0aWMgc3RydWN0IGludGVsX3ZncHUgKl9faW50 ZWxfZ3Z0X2NyZWF0ZV92Z3B1KHN0cnVjdCBpbnRlbF9ndnQgKmd2dCwKIAlpZiAoIXZncHUpCiAJ CXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCi0JcmV0ID0gaWRyX2FsbG9jKCZndnQtPnZncHVf aWRyLCB2Z3B1LCBJRExFX1ZHUFVfSURSICsgMSwgR1ZUX01BWF9WR1BVLAotCQlHRlBfS0VSTkVM KTsKKwlyZXQgPSB4YV9hbGxvYygmZ3Z0LT52Z3B1cywgJnZncHUtPmlkLCB2Z3B1LAorCQkJWEFf TElNSVQoMCwgR1ZUX01BWF9WR1BVKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHJldCA8IDApCiAJCWdv dG8gb3V0X2ZyZWVfdmdwdTsKIAotCXZncHUtPmlkID0gcmV0OwogCXZncHUtPmhhbmRsZSA9IHBh cmFtLT5oYW5kbGU7CiAJdmdwdS0+Z3Z0ID0gZ3Z0OwogCXZncHUtPnNjaGVkX2N0bC53ZWlnaHQg PSBwYXJhbS0+d2VpZ2h0OwpAQCAtMzg4LDcgKzM4OCw3IEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxf dmdwdSAqX19pbnRlbF9ndnRfY3JlYXRlX3ZncHUoc3RydWN0IGludGVsX2d2dCAqZ3Z0LAogCiAJ cmV0ID0gaW50ZWxfdmdwdV9pbml0X21taW8odmdwdSk7CiAJaWYgKHJldCkKLQkJZ290byBvdXRf Y2xlYW5faWRyOworCQlnb3RvIG91dF9lcmFzZTsKIAogCXJldCA9IGludGVsX3ZncHVfYWxsb2Nf cmVzb3VyY2UodmdwdSwgcGFyYW0pOwogCWlmIChyZXQpCkBAIC00NDYsOCArNDQ2LDggQEAgc3Rh dGljIHN0cnVjdCBpbnRlbF92Z3B1ICpfX2ludGVsX2d2dF9jcmVhdGVfdmdwdShzdHJ1Y3QgaW50 ZWxfZ3Z0ICpndnQsCiAJaW50ZWxfdmdwdV9mcmVlX3Jlc291cmNlKHZncHUpOwogb3V0X2NsZWFu X3ZncHVfbW1pbzoKIAlpbnRlbF92Z3B1X2NsZWFuX21taW8odmdwdSk7Ci1vdXRfY2xlYW5faWRy OgotCWlkcl9yZW1vdmUoJmd2dC0+dmdwdV9pZHIsIHZncHUtPmlkKTsKK291dF9lcmFzZToKKwl4 YV9lcmFzZSgmZ3Z0LT52Z3B1cywgdmdwdS0+aWQpOwogb3V0X2ZyZWVfdmdwdToKIAl2ZnJlZSh2 Z3B1KTsKIAlyZXR1cm4gRVJSX1BUUihyZXQpOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=