From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stone Subject: [PATCH 05/24] drm/rockchip: rockchip_drm_fb -> drm_framebuffer Date: Fri, 30 Mar 2018 15:11:19 +0100 Message-ID: <20180330141138.28987-5-daniels@collabora.com> References: <20180330141138.28987-1-daniels@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id A31066E8BF for ; Fri, 30 Mar 2018 14:11:43 +0000 (UTC) In-Reply-To: <20180330141138.28987-1-daniels@collabora.com> 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 List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgcm9ja2NoaXBfZHJtX2ZiIGlzIGp1c3QgYSB3cmFwcGVyIGFyb3VuZCBkcm1fZnJh bWVidWZmZXIsIHdlCmNhbiByZW1vdmUgaXQuCgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgU3RvbmUg PGRhbmllbHNAY29sbGFib3JhLmNvbT4KQ2M6IFNhbmR5IEh1YW5nIDxoamNAcm9jay1jaGlwcy5j b20+CkNjOiBIZWlrbyBTdMO8Ym5lciA8aGVpa29Ac250ZWNoLmRlPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuYyAgfCA1NCArKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9mYi5oICB8 ICAzIC0tCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jIHwgIDQg Ky0tCiAzIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuYyBi L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuYwppbmRleCBkNzA4M2Mw N2MyOTQuLmE0ZDBhMDBhYmNkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV9mYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hp cF9kcm1fZmIuYwpAQCAtMjUsMjEgKzI1LDYgQEAKICNpbmNsdWRlICJyb2NrY2hpcF9kcm1fZ2Vt LmgiCiAjaW5jbHVkZSAicm9ja2NoaXBfZHJtX3Bzci5oIgogCi0jZGVmaW5lIHRvX3JvY2tjaGlw X2ZiKHgpIGNvbnRhaW5lcl9vZih4LCBzdHJ1Y3Qgcm9ja2NoaXBfZHJtX2ZiLCBmYikKLQotc3Ry dWN0IHJvY2tjaGlwX2RybV9mYiB7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciBmYjsKLX07Ci0K LXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqcm9ja2NoaXBfZmJfZ2V0X2dlbV9vYmooc3RydWN0IGRy bV9mcmFtZWJ1ZmZlciAqZmIsCi0JCQkJCSAgICAgICB1bnNpZ25lZCBpbnQgcGxhbmUpCi17Ci0J aWYgKHBsYW5lID49IFJPQ0tDSElQX01BWF9GQl9CVUZGRVIpCi0JCXJldHVybiBOVUxMOwotCi0J cmV0dXJuIGZiLT5vYmpbcGxhbmVdOwotfQotCiBzdGF0aWMgaW50IHJvY2tjaGlwX2RybV9mYl9k aXJ0eShzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJCQkgc3RydWN0IGRybV9maWxlICpm aWxlLAogCQkJCSB1bnNpZ25lZCBpbnQgZmxhZ3MsIHVuc2lnbmVkIGludCBjb2xvciwKQEAgLTU2 LDQxICs0MSw0MCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlcl9mdW5jcyBy b2NrY2hpcF9kcm1fZmJfZnVuY3MgPSB7CiAJLmRpcnR5CSAgICAgICA9IHJvY2tjaGlwX2RybV9m Yl9kaXJ0eSwKIH07CiAKLXN0YXRpYyBzdHJ1Y3Qgcm9ja2NoaXBfZHJtX2ZiICoKK3N0YXRpYyBz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICoKIHJvY2tjaGlwX2ZiX2FsbG9jKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCwKIAkJICBz dHJ1Y3QgZHJtX2dlbV9vYmplY3QgKipvYmosIHVuc2lnbmVkIGludCBudW1fcGxhbmVzKQogewot CXN0cnVjdCByb2NrY2hpcF9kcm1fZmIgKnJvY2tjaGlwX2ZiOworCXN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiOwogCWludCByZXQ7CiAJaW50IGk7CiAKLQlyb2NrY2hpcF9mYiA9IGt6YWxsb2Mo c2l6ZW9mKCpyb2NrY2hpcF9mYiksIEdGUF9LRVJORUwpOwotCWlmICghcm9ja2NoaXBfZmIpCisJ ZmIgPSBremFsbG9jKHNpemVvZigqZmIpLCBHRlBfS0VSTkVMKTsKKwlpZiAoIWZiKQogCQlyZXR1 cm4gRVJSX1BUUigtRU5PTUVNKTsKIAotCWRybV9oZWxwZXJfbW9kZV9maWxsX2ZiX3N0cnVjdChk ZXYsICZyb2NrY2hpcF9mYi0+ZmIsIG1vZGVfY21kKTsKKwlkcm1faGVscGVyX21vZGVfZmlsbF9m Yl9zdHJ1Y3QoZGV2LCBmYiwgbW9kZV9jbWQpOwogCiAJZm9yIChpID0gMDsgaSA8IG51bV9wbGFu ZXM7IGkrKykKLQkJcm9ja2NoaXBfZmItPmZiLm9ialtpXSA9IG9ialtpXTsKKwkJZmItPm9ialtp XSA9IG9ialtpXTsKIAotCXJldCA9IGRybV9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgJnJvY2tjaGlw X2ZiLT5mYiwKLQkJCQkgICAmcm9ja2NoaXBfZHJtX2ZiX2Z1bmNzKTsKKwlyZXQgPSBkcm1fZnJh bWVidWZmZXJfaW5pdChkZXYsIGZiLCAmcm9ja2NoaXBfZHJtX2ZiX2Z1bmNzKTsKIAlpZiAocmV0 KSB7CiAJCURSTV9ERVZfRVJST1IoZGV2LT5kZXYsCiAJCQkgICAgICAiRmFpbGVkIHRvIGluaXRp YWxpemUgZnJhbWVidWZmZXI6ICVkXG4iLAogCQkJICAgICAgcmV0KTsKLQkJa2ZyZWUocm9ja2No aXBfZmIpOworCQlrZnJlZShmYik7CiAJCXJldHVybiBFUlJfUFRSKHJldCk7CiAJfQogCi0JcmV0 dXJuIHJvY2tjaGlwX2ZiOworCXJldHVybiBmYjsKIH0KIAogc3RhdGljIHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKgogcm9ja2NoaXBfdXNlcl9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCiAJCQljb25zdCBzdHJ1Y3QgZHJtX21vZGVf ZmJfY21kMiAqbW9kZV9jbWQpCiB7Ci0Jc3RydWN0IHJvY2tjaGlwX2RybV9mYiAqcm9ja2NoaXBf ZmI7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpvYmpzW1JPQ0tDSElQX01BWF9GQl9CVUZGRVJdOwogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqOwogCXVuc2lnbmVkIGludCBoc3ViOwpAQCAtMTI5LDEzICsxMTMsMTMgQEAgcm9ja2NoaXBf dXNlcl9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpm aWxlX3ByaXYsCiAJCW9ianNbaV0gPSBvYmo7CiAJfQogCi0Jcm9ja2NoaXBfZmIgPSByb2NrY2hp cF9mYl9hbGxvYyhkZXYsIG1vZGVfY21kLCBvYmpzLCBpKTsKLQlpZiAoSVNfRVJSKHJvY2tjaGlw X2ZiKSkgewotCQlyZXQgPSBQVFJfRVJSKHJvY2tjaGlwX2ZiKTsKKwlmYiA9IHJvY2tjaGlwX2Zi X2FsbG9jKGRldiwgbW9kZV9jbWQsIG9ianMsIGkpOworCWlmIChJU19FUlIoZmIpKSB7CisJCXJl dCA9IFBUUl9FUlIoZmIpOwogCQlnb3RvIGVycl9nZW1fb2JqZWN0X3VucmVmZXJlbmNlOwogCX0K IAotCXJldHVybiAmcm9ja2NoaXBfZmItPmZiOworCXJldHVybiBmYjsKIAogZXJyX2dlbV9vYmpl Y3RfdW5yZWZlcmVuY2U6CiAJZm9yIChpLS07IGkgPj0gMDsgaS0tKQpAQCAtMTU5LDEzICsxNDMs MTMgQEAgcm9ja2NoaXBfZHJtX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJCSAgICAgIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCwKIAkJ CSAgICAgIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewotCXN0cnVjdCByb2NrY2hpcF9k cm1fZmIgKnJvY2tjaGlwX2ZiOworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwogCi0Jcm9j a2NoaXBfZmIgPSByb2NrY2hpcF9mYl9hbGxvYyhkZXYsIG1vZGVfY21kLCAmb2JqLCAxKTsKLQlp ZiAoSVNfRVJSKHJvY2tjaGlwX2ZiKSkKLQkJcmV0dXJuIEVSUl9DQVNUKHJvY2tjaGlwX2ZiKTsK KwlmYiA9IHJvY2tjaGlwX2ZiX2FsbG9jKGRldiwgbW9kZV9jbWQsICZvYmosIDEpOworCWlmIChJ U19FUlIoZmIpKQorCQlyZXR1cm4gRVJSX0NBU1QoZmIpOwogCi0JcmV0dXJuICZyb2NrY2hpcF9m Yi0+ZmI7CisJcmV0dXJuIGZiOwogfQogCiB2b2lkIHJvY2tjaGlwX2RybV9tb2RlX2NvbmZpZ19p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmggYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9j a2NoaXBfZHJtX2ZiLmgKaW5kZXggMmZlNDdmMWVlOThmLi5mMTI2NWNiMWFlZTggMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmgKQEAgLTIyLDcgKzIyLDQgQEAg cm9ja2NoaXBfZHJtX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHZv aWQgcm9ja2NoaXBfZHJtX2ZyYW1lYnVmZmVyX2Zpbmkoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIpOwogCiB2b2lkIHJvY2tjaGlwX2RybV9tb2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwotCi1zdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnJvY2tjaGlwX2ZiX2dldF9nZW1f b2JqKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAotCQkJCQkgICAgICAgdW5zaWduZWQgaW50 IHBsYW5lKTsKICNlbmRpZiAvKiBfUk9DS0NISVBfRFJNX0ZCX0ggKi8KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMgYi9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCmluZGV4IDUzZDRhZmUxNTI3OC4uNDNkMTkx ZDQyMDg3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJt X3ZvcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMK QEAgLTcyNCw3ICs3MjQsNyBAQCBzdGF0aWMgdm9pZCB2b3BfcGxhbmVfYXRvbWljX3VwZGF0ZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJcmV0dXJuOwogCX0KIAotCW9iaiA9IHJvY2tjaGlw X2ZiX2dldF9nZW1fb2JqKGZiLCAwKTsKKwlvYmogPSBmYi0+b2JqWzBdOwogCXJrX29iaiA9IHRv X3JvY2tjaGlwX29iaihvYmopOwogCiAJYWN0dWFsX3cgPSBkcm1fcmVjdF93aWR0aChzcmMpID4+ IDE2OwpAQCAtNzU0LDcgKzc1NCw3IEBAIHN0YXRpYyB2b2lkIHZvcF9wbGFuZV9hdG9taWNfdXBk YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlpbnQgdnN1YiA9IGRybV9mb3JtYXRfdmVy dF9jaHJvbWFfc3Vic2FtcGxpbmcoZmItPmZvcm1hdC0+Zm9ybWF0KTsKIAkJaW50IGJwcCA9IGZi LT5mb3JtYXQtPmNwcFsxXTsKIAotCQl1dl9vYmogPSByb2NrY2hpcF9mYl9nZXRfZ2VtX29iaihm YiwgMSk7CisJCXV2X29iaiA9IGZiLT5vYmpbMV07CiAJCXJrX3V2X29iaiA9IHRvX3JvY2tjaGlw X29iaih1dl9vYmopOwogCiAJCW9mZnNldCA9IChzcmMtPngxID4+IDE2KSAqIGJwcCAvIGhzdWI7 Ci0tIAoyLjE2LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo=