From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [PATCH 1/2] drm/rockchip: create the fake mmap offset during gem creation Date: Mon, 09 Nov 2015 20:50:43 +0100 Message-ID: <4982827.0pnZflEOSR@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark Yao Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org List-Id: linux-rockchip.vger.kernel.org U2ltaWxhcmx5IHRvIHRoZSBlcXVpdmFsZW50IGV4eW5vcy1maXggaW4gY29tbWl0IDQ4Y2Y1M2Y0 MzQzYQooImRybS9leHlub3M6IGNyZWF0ZSBhIGZha2UgbW1hcCBvZmZzZXQgd2l0aCBnZW0gY3Jl YXRpb24iKSB0aGUgcm9ja2NoaXAKZHJtIGRyaXZlciBhbHNvIGNhbGxzIHRoZSBkcm1fZ2VtX2Ny ZWF0ZV9tbWFwX29mZnNldCBmYWtlLW9mZnNldCBjcmVhdGlvbgpvbiBldmVyeSBpbnZvY2F0aW9u IG9mIHJvY2tjaGlwX2dlbV9kdW1iX21hcF9vZmZzZXQuCgpNb3ZlIHRoYXQgdG8gdGhlIGNyZWF0 aW9uIG9mIHRoZSBnZW0gdG8gb25seSBjcmVhdGUgdGhhdCBvZmZzZXQgb25jZS4KClNpZ25lZC1v ZmYtYnk6IEhlaWtvIFN0dWVibmVyIDxoZWlrb0BzbnRlY2guZGU+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9nZW0uYyB8IDEyICsrKysrKy0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9nZW0uYwppbmRleCA0YWIyZjIwLi5lNTBkMTEzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZ2VtLmMKQEAgLTEyNiw4 ICsxMjYsMTQgQEAgc3RydWN0IHJvY2tjaGlwX2dlbV9vYmplY3QgKgogCWlmIChyZXQpCiAJCWdv dG8gZXJyX2ZyZWVfcmtfb2JqOwogCisJcmV0ID0gZHJtX2dlbV9jcmVhdGVfbW1hcF9vZmZzZXQo b2JqKTsKKwlpZiAocmV0KQorCQlnb3RvIGVycl9mcmVlX2J1ZjsKKwogCXJldHVybiBya19vYmo7 CiAKK2Vycl9mcmVlX2J1ZjoKKwlyb2NrY2hpcF9nZW1fZnJlZV9idWYocmtfb2JqKTsKIGVycl9m cmVlX3JrX29iajoKIAlrZnJlZShya19vYmopOwogCXJldHVybiBFUlJfUFRSKHJldCk7CkBAIC0x OTYsNyArMjAyLDYgQEAgaW50IHJvY2tjaGlwX2dlbV9kdW1iX21hcF9vZmZzZXQoc3RydWN0IGRy bV9maWxlICpmaWxlX3ByaXYsCiAJCQkJIHVpbnQ2NF90ICpvZmZzZXQpCiB7CiAJc3RydWN0IGRy bV9nZW1fb2JqZWN0ICpvYmo7Ci0JaW50IHJldDsKIAogCW9iaiA9IGRybV9nZW1fb2JqZWN0X2xv b2t1cChkZXYsIGZpbGVfcHJpdiwgaGFuZGxlKTsKIAlpZiAoIW9iaikgewpAQCAtMjA0LDE0ICsy MDksOSBAQCBpbnQgcm9ja2NoaXBfZ2VtX2R1bWJfbWFwX29mZnNldChzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGVfcHJpdiwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JcmV0ID0gZHJtX2dlbV9jcmVh dGVfbW1hcF9vZmZzZXQob2JqKTsKLQlpZiAocmV0KQotCQlnb3RvIG91dDsKLQogCSpvZmZzZXQg PSBkcm1fdm1hX25vZGVfb2Zmc2V0X2FkZHIoJm9iai0+dm1hX25vZGUpOwogCURSTV9ERUJVR19L TVMoIm9mZnNldCA9IDB4JWxseFxuIiwgKm9mZnNldCk7CiAKLW91dDoKIAlkcm1fZ2VtX29iamVj dF91bnJlZmVyZW5jZV91bmxvY2tlZChvYmopOwogCiAJcmV0dXJuIDA7Ci0tIAoyLjYuMgoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko Stuebner) Date: Mon, 09 Nov 2015 20:50:43 +0100 Subject: [PATCH 1/2] drm/rockchip: create the fake mmap offset during gem creation Message-ID: <4982827.0pnZflEOSR@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Similarly to the equivalent exynos-fix in commit 48cf53f4343a ("drm/exynos: create a fake mmap offset with gem creation") the rockchip drm driver also calls the drm_gem_create_mmap_offset fake-offset creation on every invocation of rockchip_gem_dumb_map_offset. Move that to the creation of the gem to only create that offset once. Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index 4ab2f20..e50d113 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -126,8 +126,14 @@ struct rockchip_gem_object * if (ret) goto err_free_rk_obj; + ret = drm_gem_create_mmap_offset(obj); + if (ret) + goto err_free_buf; + return rk_obj; +err_free_buf: + rockchip_gem_free_buf(rk_obj); err_free_rk_obj: kfree(rk_obj); return ERR_PTR(ret); @@ -196,7 +202,6 @@ int rockchip_gem_dumb_map_offset(struct drm_file *file_priv, uint64_t *offset) { struct drm_gem_object *obj; - int ret; obj = drm_gem_object_lookup(dev, file_priv, handle); if (!obj) { @@ -204,14 +209,9 @@ int rockchip_gem_dumb_map_offset(struct drm_file *file_priv, return -EINVAL; } - ret = drm_gem_create_mmap_offset(obj); - if (ret) - goto out; - *offset = drm_vma_node_offset_addr(&obj->vma_node); DRM_DEBUG_KMS("offset = 0x%llx\n", *offset); -out: drm_gem_object_unreference_unlocked(obj); return 0; -- 2.6.2