From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Subject: [PATCH v3 4/7] drm/tinydrm/repaper: Drop using tinydrm_device Date: Mon, 25 Feb 2019 15:42:29 +0100 Message-ID: <20190225144232.20761-5-noralf@tronnes.org> References: <20190225144232.20761-1-noralf@tronnes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190225144232.20761-1-noralf@tronnes.org> 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: david@lechnology.com, daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , sam@ravnborg.org List-Id: dri-devel@lists.freedesktop.org VXNlIGRldm1fZHJtX2Rldl9pbml0KCkgYW5kIGRyb3AgdXNpbmcgdGlueWRybV9kZXZpY2UuCgp2 MjogZGV2bV9kcm1fZGV2X3JlZ2lzdGVyKCkgd2FzIGRyb3BwZWQgc28gYWRkIGEgZHJpdmVyIHJl bGVhc2UgY2FsbGJhY2suCgpTaWduZWQtb2ZmLWJ5OiBOb3JhbGYgVHLDuG5uZXMgPG5vcmFsZkB0 cm9ubmVzLm9yZz4KUmV2aWV3ZWQtYnk6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vdGlueWRybS9yZXBhcGVyLmMgfCA4NCArKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjEgaW5zZXJ0aW9ucygrKSwgMjMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Rpbnlkcm0vcmVwYXBl ci5jIGIvZHJpdmVycy9ncHUvZHJtL3Rpbnlkcm0vcmVwYXBlci5jCmluZGV4IGEzMmRkYTA5NDU4 YS4uYjFhY2Y1YWViZTMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGlueWRybS9yZXBh cGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Rpbnlkcm0vcmVwYXBlci5jCkBAIC0zMCwxMSAr MzAsMTIgQEAKICNpbmNsdWRlIDxkcm0vZHJtX2RhbWFnZV9oZWxwZXIuaD4KICNpbmNsdWRlIDxk cm0vZHJtX2Rydi5oPgogI2luY2x1ZGUgPGRybS9kcm1fZmJfY21hX2hlbHBlci5oPgorI2luY2x1 ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21hX2hlbHBl ci5oPgogI2luY2x1ZGUgPGRybS9kcm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5oPgogI2luY2x1 ZGUgPGRybS9kcm1fcmVjdC5oPgogI2luY2x1ZGUgPGRybS9kcm1fdmJsYW5rLmg+Ci0jaW5jbHVk ZSA8ZHJtL3Rpbnlkcm0vdGlueWRybS5oPgorI2luY2x1ZGUgPGRybS9kcm1fc2ltcGxlX2ttc19o ZWxwZXIuaD4KICNpbmNsdWRlIDxkcm0vdGlueWRybS90aW55ZHJtLWhlbHBlcnMuaD4KIAogI2Rl ZmluZSBSRVBBUEVSX1JJRF9HMl9DT0dfSUQJMHgxMgpAQCAtNjAsNyArNjEsOCBAQCBlbnVtIHJl cGFwZXJfZXBkX2JvcmRlcl9ieXRlIHsKIH07CiAKIHN0cnVjdCByZXBhcGVyX2VwZCB7Ci0Jc3Ry dWN0IHRpbnlkcm1fZGV2aWNlIHRpbnlkcm07CisJc3RydWN0IGRybV9kZXZpY2UgZHJtOworCXN0 cnVjdCBkcm1fc2ltcGxlX2Rpc3BsYXlfcGlwZSBwaXBlOwogCXN0cnVjdCBzcGlfZGV2aWNlICpz cGk7CiAKIAlzdHJ1Y3QgZ3Bpb19kZXNjICpwYW5lbF9vbjsKQEAgLTg5LDEwICs5MSw5IEBAIHN0 cnVjdCByZXBhcGVyX2VwZCB7CiAJYm9vbCBwYXJ0aWFsOwogfTsKIAotc3RhdGljIGlubGluZSBz dHJ1Y3QgcmVwYXBlcl9lcGQgKgotZXBkX2Zyb21fdGlueWRybShzdHJ1Y3QgdGlueWRybV9kZXZp Y2UgKnRkZXYpCitzdGF0aWMgaW5saW5lIHN0cnVjdCByZXBhcGVyX2VwZCAqZHJtX3RvX2VwZChz dHJ1Y3QgZHJtX2RldmljZSAqZHJtKQogewotCXJldHVybiBjb250YWluZXJfb2YodGRldiwgc3Ry dWN0IHJlcGFwZXJfZXBkLCB0aW55ZHJtKTsKKwlyZXR1cm4gY29udGFpbmVyX29mKGRybSwgc3Ry dWN0IHJlcGFwZXJfZXBkLCBkcm0pOwogfQogCiBzdGF0aWMgaW50IHJlcGFwZXJfc3BpX3RyYW5z ZmVyKHN0cnVjdCBzcGlfZGV2aWNlICpzcGksIHU4IGhlYWRlciwKQEAgLTUzMCw4ICs1MzEsNyBA QCBzdGF0aWMgaW50IHJlcGFwZXJfZmJfZGlydHkoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIp CiB7CiAJc3RydWN0IGRybV9nZW1fY21hX29iamVjdCAqY21hX29iaiA9IGRybV9mYl9jbWFfZ2V0 X2dlbV9vYmooZmIsIDApOwogCXN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmltcG9ydF9hdHRh Y2ggPSBjbWFfb2JqLT5iYXNlLmltcG9ydF9hdHRhY2g7Ci0Jc3RydWN0IHRpbnlkcm1fZGV2aWNl ICp0ZGV2ID0gZmItPmRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IHJlcGFwZXJfZXBkICplcGQg PSBlcGRfZnJvbV90aW55ZHJtKHRkZXYpOworCXN0cnVjdCByZXBhcGVyX2VwZCAqZXBkID0gZHJt X3RvX2VwZChmYi0+ZGV2KTsKIAlzdHJ1Y3QgZHJtX3JlY3QgY2xpcDsKIAl1OCAqYnVmID0gTlVM TDsKIAlpbnQgcmV0ID0gMDsKQEAgLTY0Niw4ICs2NDYsNyBAQCBzdGF0aWMgdm9pZCByZXBhcGVy X3BpcGVfZW5hYmxlKHN0cnVjdCBkcm1fc2ltcGxlX2Rpc3BsYXlfcGlwZSAqcGlwZSwKIAkJCQlz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJc3RydWN0IGRybV9wbGFuZV9z dGF0ZSAqcGxhbmVfc3RhdGUpCiB7Ci0Jc3RydWN0IHRpbnlkcm1fZGV2aWNlICp0ZGV2ID0gcGlw ZV90b190aW55ZHJtKHBpcGUpOwotCXN0cnVjdCByZXBhcGVyX2VwZCAqZXBkID0gZXBkX2Zyb21f dGlueWRybSh0ZGV2KTsKKwlzdHJ1Y3QgcmVwYXBlcl9lcGQgKmVwZCA9IGRybV90b19lcGQocGlw ZS0+Y3J0Yy5kZXYpOwogCXN0cnVjdCBzcGlfZGV2aWNlICpzcGkgPSBlcGQtPnNwaTsKIAlzdHJ1 Y3QgZGV2aWNlICpkZXYgPSAmc3BpLT5kZXY7CiAJYm9vbCBkY19vayA9IGZhbHNlOwpAQCAtNzgx LDggKzc4MCw3IEBAIHN0YXRpYyB2b2lkIHJlcGFwZXJfcGlwZV9lbmFibGUoc3RydWN0IGRybV9z aW1wbGVfZGlzcGxheV9waXBlICpwaXBlLAogCiBzdGF0aWMgdm9pZCByZXBhcGVyX3BpcGVfZGlz YWJsZShzdHJ1Y3QgZHJtX3NpbXBsZV9kaXNwbGF5X3BpcGUgKnBpcGUpCiB7Ci0Jc3RydWN0IHRp bnlkcm1fZGV2aWNlICp0ZGV2ID0gcGlwZV90b190aW55ZHJtKHBpcGUpOwotCXN0cnVjdCByZXBh cGVyX2VwZCAqZXBkID0gZXBkX2Zyb21fdGlueWRybSh0ZGV2KTsKKwlzdHJ1Y3QgcmVwYXBlcl9l cGQgKmVwZCA9IGRybV90b19lcGQocGlwZS0+Y3J0Yy5kZXYpOwogCXN0cnVjdCBzcGlfZGV2aWNl ICpzcGkgPSBlcGQtPnNwaTsKIAl1bnNpZ25lZCBpbnQgbGluZTsKIApAQCAtODU2LDYgKzg1NCwy MyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9zaW1wbGVfZGlzcGxheV9waXBlX2Z1bmNzIHJl cGFwZXJfcGlwZV9mdW5jcyA9IHsKIAkucHJlcGFyZV9mYiA9IGRybV9nZW1fZmJfc2ltcGxlX2Rp c3BsYXlfcGlwZV9wcmVwYXJlX2ZiLAogfTsKIAorc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9k ZV9jb25maWdfZnVuY3MgcmVwYXBlcl9tb2RlX2NvbmZpZ19mdW5jcyA9IHsKKwkuZmJfY3JlYXRl ID0gZHJtX2dlbV9mYl9jcmVhdGVfd2l0aF9kaXJ0eSwKKwkuYXRvbWljX2NoZWNrID0gZHJtX2F0 b21pY19oZWxwZXJfY2hlY2ssCisJLmF0b21pY19jb21taXQgPSBkcm1fYXRvbWljX2hlbHBlcl9j b21taXQsCit9OworCitzdGF0aWMgdm9pZCByZXBhcGVyX3JlbGVhc2Uoc3RydWN0IGRybV9kZXZp Y2UgKmRybSkKK3sKKwlzdHJ1Y3QgcmVwYXBlcl9lcGQgKmVwZCA9IGRybV90b19lcGQoZHJtKTsK KworCURSTV9ERUJVR19EUklWRVIoIlxuIik7CisKKwlkcm1fbW9kZV9jb25maWdfY2xlYW51cChk cm0pOworCWRybV9kZXZfZmluaShkcm0pOworCWtmcmVlKGVwZCk7Cit9CisKIHN0YXRpYyBjb25z dCB1aW50MzJfdCByZXBhcGVyX2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX1hSR0I4ODg4LAog fTsKQEAgLTg5NCw2ICs5MDksNyBAQCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgcmVwYXBlcl9k cml2ZXIgPSB7CiAJLmRyaXZlcl9mZWF0dXJlcwk9IERSSVZFUl9HRU0gfCBEUklWRVJfTU9ERVNF VCB8IERSSVZFUl9QUklNRSB8CiAJCQkJICBEUklWRVJfQVRPTUlDLAogCS5mb3BzCQkJPSAmcmVw YXBlcl9mb3BzLAorCS5yZWxlYXNlCQk9IHJlcGFwZXJfcmVsZWFzZSwKIAlEUk1fR0VNX0NNQV9W TUFQX0RSSVZFUl9PUFMsCiAJLm5hbWUJCQk9ICJyZXBhcGVyIiwKIAkuZGVzYwkJCT0gIlBlcnZh c2l2ZSBEaXNwbGF5cyBSZVBhcGVyIGUtaW5rIHBhbmVscyIsCkBAIC05MjYsMTEgKzk0MiwxMSBA QCBzdGF0aWMgaW50IHJlcGFwZXJfcHJvYmUoc3RydWN0IHNwaV9kZXZpY2UgKnNwaSkKIAljb25z dCBzdHJ1Y3Qgc3BpX2RldmljZV9pZCAqc3BpX2lkOwogCWNvbnN0IHN0cnVjdCBvZl9kZXZpY2Vf aWQgKm1hdGNoOwogCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZzcGktPmRldjsKLQlzdHJ1Y3QgdGlu eWRybV9kZXZpY2UgKnRkZXY7CiAJZW51bSByZXBhcGVyX21vZGVsIG1vZGVsOwogCWNvbnN0IGNo YXIgKnRoZXJtYWxfem9uZTsKIAlzdHJ1Y3QgcmVwYXBlcl9lcGQgKmVwZDsKIAlzaXplX3QgbGlu ZV9idWZmZXJfc2l6ZTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtOwogCWludCByZXQ7CiAKIAlt YXRjaCA9IG9mX21hdGNoX2RldmljZShyZXBhcGVyX29mX21hdGNoLCBkZXYpOwpAQCAtOTUwLDEw ICs5NjYsMjEgQEAgc3RhdGljIGludCByZXBhcGVyX3Byb2JlKHN0cnVjdCBzcGlfZGV2aWNlICpz cGkpCiAJCX0KIAl9CiAKLQllcGQgPSBkZXZtX2t6YWxsb2MoZGV2LCBzaXplb2YoKmVwZCksIEdG UF9LRVJORUwpOworCWVwZCA9IGt6YWxsb2Moc2l6ZW9mKCplcGQpLCBHRlBfS0VSTkVMKTsKIAlp ZiAoIWVwZCkKIAkJcmV0dXJuIC1FTk9NRU07CiAKKwlkcm0gPSAmZXBkLT5kcm07CisKKwlyZXQg PSBkZXZtX2RybV9kZXZfaW5pdChkZXYsIGRybSwgJnJlcGFwZXJfZHJpdmVyKTsKKwlpZiAocmV0 KSB7CisJCWtmcmVlKGVwZCk7CisJCXJldHVybiByZXQ7CisJfQorCisJZHJtX21vZGVfY29uZmln X2luaXQoZHJtKTsKKwlkcm0tPm1vZGVfY29uZmlnLmZ1bmNzID0gJnJlcGFwZXJfbW9kZV9jb25m aWdfZnVuY3M7CisKIAllcGQtPnNwaSA9IHNwaTsKIAogCWVwZC0+cGFuZWxfb24gPSBkZXZtX2dw aW9kX2dldChkZXYsICJwYW5lbC1vbiIsIEdQSU9EX09VVF9MT1cpOwpAQCAtMTA2NCwyNiArMTA5 MSwzNiBAQCBzdGF0aWMgaW50IHJlcGFwZXJfcHJvYmUoc3RydWN0IHNwaV9kZXZpY2UgKnNwaSkK IAlpZiAoIWVwZC0+Y3VycmVudF9mcmFtZSkKIAkJcmV0dXJuIC1FTk9NRU07CiAKLQl0ZGV2ID0g JmVwZC0+dGlueWRybTsKLQotCXJldCA9IGRldm1fdGlueWRybV9pbml0KGRldiwgdGRldiwgJnJl cGFwZXJfZHJpdmVyKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JcmV0ID0gdGlueWRy bV9kaXNwbGF5X3BpcGVfaW5pdCh0ZGV2LT5kcm0sICZ0ZGV2LT5waXBlLCAmcmVwYXBlcl9waXBl X2Z1bmNzLAorCXJldCA9IHRpbnlkcm1fZGlzcGxheV9waXBlX2luaXQoZHJtLCAmZXBkLT5waXBl LCAmcmVwYXBlcl9waXBlX2Z1bmNzLAogCQkJCQlEUk1fTU9ERV9DT05ORUNUT1JfVklSVFVBTCwK IAkJCQkJcmVwYXBlcl9mb3JtYXRzLAogCQkJCQlBUlJBWV9TSVpFKHJlcGFwZXJfZm9ybWF0cyks IG1vZGUsIDApOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlkcm1fbW9kZV9jb25maWdf cmVzZXQodGRldi0+ZHJtKTsKKwlkcm1fbW9kZV9jb25maWdfcmVzZXQoZHJtKTsKIAotCXNwaV9z ZXRfZHJ2ZGF0YShzcGksIHRkZXYtPmRybSk7CisJcmV0ID0gZHJtX2Rldl9yZWdpc3Rlcihkcm0s IDApOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlzcGlfc2V0X2RydmRhdGEoc3BpLCBk cm0pOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiU1BJIHNwZWVkOiAldU1IelxuIiwgc3BpLT5tYXhf c3BlZWRfaHogLyAxMDAwMDAwKTsKIAotCXJldHVybiBkZXZtX3Rpbnlkcm1fcmVnaXN0ZXIodGRl dik7CisJZHJtX2ZiZGV2X2dlbmVyaWNfc2V0dXAoZHJtLCAzMik7CisKKwlyZXR1cm4gMDsKK30K Kworc3RhdGljIGludCByZXBhcGVyX3JlbW92ZShzdHJ1Y3Qgc3BpX2RldmljZSAqc3BpKQorewor CXN0cnVjdCBkcm1fZGV2aWNlICpkcm0gPSBzcGlfZ2V0X2RydmRhdGEoc3BpKTsKKworCWRybV9k ZXZfdW5wbHVnKGRybSk7CisJZHJtX2F0b21pY19oZWxwZXJfc2h1dGRvd24oZHJtKTsKKworCXJl dHVybiAwOwogfQogCiBzdGF0aWMgdm9pZCByZXBhcGVyX3NodXRkb3duKHN0cnVjdCBzcGlfZGV2 aWNlICpzcGkpCkBAIC0xMDk5LDYgKzExMzYsNyBAQCBzdGF0aWMgc3RydWN0IHNwaV9kcml2ZXIg cmVwYXBlcl9zcGlfZHJpdmVyID0gewogCX0sCiAJLmlkX3RhYmxlID0gcmVwYXBlcl9pZCwKIAku cHJvYmUgPSByZXBhcGVyX3Byb2JlLAorCS5yZW1vdmUgPSByZXBhcGVyX3JlbW92ZSwKIAkuc2h1 dGRvd24gPSByZXBhcGVyX3NodXRkb3duLAogfTsKIG1vZHVsZV9zcGlfZHJpdmVyKHJlcGFwZXJf c3BpX2RyaXZlcik7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeA==