From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v2 1/6] drm/virtio: move virtio_gpu_object_{attach, detach} calls. Date: Wed, 30 Jan 2019 10:43:33 +0100 Message-ID: <20190130094338.14203-2-kraxel@redhat.com> References: <20190130094338.14203-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2E296EAE0 for ; Wed, 30 Jan 2019 09:43:43 +0000 (UTC) In-Reply-To: <20190130094338.14203-1-kraxel@redhat.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: David Airlie , open list , Gerd Hoffmann , "open list:VIRTIO GPU DRIVER" List-Id: dri-devel@lists.freedesktop.org RHJvcCB0aGUgZHVtbXkgdHRtIGJhY2tlbmQgaW1wbGVtZW50YXRpb24sIGFkZCBhIHJlYWwgb25l IGZvcgpUVE1fUExfRkxBR19UVCBvYmplY3RzLiAgVGhlIGJpbi91bmJpbmQgY2FsbGJhY2tzIHdp bGwgY2FsbAp2aXJ0aW9fZ3B1X29iamVjdF97YXR0YWNoLGRldGFjaH0sIHRvIHVwZGF0ZSB0aGUg b2JqZWN0IHN0YXRlCm9uIHRoZSBob3N0IHNpZGUsIGluc3RlYWQgb2YgaW52b2tpbmcgdGhvc2Ug Y2FsbHMgZnJvbSB0aGUKbW92ZV9ub3RpZnkoKSBjYWxsYmFjay4KCldpdGggdGhhdCBpbiBwbGFj ZSB0aGUgbW92ZSBhbmQgbW92ZV9ub3RpZnkgY2FsbGJhY2tzIGFyZSBub3QKbmVlZGVkIGFueSBt b3JlLCBzbyBkcm9wIHRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxA cmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRncHVfdHRtLmMgfCA5 MiArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy NCBpbnNlcnRpb25zKCspLCA2OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vdmlydGlvL3ZpcnRncHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlydGlvL3ZpcnRn cHVfdHRtLmMKaW5kZXggNGJmYmYyNWZhYi4uNzc0MDc5NzZjNyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3ZpcnRpby92aXJ0Z3B1X3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aXJ0 aW8vdmlydGdwdV90dG0uYwpAQCAtMTk0LDQyICsxOTQsNDUgQEAgc3RhdGljIHZvaWQgdmlydGlv X2dwdV90dG1faW9fbWVtX2ZyZWUoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsCiAgKi8KIHN0 cnVjdCB2aXJ0aW9fZ3B1X3R0bV90dCB7CiAJc3RydWN0IHR0bV9kbWFfdHQJCXR0bTsKLQlzdHJ1 Y3QgdmlydGlvX2dwdV9kZXZpY2UJKnZnZGV2OwotCXU2NAkJCQlvZmZzZXQ7CisJc3RydWN0IHZp cnRpb19ncHVfb2JqZWN0ICAgICAgICAqb2JqOwogfTsKIAotc3RhdGljIGludCB2aXJ0aW9fZ3B1 X3R0bV9iYWNrZW5kX2JpbmQoc3RydWN0IHR0bV90dCAqdHRtLAotCQkJCSAgICAgICBzdHJ1Y3Qg dHRtX21lbV9yZWcgKmJvX21lbSkKK3N0YXRpYyBpbnQgdmlydGlvX2dwdV90dG1fdHRfYmluZChz dHJ1Y3QgdHRtX3R0ICp0dG0sCisJCQkJICBzdHJ1Y3QgdHRtX21lbV9yZWcgKmJvX21lbSkKIHsK LQlzdHJ1Y3QgdmlydGlvX2dwdV90dG1fdHQgKmd0dCA9ICh2b2lkICopdHRtOworCXN0cnVjdCB2 aXJ0aW9fZ3B1X3R0bV90dCAqZ3R0ID0KKwkJY29udGFpbmVyX29mKHR0bSwgc3RydWN0IHZpcnRp b19ncHVfdHRtX3R0LCB0dG0udHRtKTsKKwlzdHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2 ID0KKwkJdmlydGlvX2dwdV9nZXRfdmdkZXYoZ3R0LT5vYmotPnRiby5iZGV2KTsKIAotCWd0dC0+ b2Zmc2V0ID0gKHVuc2lnbmVkIGxvbmcpKGJvX21lbS0+c3RhcnQgPDwgUEFHRV9TSElGVCk7Ci0J aWYgKCF0dG0tPm51bV9wYWdlcykKLQkJV0FSTigxLCAibm90aGluZyB0byBiaW5kICVsdSBwYWdl cyBmb3IgbXJlZyAlcCBiYWNrICVwIVxuIiwKLQkJICAgICB0dG0tPm51bV9wYWdlcywgYm9fbWVt LCB0dG0pOwotCi0JLyogTm90IGltcGxlbWVudGVkICovCisJdmlydGlvX2dwdV9vYmplY3RfYXR0 YWNoKHZnZGV2LCBndHQtPm9iaiwgTlVMTCk7CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQg dmlydGlvX2dwdV90dG1fYmFja2VuZF91bmJpbmQoc3RydWN0IHR0bV90dCAqdHRtKQorc3RhdGlj IGludCB2aXJ0aW9fZ3B1X3R0bV90dF91bmJpbmQoc3RydWN0IHR0bV90dCAqdHRtKQogewotCS8q IE5vdCBpbXBsZW1lbnRlZCAqLworCXN0cnVjdCB2aXJ0aW9fZ3B1X3R0bV90dCAqZ3R0ID0KKwkJ Y29udGFpbmVyX29mKHR0bSwgc3RydWN0IHZpcnRpb19ncHVfdHRtX3R0LCB0dG0udHRtKTsKKwlz dHJ1Y3QgdmlydGlvX2dwdV9kZXZpY2UgKnZnZGV2ID0KKwkJdmlydGlvX2dwdV9nZXRfdmdkZXYo Z3R0LT5vYmotPnRiby5iZGV2KTsKKworCXZpcnRpb19ncHVfb2JqZWN0X2RldGFjaCh2Z2Rldiwg Z3R0LT5vYmopOwogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCB2aXJ0aW9fZ3B1X3R0bV9i YWNrZW5kX2Rlc3Ryb3koc3RydWN0IHR0bV90dCAqdHRtKQorc3RhdGljIHZvaWQgdmlydGlvX2dw dV90dG1fdHRfZGVzdHJveShzdHJ1Y3QgdHRtX3R0ICp0dG0pCiB7Ci0Jc3RydWN0IHZpcnRpb19n cHVfdHRtX3R0ICpndHQgPSAodm9pZCAqKXR0bTsKKwlzdHJ1Y3QgdmlydGlvX2dwdV90dG1fdHQg Kmd0dCA9CisJCWNvbnRhaW5lcl9vZih0dG0sIHN0cnVjdCB2aXJ0aW9fZ3B1X3R0bV90dCwgdHRt LnR0bSk7CiAKIAl0dG1fZG1hX3R0X2ZpbmkoJmd0dC0+dHRtKTsKIAlrZnJlZShndHQpOwogfQog Ci1zdGF0aWMgc3RydWN0IHR0bV9iYWNrZW5kX2Z1bmMgdmlydGlvX2dwdV9iYWNrZW5kX2Z1bmMg PSB7Ci0JLmJpbmQgPSAmdmlydGlvX2dwdV90dG1fYmFja2VuZF9iaW5kLAotCS51bmJpbmQgPSAm dmlydGlvX2dwdV90dG1fYmFja2VuZF91bmJpbmQsCi0JLmRlc3Ryb3kgPSAmdmlydGlvX2dwdV90 dG1fYmFja2VuZF9kZXN0cm95LAorc3RhdGljIHN0cnVjdCB0dG1fYmFja2VuZF9mdW5jIHZpcnRp b19ncHVfdHRfZnVuYyA9IHsKKwkuYmluZCA9ICZ2aXJ0aW9fZ3B1X3R0bV90dF9iaW5kLAorCS51 bmJpbmQgPSAmdmlydGlvX2dwdV90dG1fdHRfdW5iaW5kLAorCS5kZXN0cm95ID0gJnZpcnRpb19n cHVfdHRtX3R0X2Rlc3Ryb3ksCiB9OwogCiBzdGF0aWMgc3RydWN0IHR0bV90dCAqdmlydGlvX2dw dV90dG1fdHRfY3JlYXRlKHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCkBAIC0yNDIsOCAr MjQ1LDggQEAgc3RhdGljIHN0cnVjdCB0dG1fdHQgKnZpcnRpb19ncHVfdHRtX3R0X2NyZWF0ZShz dHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAogCWd0dCA9IGt6YWxsb2Moc2l6ZW9mKHN0cnVj dCB2aXJ0aW9fZ3B1X3R0bV90dCksIEdGUF9LRVJORUwpOwogCWlmIChndHQgPT0gTlVMTCkKIAkJ cmV0dXJuIE5VTEw7Ci0JZ3R0LT50dG0udHRtLmZ1bmMgPSAmdmlydGlvX2dwdV9iYWNrZW5kX2Z1 bmM7Ci0JZ3R0LT52Z2RldiA9IHZnZGV2OworCWd0dC0+dHRtLnR0bS5mdW5jID0gJnZpcnRpb19n cHVfdHRfZnVuYzsKKwlndHQtPm9iaiA9IGNvbnRhaW5lcl9vZihibywgc3RydWN0IHZpcnRpb19n cHVfb2JqZWN0LCB0Ym8pOwogCWlmICh0dG1fZG1hX3R0X2luaXQoJmd0dC0+dHRtLCBibywgcGFn ZV9mbGFncykpIHsKIAkJa2ZyZWUoZ3R0KTsKIAkJcmV0dXJuIE5VTEw7CkBAIC0yNTEsNTEgKzI1 NCw2IEBAIHN0YXRpYyBzdHJ1Y3QgdHRtX3R0ICp2aXJ0aW9fZ3B1X3R0bV90dF9jcmVhdGUoc3Ry dWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAlyZXR1cm4gJmd0dC0+dHRtLnR0bTsKIH0KIAot c3RhdGljIHZvaWQgdmlydGlvX2dwdV9tb3ZlX251bGwoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0 ICpibywKLQkJCQkgc3RydWN0IHR0bV9tZW1fcmVnICpuZXdfbWVtKQotewotCXN0cnVjdCB0dG1f bWVtX3JlZyAqb2xkX21lbSA9ICZiby0+bWVtOwotCi0JQlVHX09OKG9sZF9tZW0tPm1tX25vZGUg IT0gTlVMTCk7Ci0JKm9sZF9tZW0gPSAqbmV3X21lbTsKLQluZXdfbWVtLT5tbV9ub2RlID0gTlVM TDsKLX0KLQotc3RhdGljIGludCB2aXJ0aW9fZ3B1X2JvX21vdmUoc3RydWN0IHR0bV9idWZmZXJf b2JqZWN0ICpibywgYm9vbCBldmljdCwKLQkJCSAgICAgIHN0cnVjdCB0dG1fb3BlcmF0aW9uX2N0 eCAqY3R4LAotCQkJICAgICAgc3RydWN0IHR0bV9tZW1fcmVnICpuZXdfbWVtKQotewotCWludCBy ZXQ7Ci0KLQlyZXQgPSB0dG1fYm9fd2FpdChibywgY3R4LT5pbnRlcnJ1cHRpYmxlLCBjdHgtPm5v X3dhaXRfZ3B1KTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JdmlydGlvX2dwdV9tb3Zl X251bGwoYm8sIG5ld19tZW0pOwotCXJldHVybiAwOwotfQotCi1zdGF0aWMgdm9pZCB2aXJ0aW9f Z3B1X2JvX21vdmVfbm90aWZ5KHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqdGJvLAotCQkJCSAg ICAgIGJvb2wgZXZpY3QsCi0JCQkJICAgICAgc3RydWN0IHR0bV9tZW1fcmVnICpuZXdfbWVtKQot ewotCXN0cnVjdCB2aXJ0aW9fZ3B1X29iamVjdCAqYm87Ci0Jc3RydWN0IHZpcnRpb19ncHVfZGV2 aWNlICp2Z2RldjsKLQotCWJvID0gY29udGFpbmVyX29mKHRibywgc3RydWN0IHZpcnRpb19ncHVf b2JqZWN0LCB0Ym8pOwotCXZnZGV2ID0gKHN0cnVjdCB2aXJ0aW9fZ3B1X2RldmljZSAqKWJvLT5n ZW1fYmFzZS5kZXYtPmRldl9wcml2YXRlOwotCi0JaWYgKCFuZXdfbWVtIHx8IChuZXdfbWVtLT5w bGFjZW1lbnQgJiBUVE1fUExfRkxBR19TWVNURU0pKSB7Ci0JCWlmIChiby0+aHdfcmVzX2hhbmRs ZSkKLQkJCXZpcnRpb19ncHVfb2JqZWN0X2RldGFjaCh2Z2RldiwgYm8pOwotCi0JfSBlbHNlIGlm IChuZXdfbWVtLT5wbGFjZW1lbnQgJiBUVE1fUExfRkxBR19UVCkgewotCQlpZiAoYm8tPmh3X3Jl c19oYW5kbGUpIHsKLQkJCXZpcnRpb19ncHVfb2JqZWN0X2F0dGFjaCh2Z2RldiwgYm8sIE5VTEwp OwotCQl9Ci0JfQotfQotCiBzdGF0aWMgdm9pZCB2aXJ0aW9fZ3B1X2JvX3N3YXBfbm90aWZ5KHN0 cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqdGJvKQogewogCXN0cnVjdCB2aXJ0aW9fZ3B1X29iamVj dCAqYm87CkBAIC0zMTQsMTEgKzI3Miw5IEBAIHN0YXRpYyBzdHJ1Y3QgdHRtX2JvX2RyaXZlciB2 aXJ0aW9fZ3B1X2JvX2RyaXZlciA9IHsKIAkuaW5pdF9tZW1fdHlwZSA9ICZ2aXJ0aW9fZ3B1X2lu aXRfbWVtX3R5cGUsCiAJLmV2aWN0aW9uX3ZhbHVhYmxlID0gdHRtX2JvX2V2aWN0aW9uX3ZhbHVh YmxlLAogCS5ldmljdF9mbGFncyA9ICZ2aXJ0aW9fZ3B1X2V2aWN0X2ZsYWdzLAotCS5tb3ZlID0g JnZpcnRpb19ncHVfYm9fbW92ZSwKIAkudmVyaWZ5X2FjY2VzcyA9ICZ2aXJ0aW9fZ3B1X3Zlcmlm eV9hY2Nlc3MsCiAJLmlvX21lbV9yZXNlcnZlID0gJnZpcnRpb19ncHVfdHRtX2lvX21lbV9yZXNl cnZlLAogCS5pb19tZW1fZnJlZSA9ICZ2aXJ0aW9fZ3B1X3R0bV9pb19tZW1fZnJlZSwKLQkubW92 ZV9ub3RpZnkgPSAmdmlydGlvX2dwdV9ib19tb3ZlX25vdGlmeSwKIAkuc3dhcF9ub3RpZnkgPSAm dmlydGlvX2dwdV9ib19zd2FwX25vdGlmeSwKIH07CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK