From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 1/2] drm: Avoid calling the cursor_set2 callback from the drm_mode_cursor ioctl Date: Thu, 26 Nov 2015 10:52:14 -0800 Message-ID: <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-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9F816E12A for ; Thu, 26 Nov 2015 10:52:52 -0800 (PST) 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 SWYgdGhlIGRybV9tb2RlX2N1cnNvcl9pb2N0bCBpcyBjYWxsZWQgYW5kIHRoZSBjdXJzb3Jfc2V0 MiBjYWxsYmFjayBpcwppbXBsZW1lbnRlZCwgdGhlIGN1cnNvciBob3RzcG90IGlzIHNldCB0byAo MCwwKSB3aGljaCBpcyBpbmNvbXBhdGlibGUKd2l0aCB2bXdnZnggd2hlcmUgdGhlIGhvdHNwb3Qg c2hvdWxkIGluc3RlYWQgcmVtYWluIHVuY2hhbmdlZC4KClNvIGlmIHRoZSBkcml2ZXIgaW1wbGVt ZW50cyBib3RoIGN1cnNvcl9zZXQyIGFuZCBjdXJzb3Jfc2V0LCBwcmVmZXIgY2FsbGluZwp0aGUg bGF0dGVyIGZyb20gdGhlIGRybV9tb2RlX2N1cnNvciBpb2N0bC4KClNpZ25lZC1vZmYtYnk6IFRo b21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vZHJtX2NydGMuYyB8IDEwICsrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlv bnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9j cnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwppbmRleCAyNGM1NDM0Li45M2Y4MGE1 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2NydGMuYwpAQCAtMjg3NCw3ICsyODc0LDggQEAgc3RhdGljIGludCBkcm1fbW9k ZV9jdXJzb3JfdW5pdmVyc2FsKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogc3RhdGljIGludCBk cm1fbW9kZV9jdXJzb3JfY29tbW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICBzdHJ1 Y3QgZHJtX21vZGVfY3Vyc29yMiAqcmVxLAotCQkJCSAgc3RydWN0IGRybV9maWxlICpmaWxlX3By aXYpCisJCQkJICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKKwkJCQkgIGJvb2wgZnJvbV8y KQogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlpbnQgcmV0ID0gMDsKQEAgLTI5MDcsNyAr MjkwOCw4IEBAIHN0YXRpYyBpbnQgZHJtX21vZGVfY3Vyc29yX2NvbW1vbihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQkJZ290byBvdXQ7CiAJCX0KIAkJLyogVHVybnMgb2ZmIHRoZSBjdXJzb3Ig aWYgaGFuZGxlIGlzIDAgKi8KLQkJaWYgKGNydGMtPmZ1bmNzLT5jdXJzb3Jfc2V0MikKKwkJaWYg KGNydGMtPmZ1bmNzLT5jdXJzb3Jfc2V0MiAmJgorCQkgICAgKGZyb21fMiB8fCAhY3J0Yy0+ZnVu Y3MtPmN1cnNvcl9zZXQpKQogCQkJcmV0ID0gY3J0Yy0+ZnVuY3MtPmN1cnNvcl9zZXQyKGNydGMs IGZpbGVfcHJpdiwgcmVxLT5oYW5kbGUsCiAJCQkJCQkgICAgICByZXEtPndpZHRoLCByZXEtPmhl aWdodCwgcmVxLT5ob3RfeCwgcmVxLT5ob3RfeSk7CiAJCWVsc2UKQEAgLTI5NTMsNyArMjk1NSw3 IEBAIGludCBkcm1fbW9kZV9jdXJzb3JfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlt ZW1jcHkoJm5ld19yZXEsIHJlcSwgc2l6ZW9mKHN0cnVjdCBkcm1fbW9kZV9jdXJzb3IpKTsKIAlu ZXdfcmVxLmhvdF94ID0gbmV3X3JlcS5ob3RfeSA9IDA7CiAKLQlyZXR1cm4gZHJtX21vZGVfY3Vy c29yX2NvbW1vbihkZXYsICZuZXdfcmVxLCBmaWxlX3ByaXYpOworCXJldHVybiBkcm1fbW9kZV9j dXJzb3JfY29tbW9uKGRldiwgJm5ld19yZXEsIGZpbGVfcHJpdiwgZmFsc2UpOwogfQogCiAvKioK QEAgLTI5NzYsNyArMjk3OCw3IEBAIGludCBkcm1fbW9kZV9jdXJzb3IyX2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiB7CiAJc3RydWN0IGRybV9tb2RlX2N1cnNvcjIgKnJlcSA9IGRhdGE7 CiAKLQlyZXR1cm4gZHJtX21vZGVfY3Vyc29yX2NvbW1vbihkZXYsIHJlcSwgZmlsZV9wcml2KTsK KwlyZXR1cm4gZHJtX21vZGVfY3Vyc29yX2NvbW1vbihkZXYsIHJlcSwgZmlsZV9wcml2LCB0cnVl KTsKIH0KIAogLyoqCi0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK