From patchwork Tue Dec 17 14:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 11297861 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 6577714B7 for ; Tue, 17 Dec 2019 14:53:43 +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 4D50D2146E for ; Tue, 17 Dec 2019 14:53:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D50D2146E 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 E674E6EA22; Tue, 17 Dec 2019 14:53:38 +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 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FB8E6EA24 for ; Tue, 17 Dec 2019 14:52:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id 037C029289E From: Andrzej Pietrasiewicz To: dri-devel@lists.freedesktop.org Subject: [PATCHv5 27/34] drm/komeda: Move special helper invocation outside if-else Date: Tue, 17 Dec 2019 15:50:13 +0100 Message-Id: <20191217145020.14645-28-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" The invocation is the same in both cases and is the last thing inside a block, so move it outside the if-else clause. Signed-off-by: Andrzej Pietrasiewicz --- .../gpu/drm/arm/display/komeda/komeda_framebuffer.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index 7e02a04cdd11..bf4309b62d37 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c @@ -44,6 +44,8 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, struct drm_gem_object *objs[4]; struct komeda_fb *kfb; const struct drm_format_info *info; + struct drm_size_check check = { 0 }; + int ret = 0, i, num_planes; kfb = kzalloc(sizeof(*kfb), GFP_KERNEL); @@ -68,7 +70,6 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, info = drm_get_format_info(dev, mode_cmd); if (mode_cmd->modifier[0]) { - struct drm_size_check check = { 0 }; u32 alignment_w = 0, alignment_h = 0; u32 alignment_header, n_blocks, bpp; @@ -109,11 +110,7 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, + n_blocks * ALIGN(bpp * AFBC_SUPERBLK_PIXELS / 8, AFBC_SUPERBLK_ALIGNMENT); check.min_size[0] = kfb->afbc_size + mode_cmd->offsets[0]; check.use_min_size = true; - - ret = drm_gem_fb_size_check2(dev, mode_cmd, &check, objs); } else { - struct drm_size_check check = { 0 }; - ret = komeda_fb_check_src_coords(kfb, 0, 0, mode_cmd->width, mode_cmd->height); if (ret) @@ -135,9 +132,8 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, check.pitch_modulo = mdev->chip.bus_width; check.use_pitch_multiplier = true; check.use_min_size = true; - - ret = drm_gem_fb_size_check2(dev, mode_cmd, &check, objs); } + ret = drm_gem_fb_size_check2(dev, mode_cmd, &check, objs); if (ret < 0) goto err_cleanup;