From patchwork Tue Dec 17 14:50:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 11297809 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B10914B7 for ; Tue, 17 Dec 2019 14:52:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5298C24655 for ; Tue, 17 Dec 2019 14:52:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5298C24655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8A7E6EA07; Tue, 17 Dec 2019 14:52:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id E99E26EA02 for ; Tue, 17 Dec 2019 14:52:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id 1A2DC2927D9 From: Andrzej Pietrasiewicz To: dri-devel@lists.freedesktop.org Subject: [PATCHv5 14/34] drm/komeda: Factor out object lookups for afbc case Date: Tue, 17 Dec 2019 15:50:00 +0100 Message-Id: <20191217145020.14645-15-andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217145020.14645-1-andrzej.p@collabora.com> References: <20191213173350.GJ624164@phenom.ffwll.local> <20191217145020.14645-1-andrzej.p@collabora.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ayan Halder , kernel@collabora.com, David Airlie , Liviu Dudau , Sandy Huang , Andrzej Pietrasiewicz , James Wang , Mihail Atanassov , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Ultimately we want lookups happening only once in komeda's fb_create implementation. Signed-off-by: Andrzej Pietrasiewicz --- .../arm/display/komeda/komeda_framebuffer.c | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index 43db95a76291..6b11a1b21ef6 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c @@ -39,6 +39,7 @@ static const struct drm_framebuffer_funcs komeda_fb_funcs = { static int komeda_fb_afbc_size_check(struct komeda_fb *kfb, const struct drm_format_info *info, + struct drm_gem_object **objs, struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd) { @@ -47,11 +48,7 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks, bpp; u64 min_size; - obj = drm_gem_object_lookup(file, mode_cmd->handles[0]); - if (!obj) { - DRM_DEBUG_KMS("Failed to lookup GEM object\n"); - return -ENOENT; - } + obj = objs[0]; if (!drm_afbc_get_superblock_wh(fb->modifier, &alignment_w, &alignment_h)) return -EINVAL; @@ -70,7 +67,7 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, if (fb->offsets[0] % alignment_header) { DRM_DEBUG_KMS("afbc offset alignment check failed.\n"); - goto check_failed; + return -EINVAL; } n_blocks = (kfb->aligned_w * kfb->aligned_h) / AFBC_SUPERBLK_PIXELS; @@ -85,15 +82,10 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, if (min_size > obj->size) { DRM_DEBUG_KMS("afbc size check failed, obj_size: 0x%zx. min_size 0x%llx.\n", obj->size, min_size); - goto check_failed; + return -EINVAL; } - fb->obj[0] = obj; return 0; - -check_failed: - drm_gem_object_put_unlocked(obj); - return -EINVAL; } static int @@ -162,12 +154,24 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, info = kfb->base.format; if (kfb->base.modifier) { + struct drm_gem_object *objs[4]; + if (info->num_planes != 1) { DRM_DEBUG_KMS("AFBC requires exactly 1 plane.\n"); kfree(kfb); return ERR_PTR(-EINVAL); } - ret = komeda_fb_afbc_size_check(kfb, info, file, mode_cmd); + + ret = drm_gem_fb_lookup(dev, file, mode_cmd, objs); + if (ret < 0) { + kfree(kfb); + return ERR_PTR(ret); + } + + ret = komeda_fb_afbc_size_check(kfb, info, objs, file, + mode_cmd); + for (i = 0; i < info->num_planes; ++i) + kfb->base.obj[i] = objs[i]; } else { struct drm_gem_object *objs[4];