From: Eric Anholt Subject: [PATCH 04/10] drm/vc4: Add a proper short-circut path for legacy cursor updates. Date: Thu, 4 Feb 2016 12:26:34 -0800 Message-ID: <1454617600-12099-5-git-send-email-eric@anholt.net> References: <1454617600-12099-1-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1454617600-12099-1-git-send-email-eric@anholt.net> 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: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org UHJldmlvdXNseSwgb24gZXZlcnkgbW9kZXNldCB3ZSB3b3VsZCBhbGxvY2F0ZSBuZXcgZGlzcGxh eSBsaXN0Cm1lbW9yeSwgcmVjb21wdXRlIGNoYW5nZWQgcGxhbmVzLCB3cml0ZSBhbGwgb2YgdGhl bSB0byB0aGUgbmV3IG1lbW9yeSwKYW5kIHBvaW50ZWQgc2Nhbm91dCBhdCB0aGUgbmV3IGxpc3Qg KHdoaWNoIHdpbGwgbGF0Y2ggYXBwcm94aW1hdGVseSBhdAp0aGUgbmV4dCBsaW5lIG9mIHNjYW5v dXQpLiAgV2UgbGV0CmRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX3ZibGFua3MoKSBkZWNpZGUg d2hldGhlciB3ZSBuZWVkZWQgdG8gd2FpdApmb3IgYSB2YmxhbmsgYWZ0ZXIgYSBtb2Rlc2V0IGJl Zm9yZSBjbGVhbmluZyB1cCB0aGUgb2xkIHN0YXRlIGFuZApsZXR0aW5nIHRoZSBuZXh0IG1vZGVz ZXQgcHJvY2VlZCwgYW5kIG9uIGxlZ2FjeSBjdXJzb3IgdXBkYXRlcyB3ZQp3b3VsZG4ndCB3YWl0 LiAgSWYgeW91IG1vdmVkIHRoZSBjdXJzb3IgZmFzdCBlbm91Z2gsIHdlIGNvdWxkCnBvdGVudGlh bGx5IHdyYXAgYXJvdW5kIHRoZSBkaXNwbGF5IGxpc3QgbWVtb3J5IGFyZWEgYW5kIG92ZXJ3cml0 ZSB0aGUKZXhpc3RpbmcgZGlzcGxheSBsaXN0IHdoaWxlIGl0IHdhcyBzdGlsbCBiZWluZyBzY2Fu bmVkIG91dCwgcmVzdWx0aW5nCmluIHRoZSBIVlMgc2Nhbm5pbmcgb3V0IGdhcmJhZ2Ugb3IganVz dCBoYWx0aW5nLgoKSW5zdGVhZCBvZiBtYWtpbmcgY3Vyc29yIHVwZGF0ZXMgd2FpdCBmb3Igc2Nh bm91dCB0byBtb3ZlIHRvIHRoZSBuZXcKZGlzcGxheSBsaXN0IGFyZWEgKHdoaWNoIGludHJvZHVj ZXMgc2lnbmlmaWNhbnQgY3Vyc29yIGxhZyBpbiBYKSwgd2UKanVzdCByZXdyaXRlIG91ciBjdXJy ZW50IGRpc3BsYXkgbGlzdC4KClNpZ25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9s dC5uZXQ+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfa21zLmMgICB8ICA5ICsrKysKIGRy aXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMgfCA5MyArKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5NSBpbnNlcnRpb25zKCspLCA3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2ttcy5j IGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfa21zLmMKaW5kZXggZjk1ZjJkZi4uNDcxOGFlNSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfa21zLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3ZjNC92YzRfa21zLmMKQEAgLTQ5LDYgKzQ5LDE1IEBAIHZjNF9hdG9taWNfY29tcGxl dGVfY29tbWl0KHN0cnVjdCB2YzRfY29tbWl0ICpjKQogCiAJZHJtX2F0b21pY19oZWxwZXJfY29t bWl0X21vZGVzZXRfZW5hYmxlcyhkZXYsIHN0YXRlKTsKIAorCS8qIE1ha2Ugc3VyZSB0aGF0IGRy bV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX3ZibGFua3MoKQorCSAqIGFjdHVhbGx5IHdhaXRzIGZv ciB2YmxhbmsuICBJZiB3ZSdyZSBkb2luZyBhIGZ1bGwgYXRvbWljCisJICogbW9kZXNldCAoYXMg b3Bwb3NlZCB0byBhIHZjNF91cGRhdGVfcGxhbmUoKSBzaG9ydCBjaXJjdWl0KSwKKwkgKiB0aGVu IHdlIG5lZWQgdG8gd2FpdCBmb3Igc2Nhbm91dCB0byBiZSBkb25lIHdpdGggb3VyCisJICogZGlz cGxheSBsaXN0cyBiZWZvcmUgd2UgZnJlZSBpdCBhbmQgcG90ZW50aWFsbHkgcmVhbGxvY2F0ZQor CSAqIGFuZCBvdmVyd3JpdGUgdGhlIGRsaXN0IG1lbW9yeSB3aXRoIGEgbmV3IG1vZGVzZXQuCisJ ICovCisJc3RhdGUtPmxlZ2FjeV9jdXJzb3JfdXBkYXRlID0gZmFsc2U7CisKIAlkcm1fYXRvbWlj X2hlbHBlcl93YWl0X2Zvcl92YmxhbmtzKGRldiwgc3RhdGUpOwogCiAJZHJtX2F0b21pY19oZWxw ZXJfY2xlYW51cF9wbGFuZXMoZGV2LCBzdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vdmM0L3ZjNF9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYwppbmRl eCA1NTRlZDU0Li45ZWYzNTY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9w bGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMKQEAgLTMzLDggKzMz LDEyIEBAIHN0cnVjdCB2YzRfcGxhbmVfc3RhdGUgewogCXUzMiBkbGlzdF9zaXplOyAvKiBOdW1i ZXIgb2YgZHdvcmRzIGFsbG9jYXRlZCBmb3IgdGhlIGRpc3BsYXkgbGlzdCAqLwogCXUzMiBkbGlz dF9jb3VudDsgLyogTnVtYmVyIG9mIHVzZWQgZHdvcmRzIGluIHRoZSBkaXNwbGF5IGxpc3QuICov CiAKLQkvKiBPZmZzZXQgaW4gdGhlIGRsaXN0IHRvIHBvaW50ZXIgd29yZCAwLiAqLwotCXUzMiBw dzBfb2Zmc2V0OworCS8qIE9mZnNldCBpbiB0aGUgZGxpc3QgdG8gdmFyaW91cyB3b3JkcywgZm9y IHBhZ2VmbGlwIG9yCisJICogY3Vyc29yIHVwZGF0ZXMuCisJICovCisJdTMyIHBvczBfb2Zmc2V0 OworCXUzMiBwb3MyX29mZnNldDsKKwl1MzIgcHRyMF9vZmZzZXQ7CiAKIAkvKiBPZmZzZXQgd2hl cmUgdGhlIHBsYW5lJ3MgZGxpc3Qgd2FzIGxhc3Qgc3RvcmVkIGluIHRoZQogCSAqIGhhcmR3YXJl IGF0IHZjNF9jcnRjX2F0b21pY19mbHVzaCgpIHRpbWUuCkBAIC0yMjMsNiArMjI3LDcgQEAgc3Rh dGljIGludCB2YzRfcGxhbmVfbW9kZV9zZXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQlT Q0FMRVJfQ1RMMF9VTklUWSk7CiAKIAkvKiBQb3NpdGlvbiBXb3JkIDA6IEltYWdlIFBvc2l0aW9u cyBhbmQgQWxwaGEgVmFsdWUgKi8KKwl2YzRfc3RhdGUtPnBvczBfb2Zmc2V0ID0gdmM0X3N0YXRl LT5kbGlzdF9jb3VudDsKIAl2YzRfZGxpc3Rfd3JpdGUodmM0X3N0YXRlLAogCQkJVkM0X1NFVF9G SUVMRCgweGZmLCBTQ0FMRVJfUE9TMF9GSVhFRF9BTFBIQSkgfAogCQkJVkM0X1NFVF9GSUVMRCh2 YzRfc3RhdGUtPmNydGNfeCwgU0NBTEVSX1BPUzBfU1RBUlRfWCkgfApAQCAtMjMzLDYgKzIzOCw3 IEBAIHN0YXRpYyBpbnQgdmM0X3BsYW5lX21vZGVfc2V0KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCSAqLwogCiAJLyogUG9zaXRpb24gV29yZCAyOiBTb3VyY2UgSW1hZ2UgU2l6ZSwgQWxwaGEg TW9kZSAqLworCXZjNF9zdGF0ZS0+cG9zMl9vZmZzZXQgPSB2YzRfc3RhdGUtPmRsaXN0X2NvdW50 OwogCXZjNF9kbGlzdF93cml0ZSh2YzRfc3RhdGUsCiAJCQlWQzRfU0VUX0ZJRUxEKGZvcm1hdC0+ aGFzX2FscGhhID8KIAkJCQkgICAgICBTQ0FMRVJfUE9TMl9BTFBIQV9NT0RFX1BJUEVMSU5FIDoK QEAgLTI0NCw5ICsyNTAsOCBAQCBzdGF0aWMgaW50IHZjNF9wbGFuZV9tb2RlX3NldChzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAkvKiBQb3NpdGlvbiBXb3JkIDM6IENvbnRleHQuICBXcml0dGVu IGJ5IHRoZSBIVlMuICovCiAJdmM0X2RsaXN0X3dyaXRlKHZjNF9zdGF0ZSwgMHhjMGMwYzBjMCk7 CiAKLQl2YzRfc3RhdGUtPnB3MF9vZmZzZXQgPSB2YzRfc3RhdGUtPmRsaXN0X2NvdW50OwotCiAJ LyogUG9pbnRlciBXb3JkIDA6IFJHQiAvIFkgUG9pbnRlciAqLworCXZjNF9zdGF0ZS0+cHRyMF9v ZmZzZXQgPSB2YzRfc3RhdGUtPmRsaXN0X2NvdW50OwogCXZjNF9kbGlzdF93cml0ZSh2YzRfc3Rh dGUsIGJvLT5wYWRkciArIHZjNF9zdGF0ZS0+b2Zmc2V0KTsKIAogCS8qIFBvaW50ZXIgQ29udGV4 dCBXb3JkIDA6IFdyaXR0ZW4gYnkgdGhlIEhWUyAqLwpAQCAtMzMyLDEzICszMzcsMTMgQEAgdm9p ZCB2YzRfcGxhbmVfYXN5bmNfc2V0X2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYikKIAkgKiBzY2Fub3V0IHdpbGwgc3RhcnQgZnJvbSB0aGlzIGFk ZHJlc3MgYXMgc29vbiBhcyB0aGUgRklGTwogCSAqIG5lZWRzIHRvIHJlZmlsbCB3aXRoIHBpeGVs cy4KIAkgKi8KLQl3cml0ZWwoYWRkciwgJnZjNF9zdGF0ZS0+aHdfZGxpc3RbdmM0X3N0YXRlLT5w dzBfb2Zmc2V0XSk7CisJd3JpdGVsKGFkZHIsICZ2YzRfc3RhdGUtPmh3X2RsaXN0W3ZjNF9zdGF0 ZS0+cHRyMF9vZmZzZXRdKTsKIAogCS8qIEFsc28gdXBkYXRlIHRoZSBDUFUtc2lkZSBkbGlzdCBj b3B5LCBzbyB0aGF0IGFueSBsYXRlcgogCSAqIGF0b21pYyB1cGRhdGVzIHRoYXQgZG9uJ3QgZG8g YSBuZXcgbW9kZXNldCBvbiBvdXIgcGxhbmUKIAkgKiBhbHNvIHVzZSBvdXIgdXBkYXRlZCBhZGRy ZXNzLgogCSAqLwotCXZjNF9zdGF0ZS0+ZGxpc3RbdmM0X3N0YXRlLT5wdzBfb2Zmc2V0XSA9IGFk ZHI7CisJdmM0X3N0YXRlLT5kbGlzdFt2YzRfc3RhdGUtPnB0cjBfb2Zmc2V0XSA9IGFkZHI7CiB9 CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyB2YzRfcGxhbmVf aGVscGVyX2Z1bmNzID0gewpAQCAtMzU0LDggKzM1OSw4MiBAQCBzdGF0aWMgdm9pZCB2YzRfcGxh bmVfZGVzdHJveShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlkcm1fcGxhbmVfY2xlYW51cChw bGFuZSk7CiB9CiAKKy8qIEltcGxlbWVudHMgaW1tZWRpYXRlIChub24tdmJsYW5rLXN5bmNlZCkg dXBkYXRlcyBvZiB0aGUgY3Vyc29yCisgKiBwb3NpdGlvbiwgb3IgZmFsbHMgYmFjayB0byB0aGUg YXRvbWljIGhlbHBlciBvdGhlcndpc2UuCisgKi8KK3N0YXRpYyBpbnQKK3ZjNF91cGRhdGVfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCSBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJ CSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJIGludCBjcnRjX3gsIGludCBjcnRjX3ks CisJCSB1bnNpZ25lZCBpbnQgY3J0Y193LCB1bnNpZ25lZCBpbnQgY3J0Y19oLAorCQkgdWludDMy X3Qgc3JjX3gsIHVpbnQzMl90IHNyY195LAorCQkgdWludDMyX3Qgc3JjX3csIHVpbnQzMl90IHNy Y19oKQoreworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCXN0cnVjdCB2 YzRfcGxhbmVfc3RhdGUgKnZjNF9zdGF0ZTsKKworCWlmIChwbGFuZSAhPSBjcnRjLT5jdXJzb3Ip CisJCWdvdG8gb3V0OworCisJcGxhbmVfc3RhdGUgPSBwbGFuZS0+c3RhdGU7CisJdmM0X3N0YXRl ID0gdG9fdmM0X3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKKworCWlmICghcGxhbmVfc3RhdGUp CisJCWdvdG8gb3V0OworCisJLyogSWYgd2UncmUgY2hhbmdpbmcgdGhlIGN1cnNvciBjb250ZW50 cywgZG8gdGhhdCBpbiB0aGUKKwkgKiBub3JtYWwgdmJsYW5rLXN5bmNlZCBhdG9taWMgcGF0aC4K KwkgKi8KKwlpZiAoZmIgIT0gcGxhbmVfc3RhdGUtPmZiKQorCQlnb3RvIG91dDsKKworCS8qIE5v IGNvbmZpZ3VyaW5nIG5ldyBzY2FsaW5nIGluIHRoZSBmYXN0IHBhdGguICovCisJaWYgKGNydGNf dyAhPSBwbGFuZV9zdGF0ZS0+Y3J0Y193IHx8CisJICAgIGNydGNfaCAhPSBwbGFuZV9zdGF0ZS0+ Y3J0Y19oIHx8CisJICAgIHNyY193ICE9IHBsYW5lX3N0YXRlLT5zcmNfdyB8fAorCSAgICBzcmNf aCAhPSBwbGFuZV9zdGF0ZS0+c3JjX2gpIHsKKwkJZ290byBvdXQ7CisJfQorCisJLyogU2V0IHRo ZSBjdXJzb3IncyBwb3NpdGlvbiBvbiB0aGUgc2NyZWVuLiAgVGhpcyBpcyB0aGUKKwkgKiBleHBl Y3RlZCBjaGFuZ2UgZnJvbSB0aGUgZHJtX21vZGVfY3Vyc29yX3VuaXZlcnNhbCgpCisJICogaGVs cGVyLgorCSAqLworCXBsYW5lX3N0YXRlLT5jcnRjX3ggPSBjcnRjX3g7CisJcGxhbmVfc3RhdGUt PmNydGNfeSA9IGNydGNfeTsKKworCS8qIEFsbG93IGNoYW5naW5nIHRoZSBzdGFydCBwb3NpdGlv biB3aXRoaW4gdGhlIGN1cnNvciBCTywgaWYKKwkgKiB0aGF0IG1hdHRlcnMuCisJICovCisJcGxh bmVfc3RhdGUtPnNyY194ID0gc3JjX3g7CisJcGxhbmVfc3RhdGUtPnNyY195ID0gc3JjX3k7CisK KwkvKiBVcGRhdGUgdGhlIGRpc3BsYXkgbGlzdCBiYXNlZCBvbiB0aGUgbmV3IGNydGNfeC95LiAq LworCXZjNF9wbGFuZV9hdG9taWNfY2hlY2socGxhbmUsIHBsYW5lX3N0YXRlKTsKKwkvKiBXZSBj YW4ndCBqdXN0IGNhbGwgdmM0X3BsYW5lX3dyaXRlX2RsaXN0KCkgYmVjYXVzZSB0aGF0CisJICog d291bGQgc21hc2ggdGhlIGNvbnRleHQgZGF0YSB0aGF0IHRoZSBIVlMgaXMgY3VycmVudGx5CisJ ICogdXNpbmcuCisJICovCisJd3JpdGVsKHZjNF9zdGF0ZS0+ZGxpc3RbdmM0X3N0YXRlLT5wb3Mw X29mZnNldF0sCisJICAgICAgICZ2YzRfc3RhdGUtPmh3X2RsaXN0W3ZjNF9zdGF0ZS0+cG9zMF9v ZmZzZXRdKTsKKwl3cml0ZWwodmM0X3N0YXRlLT5kbGlzdFt2YzRfc3RhdGUtPnBvczJfb2Zmc2V0 XSwKKwkgICAgICAgJnZjNF9zdGF0ZS0+aHdfZGxpc3RbdmM0X3N0YXRlLT5wb3MyX29mZnNldF0p OworCXdyaXRlbCh2YzRfc3RhdGUtPmRsaXN0W3ZjNF9zdGF0ZS0+cHRyMF9vZmZzZXRdLAorCSAg ICAgICAmdmM0X3N0YXRlLT5od19kbGlzdFt2YzRfc3RhdGUtPnB0cjBfb2Zmc2V0XSk7CisKKwly ZXR1cm4gMDsKKworb3V0OgorCXJldHVybiBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUo cGxhbmUsIGNydGMsIGZiLAorCQkJCQkgICAgICBjcnRjX3gsIGNydGNfeSwKKwkJCQkJICAgICAg Y3J0Y193LCBjcnRjX2gsCisJCQkJCSAgICAgIHNyY194LCBzcmNfeSwKKwkJCQkJICAgICAgc3Jj X3csIHNyY19oKTsKK30KKwogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgdmM0 X3BsYW5lX2Z1bmNzID0gewotCS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRh dGVfcGxhbmUsCisJLnVwZGF0ZV9wbGFuZSA9IHZjNF91cGRhdGVfcGxhbmUsCiAJLmRpc2FibGVf cGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lLAogCS5kZXN0cm95ID0gdmM0 X3BsYW5lX2Rlc3Ryb3ksCiAJLnNldF9wcm9wZXJ0eSA9IE5VTEwsCi0tIAoyLjcuMAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK