From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stone Subject: [PATCH 06/24] drm/omap: Move GEM BO to drm_framebuffer Date: Fri, 30 Mar 2018 15:11:20 +0100 Message-ID: <20180330141138.28987-6-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 07B336E8BE for ; Fri, 30 Mar 2018 14:11:45 +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 Cc: Tomi Valkeinen List-Id: dri-devel@lists.freedesktop.org U2luY2UgZHJtX2ZyYW1lYnVmZmVyIGNhbiBub3cgc3RvcmUgR0VNIG9iamVjdHMgZGlyZWN0bHks IHBsYWNlIHRoZW0KdGhlcmUgcmF0aGVyIHRoYW4gaW4gb3VyIG93biBzdWJjbGFzcy4gQXMgdGhp cyBtYWtlcyB0aGUgZnJhbWVidWZmZXIKY3JlYXRlX2hhbmRsZSBhbmQgZGVzdHJveSBmdW5jdGlv bnMgdGhlIHNhbWUgYXMgdGhlIEdFTSBmcmFtZWJ1ZmZlcgpoZWxwZXIsIHdlIGNhbiByZXVzZSB0 aG9zZS4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBTdG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEuY29t PgpDYzogVG9taSBWYWxrZWluZW4gPHRvbWkudmFsa2VpbmVuQHRpLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vb21hcGRybS9vbWFwX2ZiLmMgfCA2MCArKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA0NSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2ZiLmMg Yi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2ZiLmMKaW5kZXggNWZkMjJjYTczOTEzLi4z ZDZiNmYzZDY4MDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9vbWFwZHJtL29tYXBfZmIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX2ZiLmMKQEAgLTE5LDYgKzE5LDcg QEAKIAogI2luY2x1ZGUgPGRybS9kcm1fY3J0Yy5oPgogI2luY2x1ZGUgPGRybS9kcm1fY3J0Y19o ZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2dlbV9mcmFtZWJ1ZmZlcl9oZWxwZXIuaD4KIAog I2luY2x1ZGUgIm9tYXBfZG1tX3RpbGVyLmgiCiAjaW5jbHVkZSAib21hcF9kcnYuaCIKQEAgLTUx LDcgKzUyLDYgQEAgc3RhdGljIGNvbnN0IHUzMiBmb3JtYXRzW10gPSB7CiAKIC8qIHBlci1wbGFu ZSBpbmZvIGZvciB0aGUgZmI6ICovCiBzdHJ1Y3QgcGxhbmUgewotCXN0cnVjdCBkcm1fZ2VtX29i amVjdCAqYm87CiAJdTMyIHBpdGNoOwogCXUzMiBvZmZzZXQ7CiAJZG1hX2FkZHJfdCBkbWFfYWRk cjsKQEAgLTY4LDM2ICs2OCw5IEBAIHN0cnVjdCBvbWFwX2ZyYW1lYnVmZmVyIHsKIAlzdHJ1Y3Qg bXV0ZXggbG9jazsKIH07CiAKLXN0YXRpYyBpbnQgb21hcF9mcmFtZWJ1ZmZlcl9jcmVhdGVfaGFu ZGxlKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAotCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVf cHJpdiwKLQkJdW5zaWduZWQgaW50ICpoYW5kbGUpCi17Ci0Jc3RydWN0IG9tYXBfZnJhbWVidWZm ZXIgKm9tYXBfZmIgPSB0b19vbWFwX2ZyYW1lYnVmZmVyKGZiKTsKLQlyZXR1cm4gZHJtX2dlbV9o YW5kbGVfY3JlYXRlKGZpbGVfcHJpdiwKLQkJCW9tYXBfZmItPnBsYW5lc1swXS5ibywgaGFuZGxl KTsKLX0KLQotc3RhdGljIHZvaWQgb21hcF9mcmFtZWJ1ZmZlcl9kZXN0cm95KHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiKQotewotCXN0cnVjdCBvbWFwX2ZyYW1lYnVmZmVyICpvbWFwX2ZiID0g dG9fb21hcF9mcmFtZWJ1ZmZlcihmYik7Ci0JaW50IGksIG4gPSBmYi0+Zm9ybWF0LT5udW1fcGxh bmVzOwotCi0JREJHKCJkZXN0cm95OiBGQiBJRDogJWQgKCVwKSIsIGZiLT5iYXNlLmlkLCBmYik7 Ci0KLQlkcm1fZnJhbWVidWZmZXJfY2xlYW51cChmYik7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgbjsg aSsrKSB7Ci0JCXN0cnVjdCBwbGFuZSAqcGxhbmUgPSAmb21hcF9mYi0+cGxhbmVzW2ldOwotCi0J CWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKHBsYW5lLT5ibyk7Ci0JfQotCi0J a2ZyZWUob21hcF9mYik7Ci19Ci0KIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy X2Z1bmNzIG9tYXBfZnJhbWVidWZmZXJfZnVuY3MgPSB7Ci0JLmNyZWF0ZV9oYW5kbGUgPSBvbWFw X2ZyYW1lYnVmZmVyX2NyZWF0ZV9oYW5kbGUsCi0JLmRlc3Ryb3kgPSBvbWFwX2ZyYW1lYnVmZmVy X2Rlc3Ryb3ksCisJLmNyZWF0ZV9oYW5kbGUgPSBkcm1fZ2VtX2ZiX2NyZWF0ZV9oYW5kbGUsCisJ LmRlc3Ryb3kgPSBkcm1fZ2VtX2ZiX2Rlc3Ryb3ksCiB9OwogCiBzdGF0aWMgdTMyIGdldF9saW5l YXJfYWRkcihzdHJ1Y3QgcGxhbmUgKnBsYW5lLApAQCAtMTE0LDEwICs4Nyw3IEBAIHN0YXRpYyB1 MzIgZ2V0X2xpbmVhcl9hZGRyKHN0cnVjdCBwbGFuZSAqcGxhbmUsCiAKIGJvb2wgb21hcF9mcmFt ZWJ1ZmZlcl9zdXBwb3J0c19yb3RhdGlvbihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIHsK LQlzdHJ1Y3Qgb21hcF9mcmFtZWJ1ZmZlciAqb21hcF9mYiA9IHRvX29tYXBfZnJhbWVidWZmZXIo ZmIpOwotCXN0cnVjdCBwbGFuZSAqcGxhbmUgPSAmb21hcF9mYi0+cGxhbmVzWzBdOwotCi0JcmV0 dXJuIG9tYXBfZ2VtX2ZsYWdzKHBsYW5lLT5ibykgJiBPTUFQX0JPX1RJTEVEOworCXJldHVybiBv bWFwX2dlbV9mbGFncyhmYi0+b2JqWzBdKSAmIE9NQVBfQk9fVElMRUQ7CiB9CiAKIC8qIE5vdGU6 IERSTSByb3RhdGVzIGNvdW50ZXItY2xvY2t3aXNlLCBUSUxFUiAmIERTUyByb3RhdGVzIGNsb2Nr d2lzZSAqLwpAQCAtMTc2LDcgKzE0Niw3IEBAIHZvaWQgb21hcF9mcmFtZWJ1ZmZlcl91cGRhdGVf c2Nhbm91dChzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAl4ID0gc3RhdGUtPnNyY194ID4+ IDE2OwogCXkgPSBzdGF0ZS0+c3JjX3kgPj4gMTY7CiAKLQlpZiAob21hcF9nZW1fZmxhZ3MocGxh bmUtPmJvKSAmIE9NQVBfQk9fVElMRUQpIHsKKwlpZiAob21hcF9nZW1fZmxhZ3MoZmItPm9ialsw XSkgJiBPTUFQX0JPX1RJTEVEKSB7CiAJCXUzMiB3ID0gc3RhdGUtPnNyY193ID4+IDE2OwogCQl1 MzIgaCA9IHN0YXRlLT5zcmNfaCA+PiAxNjsKIApAQCAtMjAxLDEyICsxNzEsMTIgQEAgdm9pZCBv bWFwX2ZyYW1lYnVmZmVyX3VwZGF0ZV9zY2Fub3V0KHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi LAogCQkJeCArPSB3IC0gMTsKIAogCQkvKiBOb3RlOiB4IGFuZCB5IGFyZSBpbiBUSUxFUiB1bml0 cywgbm90IHBpeGVscyAqLwotCQlvbWFwX2dlbV9yb3RhdGVkX2RtYV9hZGRyKHBsYW5lLT5ibywg b3JpZW50LCB4LCB5LAorCQlvbWFwX2dlbV9yb3RhdGVkX2RtYV9hZGRyKGZiLT5vYmpbMF0sIG9y aWVudCwgeCwgeSwKIAkJCQkJICAmaW5mby0+cGFkZHIpOwogCQlpbmZvLT5yb3RhdGlvbl90eXBl ID0gT01BUF9EU1NfUk9UX1RJTEVSOwogCQlpbmZvLT5yb3RhdGlvbiA9IHN0YXRlLT5yb3RhdGlv biA/OiBEUk1fTU9ERV9ST1RBVEVfMDsKIAkJLyogTm90ZTogc3RyaWRlIGluIFRJTEVSIHVuaXRz LCBub3QgcGl4ZWxzICovCi0JCWluZm8tPnNjcmVlbl93aWR0aCAgPSBvbWFwX2dlbV90aWxlZF9z dHJpZGUocGxhbmUtPmJvLCBvcmllbnQpOworCQlpbmZvLT5zY3JlZW5fd2lkdGggID0gb21hcF9n ZW1fdGlsZWRfc3RyaWRlKGZiLT5vYmpbMF0sIG9yaWVudCk7CiAJfSBlbHNlIHsKIAkJc3dpdGNo IChzdGF0ZS0+cm90YXRpb24gJiBEUk1fTU9ERV9ST1RBVEVfTUFTSykgewogCQljYXNlIDA6CkBA IC0yMzQsOCArMjA0LDggQEAgdm9pZCBvbWFwX2ZyYW1lYnVmZmVyX3VwZGF0ZV9zY2Fub3V0KHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCQlwbGFuZSA9ICZvbWFwX2ZiLT5wbGFuZXNbMV07 CiAKIAkJaWYgKGluZm8tPnJvdGF0aW9uX3R5cGUgPT0gT01BUF9EU1NfUk9UX1RJTEVSKSB7Ci0J CQlXQVJOX09OKCEob21hcF9nZW1fZmxhZ3MocGxhbmUtPmJvKSAmIE9NQVBfQk9fVElMRUQpKTsK LQkJCW9tYXBfZ2VtX3JvdGF0ZWRfZG1hX2FkZHIocGxhbmUtPmJvLCBvcmllbnQsIHgvMiwgeS8y LAorCQkJV0FSTl9PTighKG9tYXBfZ2VtX2ZsYWdzKGZiLT5vYmpbMV0pICYgT01BUF9CT19USUxF RCkpOworCQkJb21hcF9nZW1fcm90YXRlZF9kbWFfYWRkcihmYi0+b2JqWzFdLCBvcmllbnQsIHgv MiwgeS8yLAogCQkJCQkJICAmaW5mby0+cF91dl9hZGRyKTsKIAkJfSBlbHNlIHsKIAkJCWluZm8t PnBfdXZfYWRkciA9IGdldF9saW5lYXJfYWRkcihwbGFuZSwgZm9ybWF0LCAxLCB4LCB5KTsKQEAg LTI2MSwxMCArMjMxLDEwIEBAIGludCBvbWFwX2ZyYW1lYnVmZmVyX3BpbihzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpmYikKIAogCWZvciAoaSA9IDA7IGkgPCBuOyBpKyspIHsKIAkJc3RydWN0IHBs YW5lICpwbGFuZSA9ICZvbWFwX2ZiLT5wbGFuZXNbaV07Ci0JCXJldCA9IG9tYXBfZ2VtX3Bpbihw bGFuZS0+Ym8sICZwbGFuZS0+ZG1hX2FkZHIpOworCQlyZXQgPSBvbWFwX2dlbV9waW4oZmItPm9i altpXSwgJnBsYW5lLT5kbWFfYWRkcik7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGZhaWw7Ci0JCW9t YXBfZ2VtX2RtYV9zeW5jX2J1ZmZlcihwbGFuZS0+Ym8sIERNQV9UT19ERVZJQ0UpOworCQlvbWFw X2dlbV9kbWFfc3luY19idWZmZXIoZmItPm9ialtpXSwgRE1BX1RPX0RFVklDRSk7CiAJfQogCiAJ b21hcF9mYi0+cGluX2NvdW50Kys7CkBAIC0yNzYsNyArMjQ2LDcgQEAgaW50IG9tYXBfZnJhbWVi dWZmZXJfcGluKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQogZmFpbDoKIAlmb3IgKGktLTsg aSA+PSAwOyBpLS0pIHsKIAkJc3RydWN0IHBsYW5lICpwbGFuZSA9ICZvbWFwX2ZiLT5wbGFuZXNb aV07Ci0JCW9tYXBfZ2VtX3VucGluKHBsYW5lLT5ibyk7CisJCW9tYXBfZ2VtX3VucGluKGZiLT5v YmpbaV0pOwogCQlwbGFuZS0+ZG1hX2FkZHIgPSAwOwogCX0KIApAQCAtMzAyLDcgKzI3Miw3IEBA IHZvaWQgb21hcF9mcmFtZWJ1ZmZlcl91bnBpbihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikK IAogCWZvciAoaSA9IDA7IGkgPCBuOyBpKyspIHsKIAkJc3RydWN0IHBsYW5lICpwbGFuZSA9ICZv bWFwX2ZiLT5wbGFuZXNbaV07Ci0JCW9tYXBfZ2VtX3VucGluKHBsYW5lLT5ibyk7CisJCW9tYXBf Z2VtX3VucGluKGZiLT5vYmpbaV0pOwogCQlwbGFuZS0+ZG1hX2FkZHIgPSAwOwogCX0KIApAQCAt MzQ5LDcgKzMxOSw3IEBAIHZvaWQgb21hcF9mcmFtZWJ1ZmZlcl9kZXNjcmliZShzdHJ1Y3QgZHJt X2ZyYW1lYnVmZmVyICpmYiwgc3RydWN0IHNlcV9maWxlICptKQogCQlzdHJ1Y3QgcGxhbmUgKnBs YW5lID0gJm9tYXBfZmItPnBsYW5lc1tpXTsKIAkJc2VxX3ByaW50ZihtLCAiICAgJWQ6IG9mZnNl dD0lZCBwaXRjaD0lZCwgb2JqOiAiLAogCQkJCWksIHBsYW5lLT5vZmZzZXQsIHBsYW5lLT5waXRj aCk7Ci0JCW9tYXBfZ2VtX2Rlc2NyaWJlKHBsYW5lLT5ibywgbSk7CisJCW9tYXBfZ2VtX2Rlc2Ny aWJlKGZiLT5vYmpbaV0sIG0pOwogCX0KIH0KICNlbmRpZgpAQCAtNDU0LDcgKzQyNCw3IEBAIHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9tYXBfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQkJZ290byBmYWlsOwogCQl9CiAKLQkJcGxhbmUtPmJvICAgICA9IGJvc1tp XTsKKwkJZmItPm9ialtpXSAgICA9IGJvc1tpXTsKIAkJcGxhbmUtPm9mZnNldCA9IG1vZGVfY21k LT5vZmZzZXRzW2ldOwogCQlwbGFuZS0+cGl0Y2ggID0gcGl0Y2g7CiAJCXBsYW5lLT5kbWFfYWRk ciAgPSAwOwotLSAKMi4xNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK