From patchwork Tue Dec 17 14:50:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 11297833 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 DBB5F13B6 for ; Tue, 17 Dec 2019 14:53:01 +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 C2DF12146E for ; Tue, 17 Dec 2019 14:53:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2DF12146E 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 EA3B56EA16; Tue, 17 Dec 2019 14:52:49 +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 C91A46EA05 for ; Tue, 17 Dec 2019 14:52:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id C09FD2927DF From: Andrzej Pietrasiewicz To: dri-devel@lists.freedesktop.org Subject: [PATCHv5 18/34] drm/komeda: Move object assignments to framebuffer to after size checks Date: Tue, 17 Dec 2019 15:50:04 +0100 Message-Id: <20191217145020.14645-19-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 assignments are the same in both branches of the "if" statement and nothing depends on them between their original position and the new position, so this can be safely done. Signed-off-by: Andrzej Pietrasiewicz --- drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c index acffceeb26f1..d52278ca27fb 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c @@ -166,8 +166,6 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, 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 { ret = komeda_fb_check_src_coords(kfb, 0, 0, kfb->base.width, kfb->base.height); @@ -176,8 +174,6 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, ret = komeda_fb_none_afbc_size_check(mdev, info, objs, file, mode_cmd); - for (i = 0; i < info->num_planes; ++i) - kfb->base.obj[i] = objs[i]; } if (ret < 0) goto err_cleanup; @@ -189,6 +185,9 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file, goto err_cleanup; } + for (i = 0; i < info->num_planes; ++i) + kfb->base.obj[i] = objs[i]; + ret = drm_framebuffer_init(dev, &kfb->base, &komeda_fb_funcs); if (ret < 0) { DRM_DEBUG_KMS("failed to initialize fb\n");