From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 2/2] drm/vmwgfx: Implement the cursor_set2 callback Date: Thu, 26 Nov 2015 10:52:15 -0800 Message-ID: <1448563935-3157-2-git-send-email-thellstrom@vmware.com> References: <1448563935-3157-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [208.91.2.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 86F176E14C for ; Thu, 26 Nov 2015 10:52:57 -0800 (PST) In-Reply-To: <1448563935-3157-1-git-send-email-thellstrom@vmware.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 Cc: airlied@redhat.com, Thomas Hellstrom List-Id: dri-devel@lists.freedesktop.org Rml4ZXMgbmF0aXZlIGRybSBjbGllbnRzIGxpa2UgRmVkb3JhIDIzIFdheWxhbmQgd2hpY2ggbm93 IGFwcGVhcnMgdG8KYmUgYWJsZSB0byB1c2UgY3Vyc29yIGhvdHNwb3RzIHdpdGhvdXQgc3RyYW5n ZSBjdXJzb3Igb2Zmc2V0cy4KQWxzbyBmaXhlcyBhIGNvdXBsZSBvZiBpZ25vcmVkIGVycm9yIHBh dGhzLgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUu Y29tPgpSZXZpZXdlZC1ieTogU2luY2xhaXIgWWVoIDxzeWVoQHZtd2FyZS5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMgIHwgNDMgKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuaCAg fCAgMyArKysKIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2xkdS5jICB8ICAxICsKIGRy aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3Njcm4uYyB8ICAxICsKIGRyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X3N0ZHUuYyB8ICAxICsKIDUgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0 aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Zt d2dmeC92bXdnZnhfa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuYwpp bmRleCA5ZmNkN2Y4Li42MmFhMDk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuYwpA QCAtMTMzLDggKzEzMywxMyBAQCB2b2lkIHZtd19jdXJzb3JfdXBkYXRlX3Bvc2l0aW9uKHN0cnVj dCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdm13X21taW9fd3JpdGUoKytjb3VudCwgZmlmb19t ZW0gKyBTVkdBX0ZJRk9fQ1VSU09SX0NPVU5UKTsKIH0KIAotaW50IHZtd19kdV9jcnRjX2N1cnNv cl9zZXQoc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwK LQkJCSAgIHVpbnQzMl90IGhhbmRsZSwgdWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCkK KworLyoKKyAqIHZtd19kdV9jcnRjX2N1cnNvcl9zZXQyIC0gRHJpdmVyIGN1cnNvcl9zZXQyIGNh bGxiYWNrLgorICovCitpbnQgdm13X2R1X2NydGNfY3Vyc29yX3NldDIoc3RydWN0IGRybV9jcnRj ICpjcnRjLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKKwkJCSAgICB1aW50MzJfdCBoYW5k bGUsIHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQsCisJCQkgICAgaW50MzJfdCBob3Rf eCwgaW50MzJfdCBob3RfeSkKIHsKIAlzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2ID0gdm13 X3ByaXYoY3J0Yy0+ZGV2KTsKIAlzdHJ1Y3Qgdm13X2Rpc3BsYXlfdW5pdCAqZHUgPSB2bXdfY3J0 Y190b19kdShjcnRjKTsKQEAgLTE4NSwzMyArMTkwLDM2IEBAIGludCB2bXdfZHVfY3J0Y19jdXJz b3Jfc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYs CiAJfQogCWlmIChkdS0+Y3Vyc29yX2RtYWJ1ZikKIAkJdm13X2RtYWJ1Zl91bnJlZmVyZW5jZSgm ZHUtPmN1cnNvcl9kbWFidWYpOwotCisKIAkvKiBzZXR1cCBuZXcgaW1hZ2UgKi8KKwlyZXQgPSAw OwogCWlmIChzdXJmYWNlKSB7CiAJCS8qIHZtd191c2VyX3N1cmZhY2VfbG9va3VwIHRha2VzIG9u ZSByZWZlcmVuY2UgKi8KIAkJZHUtPmN1cnNvcl9zdXJmYWNlID0gc3VyZmFjZTsKIAogCQlkdS0+ Y3Vyc29yX3N1cmZhY2UtPnNub29wZXIuY3J0YyA9IGNydGM7CiAJCWR1LT5jdXJzb3JfYWdlID0g ZHUtPmN1cnNvcl9zdXJmYWNlLT5zbm9vcGVyLmFnZTsKLQkJdm13X2N1cnNvcl91cGRhdGVfaW1h Z2UoZGV2X3ByaXYsIHN1cmZhY2UtPnNub29wZXIuaW1hZ2UsCi0JCQkJCTY0LCA2NCwgZHUtPmhv dHNwb3RfeCwgZHUtPmhvdHNwb3RfeSk7CisJCXJldCA9IHZtd19jdXJzb3JfdXBkYXRlX2ltYWdl KGRldl9wcml2LCBzdXJmYWNlLT5zbm9vcGVyLmltYWdlLAorCQkJCQkgICAgICA2NCwgNjQsIGhv dF94LCBob3RfeSk7CiAJfSBlbHNlIGlmIChkbWFidWYpIHsKIAkJLyogdm13X3VzZXJfc3VyZmFj ZV9sb29rdXAgdGFrZXMgb25lIHJlZmVyZW5jZSAqLwogCQlkdS0+Y3Vyc29yX2RtYWJ1ZiA9IGRt YWJ1ZjsKIAogCQlyZXQgPSB2bXdfY3Vyc29yX3VwZGF0ZV9kbWFidWYoZGV2X3ByaXYsIGRtYWJ1 Ziwgd2lkdGgsIGhlaWdodCwKLQkJCQkJICAgICAgIGR1LT5ob3RzcG90X3gsIGR1LT5ob3RzcG90 X3kpOworCQkJCQkgICAgICAgaG90X3gsIGhvdF95KTsKIAl9IGVsc2UgewogCQl2bXdfY3Vyc29y X3VwZGF0ZV9wb3NpdGlvbihkZXZfcHJpdiwgZmFsc2UsIDAsIDApOwotCQlyZXQgPSAwOwogCQln b3RvIG91dDsKIAl9CiAKLQl2bXdfY3Vyc29yX3VwZGF0ZV9wb3NpdGlvbihkZXZfcHJpdiwgdHJ1 ZSwKLQkJCQkgICBkdS0+Y3Vyc29yX3ggKyBkdS0+aG90c3BvdF94LAotCQkJCSAgIGR1LT5jdXJz b3JfeSArIGR1LT5ob3RzcG90X3kpOworCWlmICghcmV0KSB7CisJCXZtd19jdXJzb3JfdXBkYXRl X3Bvc2l0aW9uKGRldl9wcml2LCB0cnVlLAorCQkJCQkgICBkdS0+Y3Vyc29yX3ggKyBob3RfeCwK KwkJCQkJICAgZHUtPmN1cnNvcl95ICsgaG90X3kpOworCQlkdS0+aG90c3BvdF94ID0gaG90X3g7 CisJCWR1LT5ob3RzcG90X3kgPSBob3RfeTsKKwl9CiAKLQlyZXQgPSAwOwogb3V0OgogCWRybV9t b2Rlc2V0X3VubG9ja19hbGwoZGV2X3ByaXYtPmRldik7CiAJZHJtX21vZGVzZXRfbG9ja19jcnRj KGNydGMsIGNydGMtPmN1cnNvcik7CkBAIC0yMTksNiArMjI3LDE5IEBAIG91dDoKIAlyZXR1cm4g cmV0OwogfQogCisvKgorICogdm13X2R1X2NydGNfY3Vyc29yX3NldCAtIERyaXZlciBjdXJzb3Jf c2V0IGNhbGxiYWNrIHVzaW5nCisgKiBkZWZhdWx0IHZhbHVlcyBmb3IgdGhlIGN1cnNvciBob3Rz cG90LgorICovCitpbnQgdm13X2R1X2NydGNfY3Vyc29yX3NldChzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2LAorCQkJICAgdWludDMyX3QgaGFuZGxlLCB1 aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KQoreworCXN0cnVjdCB2bXdfZGlzcGxheV91 bml0ICpkdSA9IHZtd19jcnRjX3RvX2R1KGNydGMpOworCisJcmV0dXJuIHZtd19kdV9jcnRjX2N1 cnNvcl9zZXQyKGNydGMsIGZpbGVfcHJpdiwgaGFuZGxlLCB3aWR0aCwgaGVpZ2h0LAorCQkJCSAg ICAgICBkdS0+aG90c3BvdF94LCBkdS0+aG90c3BvdF95KTsKK30KKwogaW50IHZtd19kdV9jcnRj X2N1cnNvcl9tb3ZlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgaW50IHgsIGludCB5KQogewogCXN0 cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYgPSB2bXdfcHJpdihjcnRjLT5kZXYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmggYi9kcml2ZXJzL2dwdS9k cm0vdm13Z2Z4L3Ztd2dmeF9rbXMuaAppbmRleCA3ODJkZjdjLi40Mzc3MWQzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vdm13Z2Z4L3Ztd2dmeF9rbXMuaApAQCAtMTk1LDYgKzE5NSw5IEBAIHZvaWQgdm13X2R1X2Ny dGNfZ2FtbWFfc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgIHVpbnQzMl90IHN0YXJ0 LCB1aW50MzJfdCBzaXplKTsKIGludCB2bXdfZHVfY3J0Y19jdXJzb3Jfc2V0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0Yywgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCiAJCQkgICB1aW50MzJfdCBo YW5kbGUsIHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpOworaW50IHZtd19kdV9jcnRj X2N1cnNvcl9zZXQyKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IGRybV9maWxlICpmaWxl X3ByaXYsCisJCQkgICAgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCB3aWR0aCwgdWludDMyX3Qg aGVpZ2h0LAorCQkJICAgIGludDMyX3QgaG90X3gsIGludDMyX3QgaG90X3kpOwogaW50IHZtd19k dV9jcnRjX2N1cnNvcl9tb3ZlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgaW50IHgsIGludCB5KTsK IGludCB2bXdfZHVfY29ubmVjdG9yX2RwbXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv ciwgaW50IG1vZGUpOwogdm9pZCB2bXdfZHVfY29ubmVjdG9yX3NhdmUoc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3Rvcik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Zt d2dmeF9sZHUuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2xkdS5jCmluZGV4IGJi NjNlNGQuLjRkNGUzNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X2xkdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2xkdS5jCkBAIC0yOTgs NiArMjk4LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fY3J0Y19mdW5jcyB2bXdfbGVnYWN5X2NydGNf ZnVuY3MgPSB7CiAJLnNhdmUgPSB2bXdfZHVfY3J0Y19zYXZlLAogCS5yZXN0b3JlID0gdm13X2R1 X2NydGNfcmVzdG9yZSwKIAkuY3Vyc29yX3NldCA9IHZtd19kdV9jcnRjX2N1cnNvcl9zZXQsCisJ LmN1cnNvcl9zZXQyID0gdm13X2R1X2NydGNfY3Vyc29yX3NldDIsCiAJLmN1cnNvcl9tb3ZlID0g dm13X2R1X2NydGNfY3Vyc29yX21vdmUsCiAJLmdhbW1hX3NldCA9IHZtd19kdV9jcnRjX2dhbW1h X3NldCwKIAkuZGVzdHJveSA9IHZtd19sZHVfY3J0Y19kZXN0cm95LApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc2Nybi5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dm eC92bXdnZnhfc2Nybi5jCmluZGV4IGI5NmQxYWIuLjkxOTUwZDAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3Njcm4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13 Z2Z4L3Ztd2dmeF9zY3JuLmMKQEAgLTUzNCw2ICs1MzQsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9j cnRjX2Z1bmNzIHZtd19zY3JlZW5fb2JqZWN0X2NydGNfZnVuY3MgPSB7CiAJLnNhdmUgPSB2bXdf ZHVfY3J0Y19zYXZlLAogCS5yZXN0b3JlID0gdm13X2R1X2NydGNfcmVzdG9yZSwKIAkuY3Vyc29y X3NldCA9IHZtd19kdV9jcnRjX2N1cnNvcl9zZXQsCisJLmN1cnNvcl9zZXQyID0gdm13X2R1X2Ny dGNfY3Vyc29yX3NldDIsCiAJLmN1cnNvcl9tb3ZlID0gdm13X2R1X2NydGNfY3Vyc29yX21vdmUs CiAJLmdhbW1hX3NldCA9IHZtd19kdV9jcnRjX2dhbW1hX3NldCwKIAkuZGVzdHJveSA9IHZtd19z b3VfY3J0Y19kZXN0cm95LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn Znhfc3RkdS5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfc3RkdS5jCmluZGV4IGIx ZmMxYzAuLmU0MzhjYjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X3N0ZHUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9zdGR1LmMKQEAgLTEw NDQsNiArMTA0NCw3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2NydGNfZnVuY3Mgdm13X3N0ZHVfY3J0 Y19mdW5jcyA9IHsKIAkuc2F2ZSA9IHZtd19kdV9jcnRjX3NhdmUsCiAJLnJlc3RvcmUgPSB2bXdf ZHVfY3J0Y19yZXN0b3JlLAogCS5jdXJzb3Jfc2V0ID0gdm13X2R1X2NydGNfY3Vyc29yX3NldCwK KwkuY3Vyc29yX3NldDIgPSB2bXdfZHVfY3J0Y19jdXJzb3Jfc2V0MiwKIAkuY3Vyc29yX21vdmUg PSB2bXdfZHVfY3J0Y19jdXJzb3JfbW92ZSwKIAkuZ2FtbWFfc2V0ID0gdm13X2R1X2NydGNfZ2Ft bWFfc2V0LAogCS5kZXN0cm95ID0gdm13X3N0ZHVfY3J0Y19kZXN0cm95LAotLSAKMi40LjMKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==