From: Maarten Lankhorst Subject: [PATCH] drm/i915: Fix plane allocation/free functions Date: Tue, 13 Nov 2018 10:28:04 +0100 Message-ID: <20181113092804.13304-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id D1A886E36C for ; Tue, 13 Nov 2018 09:28:07 +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 VXNlIGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUgaW4gaW50ZWxfcGxhbmVfZnJlZSB0byBmcmVl IHRoZSBzdGF0ZS4KQWxzbyBmaXggaW50ZWxfcGxhbmVfYWxsb2MoKSB0byB1c2UgX19kcm1fYXRv bWljX2hlbHBlcl9wbGFuZV9yZXNldCgpLAp0byBnZXQgc2FuZSBkZWZhdWx0cyBmcm9tIHRoZSBh dG9taWMgY29yZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJlcG9ydGVkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZp bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KRml4ZXM6IGIyMDgxNTI1NTY5MyAoImRybS9pOTE1OiBB ZGQgcGxhbmUgYWxwaGEgYmxlbmRpbmcgc3VwcG9ydCwgdjIuIikKLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8IDQwICsrKysrKysrKysrKy0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICB8ICA1ICsrLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgfCAyOSAtLS0tLS0tLS0tLS0t LS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDUxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXggN2QzNjg1MDc1 MjAxLi45MDVmOGVmM2JhNGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pY19wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19w bGFuZS5jCkBAIC0zNiwyOSArMzYsMzEgQEAKICNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBl ci5oPgogI2luY2x1ZGUgImludGVsX2Rydi5oIgogCi0vKioKLSAqIGludGVsX2NyZWF0ZV9wbGFu ZV9zdGF0ZSAtIGNyZWF0ZSBwbGFuZSBzdGF0ZSBvYmplY3QKLSAqIEBwbGFuZTogZHJtIHBsYW5l Ci0gKgotICogQWxsb2NhdGVzIGEgZnJlc2ggcGxhbmUgc3RhdGUgZm9yIHRoZSBnaXZlbiBwbGFu ZSBhbmQgc2V0cyBzb21lIG9mCi0gKiB0aGUgc3RhdGUgdmFsdWVzIHRvIHNlbnNpYmxlIGluaXRp YWwgdmFsdWVzLgotICoKLSAqIFJldHVybnM6IEEgbmV3bHkgYWxsb2NhdGVkIHBsYW5lIHN0YXRl LCBvciBOVUxMIG9uIGZhaWx1cmUKLSAqLwotc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICoKLWlu dGVsX2NyZWF0ZV9wbGFuZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKK3N0cnVjdCBp bnRlbF9wbGFuZSAqaW50ZWxfcGxhbmVfYWxsb2Modm9pZCkKIHsKLQlzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKnN0YXRlOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7 CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKIAotCXN0YXRlID0ga3phbGxvYyhzaXplb2Yo KnN0YXRlKSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFzdGF0ZSkKLQkJcmV0dXJuIE5VTEw7CisJcGxh bmUgPSBremFsbG9jKHNpemVvZigqcGxhbmUpLCBHRlBfS0VSTkVMKTsKKwlpZiAoIXBsYW5lKQor CQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKIAotCXN0YXRlLT5iYXNlLnBsYW5lID0gcGxhbmU7 Ci0Jc3RhdGUtPmJhc2Uucm90YXRpb24gPSBEUk1fTU9ERV9ST1RBVEVfMDsKLQlzdGF0ZS0+c2Nh bGVyX2lkID0gLTE7CisJcGxhbmVfc3RhdGUgPSBremFsbG9jKHNpemVvZigqcGxhbmVfc3RhdGUp LCBHRlBfS0VSTkVMKTsKKwlpZiAoIXBsYW5lX3N0YXRlKSB7CisJCWtmcmVlKHBsYW5lKTsKKwkJ cmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisJfQogCi0JcmV0dXJuIHN0YXRlOworCV9fZHJtX2F0 b21pY19oZWxwZXJfcGxhbmVfcmVzZXQoJnBsYW5lLT5iYXNlLCAmcGxhbmVfc3RhdGUtPmJhc2Up OworCXBsYW5lX3N0YXRlLT5zY2FsZXJfaWQgPSAtMTsKKworCXJldHVybiBwbGFuZTsKK30KKwor dm9pZCBpbnRlbF9wbGFuZV9mcmVlKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCit7CisJaW50 ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSgmcGxhbmUtPmJhc2UsIHBsYW5lLT5iYXNlLnN0YXRlKTsK KwlrZnJlZShwbGFuZSk7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAx MGE1ZGY2NmU0ZWIuLjJhODk3ZTE3NGVkNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTIyMTksOCArMjIxOSw2IEBAIHZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSk7CiBpbnQgaW50ZWxfcGxhbmVfY2hlY2tfc3Ry aWRlKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwogaW50IGlu dGVsX3BsYW5lX2NoZWNrX3NyY19jb29yZGluYXRlcyhzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlKTsKIGludCBjaHZfcGxhbmVfY2hlY2tfcm90YXRpb24oY29uc3Qgc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7Ci1zdHJ1Y3QgaW50ZWxfcGxhbmUgKmlu dGVsX3BsYW5lX2FsbG9jKHZvaWQpOwotdm9pZCBpbnRlbF9wbGFuZV9mcmVlKHN0cnVjdCBpbnRl bF9wbGFuZSAqcGxhbmUpOwogc3RydWN0IGludGVsX3BsYW5lICoKIHNrbF91bml2ZXJzYWxfcGxh bmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgIGVudW0g cGlwZSBwaXBlLCBlbnVtIHBsYW5lX2lkIHBsYW5lX2lkKTsKQEAgLTIyODIsNyArMjI4MCw4IEBA IGludCBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkgICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp OwogCiAvKiBpbnRlbF9hdG9taWNfcGxhbmUuYyAqLwotc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICppbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpOworc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZV9hbGxvYyh2b2lkKTsKK3ZvaWQgaW50ZWxfcGxh bmVfZnJlZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKTsKIHN0cnVjdCBkcm1fcGxhbmVfc3Rh dGUgKmludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7 CiB2b2lkIGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAJCQkgICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYwppbmRleCBmYWNmN2NhOGYxNGYuLjdkYjZkMDYwZWZlNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE5ODIsMzUgKzE5ODIsNiBAQCBzdGF0aWMg Ym9vbCBza2xfcGxhbmVfaGFzX2NjcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJCSBwbGFuZV9pZCA9PSBQTEFORV9TUFJJVEUwKTsKIH0KIAotc3RydWN0IGludGVsX3BsYW5l ICppbnRlbF9wbGFuZV9hbGxvYyh2b2lkKQotewotCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGU7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKLQotCXBsYW5lID0ga3ph bGxvYyhzaXplb2YoKnBsYW5lKSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFwbGFuZSkKLQkJcmV0dXJu IEVSUl9QVFIoLUVOT01FTSk7Ci0KLQlwbGFuZV9zdGF0ZSA9IGludGVsX2NyZWF0ZV9wbGFuZV9z dGF0ZSgmcGxhbmUtPmJhc2UpOwotCWlmICghcGxhbmVfc3RhdGUpIHsKLQkJa2ZyZWUocGxhbmUp OwotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQl9Ci0KLQlwbGFuZS0+YmFzZS5zdGF0ZSA9 ICZwbGFuZV9zdGF0ZS0+YmFzZTsKLQotCXJldHVybiBwbGFuZTsKLX0KLQotdm9pZCBpbnRlbF9w bGFuZV9mcmVlKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCi17Ci0Jc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9Ci0JCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5i YXNlLnN0YXRlKTsKLQotCWtmcmVlKHBsYW5lX3N0YXRlKTsKLQlrZnJlZShwbGFuZSk7Ci19Ci0K IHN0cnVjdCBpbnRlbF9wbGFuZSAqCiBza2xfdW5pdmVyc2FsX3BsYW5lX2NyZWF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICBlbnVtIHBpcGUgcGlwZSwgZW51bSBw bGFuZV9pZCBwbGFuZV9pZCkKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==