Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp815577pxb; Tue, 12 Apr 2022 14:13:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtEKo5CbiM34FsFCxMPsOn9N5mi031WBM0UUCv0nuU7r24nXdHnE7cAzROj3v7f0a5e/6Z X-Received: by 2002:a17:90b:3e88:b0:1c7:87e9:61ff with SMTP id rj8-20020a17090b3e8800b001c787e961ffmr7058659pjb.234.1649798011786; Tue, 12 Apr 2022 14:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649798011; cv=none; d=google.com; s=arc-20160816; b=bueoC0hkoMSffqLYr+xN86J4MtKB4pTo/vRlrnLsMd+QAWOupIqjrqAF7YlqEmGHrx 3nsQ7A3+/w8iaASW78LSVk3J4e8UtQYaT6Gmx53EdWbsXHQ1k2BCuhj3ly35UkP3O/WU g8llr0MiZszAjZQcdHvdaPZr609hKXKBNkZBNBPJDJcxx8IEWZzzZAdAVTHwbZX7OUM5 fGZH3ebOSZKxl6YRMORLoD4BGtFVcZahSehAQ3rx2pyeAiFuZLH7WvUwuVT27Ey8Z7J0 l0GLlfwN0+zWMF1LUQL0s9wvYglsBSAi0EVx5ReD8bnC+s7yeA/0KhJJQr5si3g+pQNE O/9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bsj0qNf1cqMOve8zTWuJ9drSqXyGdLK4Rj/oCK1m/Vw=; b=MollcXOZ3bxHFWVdSvZyBshtOMUpVHE0PN3CPq/+DaWTNgXqkQwLNu08afIrF5j249 Iz7DzKCPbUWgR5nMTS4MVIIe7u7stfb2Aa4ubs3WDuW8Furl8XMwAjM3lR2N6VikNyo3 uBWg4PDc24c7p8mDyYTojuDfg8mcuiaYB6v3lFkSEI1xWOWqlYnkbkj53z+x9ZJVnxf6 i2DnXEy0P3g1JvsViUsrZw/rC2KfzKnSe0ves4Q4z5S5SXuM26JEBed/CdTd0r3LVBcA D2V4+qOBmsnSJ5lLrRFt57GNJo/Js7LmU/CJmyNIfIUAojWDgHg1lO4dVhNrgN5zKPqm N3cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XgOzj0Ue; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id my12-20020a17090b4c8c00b001bd14e01fa0si18581285pjb.142.2022.04.12.14.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:13:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XgOzj0Ue; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2EE45EAC86; Tue, 12 Apr 2022 13:28:55 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244928AbiDLCk4 (ORCPT + 99 others); Mon, 11 Apr 2022 22:40:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238840AbiDLCks (ORCPT ); Mon, 11 Apr 2022 22:40:48 -0400 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DECA519C35 for ; Mon, 11 Apr 2022 19:38:32 -0700 (PDT) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-d6ca46da48so19401073fac.12 for ; Mon, 11 Apr 2022 19:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bsj0qNf1cqMOve8zTWuJ9drSqXyGdLK4Rj/oCK1m/Vw=; b=XgOzj0UeLzDuVIHBr4rcreeBNCwlWGmgYsjRFbX4BFVJevtNwnkJNh1j0zC+/uCDwS NLH8fVwppFIpzyPYQYlv7EGsEJXDiQAjj02zu/LPpAgv+cUKNLpQpEodJpSR35MQvnOL vG/YOFXZnWse/RhQIM5+xlgkGzRwKjNcvKSLT9cAzUcRBSvGsC8lH1HpRdG0MGFFxMJR 9s5lqMbmfo+jfWpsksadb0qyE20SvBA6TBBRrHksRfdxSeNxgyXe5mJmItVby9ZWDsp2 pabGIvhlsHAnQPG4GXtkiLi6zBmHobjjwQbXwT3TEjkFAHf4vZ8GKJDpLj4IyCOAhbae Ul6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bsj0qNf1cqMOve8zTWuJ9drSqXyGdLK4Rj/oCK1m/Vw=; b=7VSAm6fNTa+nFrXPBjNb7fDuRshCF9FfJXKVdBOSd/sCU7i3eNl/TmWgFI5QSAGeyq QoD2ODihu3ELl6KNcTC+o8EisdrshbhGf2Q5nwBPShFcd/wtkwzZTAFUpMYvG/6qD17d 6H6+eei2uLFmr9iZTvom7GhUAHyxsAnfBcFmpyDdDjpyZLrLL5GBbEgDvDQVx/bZEubB exHagWiT0R+XZCG/gGkoHzAHDmOv4QxL8Q5sQCXmBg8jhHhm/p9w/nYNZ79u4yJml8RK 1gtg92dQj4wUDM0dFJ+oWYrPF5yJUgnMp6sVd4kBiDW1wrdLQfhDlDQ8/XtNCS9B0JiL sHBA== X-Gm-Message-State: AOAM531H5V33w6+PSY34b/6I9qMvG8FsyR6uBGzIZrTDR9p9Xhh5VjRu zYKniU8/IK5B3az+tz6IYoM= X-Received: by 2002:a05:6870:a1a0:b0:dd:e471:8baf with SMTP id a32-20020a056870a1a000b000dde4718bafmr1148349oaf.40.1649731112320; Mon, 11 Apr 2022 19:38:32 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:4c2:8a9b::1002]) by smtp.gmail.com with ESMTPSA id p14-20020a9d744e000000b005b235f5cf92sm12995256otk.65.2022.04.11.19.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 19:38:32 -0700 (PDT) From: Tales Lelo da Aparecida To: Rodrigo Siqueira , Melissa Wen , Haneen Mohammed , Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, andrealmeid@riseup.net Cc: Tales Lelo da Aparecida Subject: [PATCH 1/1] drm/vkms: check plane_composer->map[0] before using it Date: Mon, 11 Apr 2022 20:38:01 -0300 Message-Id: <20220411233801.36297-2-tales.aparecida@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411233801.36297-1-tales.aparecida@gmail.com> References: <20220411233801.36297-1-tales.aparecida@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DATE_IN_PAST_03_06, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix a copypasta error, which resulted in checking repeatedly if the primary_composer->map[0] was null, instead of checking each plane_composer while composing planes. Signed-off-by: Tales Lelo da Aparecida --- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index c6a1036bf2ea..b47ac170108c 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -157,7 +157,7 @@ static void compose_plane(struct vkms_composer *primary_composer, void *vaddr; void (*pixel_blend)(const u8 *p_src, u8 *p_dst); - if (WARN_ON(iosys_map_is_null(&primary_composer->map[0]))) + if (WARN_ON(iosys_map_is_null(&plane_composer->map[0]))) return; vaddr = plane_composer->map[0].vaddr; -- 2.35.1