Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1223199pxx; Tue, 27 Oct 2020 11:06:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUgFoy/x050vb3aysm/k+CdK1TNU/aE/AFToFFS2pxsvUZoGxJieq2QB4r6STypHq7d0AX X-Received: by 2002:a05:6402:1686:: with SMTP id a6mr3471911edv.106.1603822018096; Tue, 27 Oct 2020 11:06:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603822018; cv=none; d=google.com; s=arc-20160816; b=gExcRiQrkyqOU6+gK8+B6JeUdoIb2v98d38Pa1IbYGH+yaq12ER5GROb2O5ce7+EYg 0rD6dnCoU50uwGfp/JQlILBVCREXFc95i+12PLeNKsB/ls5zYnHk4nfjgM+4QN31vcHF XQCLCM2wZSiokM+pVprdo8kH3U30VLdIYfLEIPGAmjcd69cn9gONytJApxR81ofP+rAS xd8nZlRxqj0M09ZlucjC9uZaWZ29Jqe2ZG4oaLey1M1/PuWtKAH58F8scwjCFQ7BHWfo fPJ0y954Sx+XXZQ7hTZVlLWRNjmrTst1EciTNvVw1WZHl9v/5RCHyFSnW8We/psRFPNC W/zQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/MaDdImlsvi+3z7poaRruzIFVrx/+Llihk9x2S124Gw=; b=p8kz7nAyhSnzue1deuh2TZ6i522eL0p7ssdB2HswKMuD8lZOGxQfohrJvxEsPxHRJZ /0IMIZ5AhA35lq8Q9gu3JNGIQts3hW0hdp0TXfDlvoTRBgRDmyvkPQ6zEY1gqaoQMVuB 4FJexx45i/0slMkmeY3Kc6csxtnx95tPBGGG7OQ6pXY1GMfFGwf5DQFD7JLQGP2NqfMJ 6nbhv/iDpf6rfWyFAKPBcudujveaTNtwPtTRFmwhiOu+DhjvDraFKN1Rjamud5xCu4M8 rDM8jNOo2DRhjJAfv9WUKwXhESv/uWuseZHq4WTdzLzFpkSNHc9zGeOIEmb47SROZSVF r14g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EYZGPVgd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ck9si1499307ejb.445.2020.10.27.11.06.33; Tue, 27 Oct 2020 11:06:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EYZGPVgd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760285AbgJ0OeZ (ORCPT + 99 others); Tue, 27 Oct 2020 10:34:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:59942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896682AbgJ0OdA (ORCPT ); Tue, 27 Oct 2020 10:33:00 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 70F9B20773; Tue, 27 Oct 2020 14:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809180; bh=U11Pqb5/KllwWvOKuhjO9gmtVEa+zhlzKUXrp2x5m78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EYZGPVgdipCqO3PyBk8Fl04qwP3nfmTSE5hCSwV5qPrKpTVXCHIX9drmok+uoudHL QiIGN2qA/kLOAOu7kbfPUUjTLUb9fMTwTSjoTKsR7nQGg0pbdCcOSuJoZh+8CBXvz3 MEyGNqMAGTPMKjXBBf5RXQYU2H5M79f2bDHYxJV0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Melissa Wen , Daniel Vetter , Sasha Levin Subject: [PATCH 5.4 104/408] drm/vkms: fix xrgb on compute crc Date: Tue, 27 Oct 2020 14:50:42 +0100 Message-Id: <20201027135459.930470954@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Melissa Wen [ Upstream commit 0986191186128b10b6bbfa5220fc587ed5725e49 ] The previous memset operation was not correctly zeroing the alpha channel to compute the crc, and as a result, the IGT subtest kms_cursor_crc/pipe-A-cursor-alpha-transparent fails. Fixes: db7f419c06d7c ("drm/vkms: Compute CRC with Cursor Plane") Signed-off-by: Melissa Wen Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20200730202524.5upzuh4irboru7my@smtp.gmail.com Signed-off-by: Sasha Levin --- 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 d5585695c64d1..45d6ebbdbdb22 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -33,7 +33,7 @@ static uint32_t compute_crc(void *vaddr_out, struct vkms_composer *composer) + (i * composer->pitch) + (j * composer->cpp); /* XRGB format ignores Alpha channel */ - memset(vaddr_out + src_offset + 24, 0, 8); + bitmap_clear(vaddr_out + src_offset, 24, 8); crc = crc32_le(crc, vaddr_out + src_offset, sizeof(u32)); } -- 2.25.1