From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Zimmermann Date: Tue, 12 Nov 2019 14:04:29 +0000 Subject: [PATCH v3 3/5] drm/udl: Remove udl implementation of GEM's free_object() Message-Id: <20191112140431.7895-4-tzimmermann@suse.de> List-Id: References: <20191112140431.7895-1-tzimmermann@suse.de> In-Reply-To: <20191112140431.7895-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: airlied@redhat.com, sean@poorly.run, daniel@ffwll.ch, b.zolnierkie@samsung.com, noralf@tronnes.org, kraxel@redhat.com, sam@ravnborg.org, emil.velikov@collabora.com Cc: linux-fbdev@vger.kernel.org, Thomas Zimmermann , dri-devel@lists.freedesktop.org Udl used to have a custom implementation for free_object() of struct drm_gem_object_funcs. It unmapped the memory buffer of the fbdev emulation. With the switch to generic fbdev emulation, this is now handled by the fbdev code internally. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/udl/udl_gem.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 6eade6b4b0dc..b6e26f98aa0a 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -17,22 +17,6 @@ * GEM object funcs */ -static void udl_gem_object_free_object(struct drm_gem_object *obj) -{ - struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); - - /* Fbdev emulation vmaps the buffer. Unmap it here for consistency - * with the original udl GEM code. - * - * TODO: Switch to generic fbdev emulation and release the - * GEM object with drm_gem_shmem_free_object(). - */ - if (shmem->vaddr) - drm_gem_shmem_vunmap(obj, shmem->vaddr); - - drm_gem_shmem_free_object(obj); -} - static int udl_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) { @@ -91,7 +75,7 @@ static void *udl_gem_object_vmap(struct drm_gem_object *obj) } static const struct drm_gem_object_funcs udl_gem_object_funcs = { - .free = udl_gem_object_free_object, + .free = drm_gem_shmem_free_object, .print_info = drm_gem_shmem_print_info, .pin = drm_gem_shmem_pin, .unpin = drm_gem_shmem_unpin, -- 2.23.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Zimmermann Subject: [PATCH v3 3/5] drm/udl: Remove udl implementation of GEM's free_object() Date: Tue, 12 Nov 2019 15:04:29 +0100 Message-ID: <20191112140431.7895-4-tzimmermann@suse.de> References: <20191112140431.7895-1-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B23F6E480 for ; Tue, 12 Nov 2019 14:04:37 +0000 (UTC) In-Reply-To: <20191112140431.7895-1-tzimmermann@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@redhat.com, sean@poorly.run, daniel@ffwll.ch, b.zolnierkie@samsung.com, noralf@tronnes.org, kraxel@redhat.com, sam@ravnborg.org, emil.velikov@collabora.com Cc: linux-fbdev@vger.kernel.org, Thomas Zimmermann , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VWRsIHVzZWQgdG8gaGF2ZSBhIGN1c3RvbSBpbXBsZW1lbnRhdGlvbiBmb3IgZnJlZV9vYmplY3Qo KSBvZgpzdHJ1Y3QgZHJtX2dlbV9vYmplY3RfZnVuY3MuIEl0IHVubWFwcGVkIHRoZSBtZW1vcnkg YnVmZmVyIG9mCnRoZSBmYmRldiBlbXVsYXRpb24uIFdpdGggdGhlIHN3aXRjaCB0byBnZW5lcmlj IGZiZGV2IGVtdWxhdGlvbiwKdGhpcyBpcyBub3cgaGFuZGxlZCBieSB0aGUgZmJkZXYgY29kZSBp bnRlcm5hbGx5LgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIFppbW1lcm1hbm4gPHR6aW1tZXJtYW5u QHN1c2UuZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZ2VtLmMgfCAxOCArLS0tLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMTcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vdWRsL3VkbF9nZW0uYwppbmRleCA2ZWFkZTZiNGIwZGMuLmI2ZTI2Zjk4YWEwYSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3VkbC91ZGxfZ2VtLmMKQEAgLTE3LDIyICsxNyw2IEBACiAgKiBHRU0gb2JqZWN0IGZ1 bmNzCiAgKi8KIAotc3RhdGljIHZvaWQgdWRsX2dlbV9vYmplY3RfZnJlZV9vYmplY3Qoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopCi17Ci0Jc3RydWN0IGRybV9nZW1fc2htZW1fb2JqZWN0ICpz aG1lbSA9IHRvX2RybV9nZW1fc2htZW1fb2JqKG9iaik7Ci0KLQkvKiBGYmRldiBlbXVsYXRpb24g dm1hcHMgdGhlIGJ1ZmZlci4gVW5tYXAgaXQgaGVyZSBmb3IgY29uc2lzdGVuY3kKLQkgKiB3aXRo IHRoZSBvcmlnaW5hbCB1ZGwgR0VNIGNvZGUuCi0JICoKLQkgKiBUT0RPOiBTd2l0Y2ggdG8gZ2Vu ZXJpYyBmYmRldiBlbXVsYXRpb24gYW5kIHJlbGVhc2UgdGhlCi0JICogICAgICAgR0VNIG9iamVj dCB3aXRoIGRybV9nZW1fc2htZW1fZnJlZV9vYmplY3QoKS4KLQkgKi8KLQlpZiAoc2htZW0tPnZh ZGRyKQotCQlkcm1fZ2VtX3NobWVtX3Z1bm1hcChvYmosIHNobWVtLT52YWRkcik7Ci0KLQlkcm1f Z2VtX3NobWVtX2ZyZWVfb2JqZWN0KG9iaik7Ci19Ci0KIHN0YXRpYyBpbnQgdWRsX2dlbV9vYmpl Y3RfbW1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAkJCSAgICAgICBzdHJ1Y3Qgdm1f YXJlYV9zdHJ1Y3QgKnZtYSkKIHsKQEAgLTkxLDcgKzc1LDcgQEAgc3RhdGljIHZvaWQgKnVkbF9n ZW1fb2JqZWN0X3ZtYXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCiB9CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3RfZnVuY3MgdWRsX2dlbV9vYmplY3RfZnVuY3MgPSB7 Ci0JLmZyZWUgPSB1ZGxfZ2VtX29iamVjdF9mcmVlX29iamVjdCwKKwkuZnJlZSA9IGRybV9nZW1f c2htZW1fZnJlZV9vYmplY3QsCiAJLnByaW50X2luZm8gPSBkcm1fZ2VtX3NobWVtX3ByaW50X2lu Zm8sCiAJLnBpbiA9IGRybV9nZW1fc2htZW1fcGluLAogCS51bnBpbiA9IGRybV9nZW1fc2htZW1f dW5waW4sCi0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbA==