From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8917C54E8B for ; Tue, 12 May 2020 11:37:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7BA22075E for ; Tue, 12 May 2020 11:37:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vbge21sb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729527AbgELLha (ORCPT ); Tue, 12 May 2020 07:37:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728085AbgELLh2 (ORCPT ); Tue, 12 May 2020 07:37:28 -0400 Received: from mail-vk1-xa41.google.com (mail-vk1-xa41.google.com [IPv6:2607:f8b0:4864:20::a41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3044C061A0C for ; Tue, 12 May 2020 04:37:26 -0700 (PDT) Received: by mail-vk1-xa41.google.com with SMTP id o8so2139155vkd.12 for ; Tue, 12 May 2020 04:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=j3KKWLl8HkCXQ+MjcPLWxrbD4LKOdKANjNPpG/Ugus0=; b=Vbge21sbZsurEnSDxiksRTO9LZRl3h2o3BB6q1sAGyp/DOuqkK9GiqIwfc1pn2rKaQ +FOZP1b81+/JyMT6ifVCGu6OuMY8LeGnbZMahPjvjNxM8MiDlDifwD608MPe8WxX2RcB tEiqz96bDFDg0Hp/zaEQhF9th2wdMK/Dw15F4sxHzJVApsdZJP8RoHkvv2IJOmd54QWs DF6a8YPJC1TSjX/ZCfJVpcSSvVsW5ZniqxI3vPjuCEuakvdiRcbFRgJALcargyo7JKye E1z4azcfHOLWj19CKF53Dniupqfd0fYW3VRrKj9vEz91uXYLPR3j7bHxv1KYNEHIX8Qk MJCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=j3KKWLl8HkCXQ+MjcPLWxrbD4LKOdKANjNPpG/Ugus0=; b=o1WRLpkTYFRRIQ5UEj+yj4yinPYoeEVHYS1u7AG6y+vmZ+PL1J5Bjy/sxxb0ATQHrZ +BDyX5rAyyoKxw+JfvYENieek54CPZZBJUhurk/qqv4O/W7GrcJqYy21J+rTh3925qyS sPt0PucqRSMroko+OixIqQkec+wc1LGKj3J9g2rRBXSOMq8johLre09YlEKfrz63FeOO WFEJ3vFQABG7QvVdOTfQadK9VWJewPbbaw/f4kLzPAIkpVnCdG3ucuQ+XSFVwM2QHToS uE+1GDDT4qYTfUDnXMjEPpjzW5iW0otm/M6Yu1UdYx7RLcLgGrrKS9nICeI5caSH3iW1 Xzdg== X-Gm-Message-State: AGi0PuYf34vSbZBON8BAgwx/nwhbEXQgnep0mc50jWvuyJbAif/kppga m3LPO0YoE/hUI/LmKp9UxWIetwrUe+Vd4CzoxCY= X-Google-Smtp-Source: APiQypIQM2/qGTsyEbGNVjZeO6kaUSKCSi0gcRXR6wsSfcpJVHlkk5f8mQh/QXyXnkH5Y0GCjhYJfKkFAWpoM6ISnAE= X-Received: by 2002:a1f:2f91:: with SMTP id v139mr15017877vkv.22.1589283445902; Tue, 12 May 2020 04:37:25 -0700 (PDT) MIME-Version: 1.0 References: <20200511115524.22602-1-Rodrigo.Siqueira@amd.com> <20200511115524.22602-3-Rodrigo.Siqueira@amd.com> In-Reply-To: <20200511115524.22602-3-Rodrigo.Siqueira@amd.com> From: Emil Velikov Date: Tue, 12 May 2020 12:34:47 +0100 Message-ID: Subject: Re: [PATCH V4 2/3] drm/vkms: Compute CRC without change input data To: Rodrigo Siqueira Cc: Brian Starkey , Liviu Dudau , Daniel Vetter , Simon Ser , Leandro Ribeiro , Helen Koike , Rodrigo Siqueira , "Linux-Kernel@Vger. Kernel. Org" , ML dri-devel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rodrigo, On Mon, 11 May 2020 at 12:55, Rodrigo Siqueira wrote: > > From: Rodrigo Siqueira > > The compute_crc() function is responsible for calculating the > framebuffer CRC value; due to the XRGB format, this function has to > ignore the alpha channel during the CRC computation. Therefore, > compute_crc() set zero to the alpha channel directly in the input > framebuffer, which is not a problem since this function receives a copy > of the original buffer. However, if we want to use this function in a > context without a buffer copy, it will change the initial value. This > patch makes compute_crc() calculate the CRC value without modifying the > input framebuffer. > > Signed-off-by: Rodrigo Siqueira > --- > drivers/gpu/drm/vkms/vkms_composer.c | 31 +++++++++++++++++----------- > 1 file changed, 19 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > index 258e659ecfba..686d25e7b01d 100644 > --- a/drivers/gpu/drm/vkms/vkms_composer.c > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > @@ -9,33 +9,40 @@ > > #include "vkms_drv.h" > > +static u32 get_pixel_from_buffer(int x, int y, const u8 *buffer, > + const struct vkms_composer *composer) > +{ > + int src_offset = composer->offset + (y * composer->pitch) > + + (x * composer->cpp); > + > + return *(u32 *)&buffer[src_offset]; > +} > + > /** > * compute_crc - Compute CRC value on output frame > * > - * @vaddr_out: address to final framebuffer > + * @vaddr: address to final framebuffer > * @composer: framebuffer's metadata > * > * returns CRC value computed using crc32 on the visible portion of > * the final framebuffer at vaddr_out > */ > -static uint32_t compute_crc(void *vaddr_out, struct vkms_composer *composer) > +static uint32_t compute_crc(const u8 *vaddr, > + const struct vkms_composer *composer) > { > - int i, j, src_offset; > + int x, y; > int x_src = composer->src.x1 >> 16; > int y_src = composer->src.y1 >> 16; > int h_src = drm_rect_height(&composer->src) >> 16; > int w_src = drm_rect_width(&composer->src) >> 16; > - u32 crc = 0; > + u32 crc = 0, pixel = 0; > > - for (i = y_src; i < y_src + h_src; ++i) { > - for (j = x_src; j < x_src + w_src; ++j) { > - src_offset = composer->offset > - + (i * composer->pitch) > - + (j * composer->cpp); > + for (y = y_src; y < y_src + h_src; ++y) { > + for (x = x_src; x < x_src + w_src; ++x) { > /* XRGB format ignores Alpha channel */ > - memset(vaddr_out + src_offset + 24, 0, 8); > - crc = crc32_le(crc, vaddr_out + src_offset, > - sizeof(u32)); > + pixel = get_pixel_from_buffer(x, y, vaddr, composer); > + bitmap_clear((void *)&pixel, 0, 8); > + crc = crc32_le(crc, (void *)&pixel, sizeof(u32)); > } > } > IMHO using something like the following makes the code far simpler and clearer. offset = composer->offset + (y_src * composer->pitch) + (x_src * composer->cpp); for (i = 0; i < h_src; i++, offset += composer->pitch) { for (j = 0; j < w_src; j++, offset += composer->cpp) { pixel = get_pixel_from_buffer(vaddr, offset); crc = crc32_le(crc, &pixel, sizeof(u32); // cast should not be needed } } With the bitmap_clear() and related comment moved into get_pixel_from_buffer(). -Emil From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BAFBC54E4A for ; Tue, 12 May 2020 11:37:28 +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 5C92020722 for ; Tue, 12 May 2020 11:37:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vbge21sb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C92020722 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 AF2636E8BE; Tue, 12 May 2020 11:37:27 +0000 (UTC) Received: from mail-vk1-xa44.google.com (mail-vk1-xa44.google.com [IPv6:2607:f8b0:4864:20::a44]) by gabe.freedesktop.org (Postfix) with ESMTPS id D46FF6E8BE for ; Tue, 12 May 2020 11:37:26 +0000 (UTC) Received: by mail-vk1-xa44.google.com with SMTP id w188so3220706vkf.0 for ; Tue, 12 May 2020 04:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=j3KKWLl8HkCXQ+MjcPLWxrbD4LKOdKANjNPpG/Ugus0=; b=Vbge21sbZsurEnSDxiksRTO9LZRl3h2o3BB6q1sAGyp/DOuqkK9GiqIwfc1pn2rKaQ +FOZP1b81+/JyMT6ifVCGu6OuMY8LeGnbZMahPjvjNxM8MiDlDifwD608MPe8WxX2RcB tEiqz96bDFDg0Hp/zaEQhF9th2wdMK/Dw15F4sxHzJVApsdZJP8RoHkvv2IJOmd54QWs DF6a8YPJC1TSjX/ZCfJVpcSSvVsW5ZniqxI3vPjuCEuakvdiRcbFRgJALcargyo7JKye E1z4azcfHOLWj19CKF53Dniupqfd0fYW3VRrKj9vEz91uXYLPR3j7bHxv1KYNEHIX8Qk MJCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=j3KKWLl8HkCXQ+MjcPLWxrbD4LKOdKANjNPpG/Ugus0=; b=T9bvuaJc88Vlfq62OQwg9Bd3nyczRc98N8WfgKVVeamlx7NeVMIA6bIrNc7PSk/C9W x8x7RTWfv7tBdAdlWfozIBLxYjZIggKLXkAzRfSBvvMS59AjgqMQZ67GuMPr+qLRcnWq cgjtE9ikpMQyW/VBaTUsqux5VrftMG/keQQsBIOOYgI1slR2KfKEfStczdagA601fzPk h8+JM9eIcq5FgYve7HPe+ZKa1j6tfzuHW7s0UpbeCVDI5i+fAEGHLtykz4WLLwVYczCT Hq1T4qyTIrDYF1U6YGFkshkJv3rgIcMOHVYW5DhHbKdArekUUyJPvUWD1CpcOlMzUHOW uIoQ== X-Gm-Message-State: AGi0PuYPIykfMGERA4H9JIkl9AlOMfzyYs8Gu+4LMUE2wq8LjfX1vEPS etXS0Fibyw28ZZ1T8pctYQn4Yg93BXcn2lNjtms= X-Google-Smtp-Source: APiQypIQM2/qGTsyEbGNVjZeO6kaUSKCSi0gcRXR6wsSfcpJVHlkk5f8mQh/QXyXnkH5Y0GCjhYJfKkFAWpoM6ISnAE= X-Received: by 2002:a1f:2f91:: with SMTP id v139mr15017877vkv.22.1589283445902; Tue, 12 May 2020 04:37:25 -0700 (PDT) MIME-Version: 1.0 References: <20200511115524.22602-1-Rodrigo.Siqueira@amd.com> <20200511115524.22602-3-Rodrigo.Siqueira@amd.com> In-Reply-To: <20200511115524.22602-3-Rodrigo.Siqueira@amd.com> From: Emil Velikov Date: Tue, 12 May 2020 12:34:47 +0100 Message-ID: Subject: Re: [PATCH V4 2/3] drm/vkms: Compute CRC without change input data To: Rodrigo Siqueira 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: Rodrigo Siqueira , Liviu Dudau , "Linux-Kernel@Vger. Kernel. Org" , Leandro Ribeiro , Helen Koike , ML dri-devel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Rodrigo, On Mon, 11 May 2020 at 12:55, Rodrigo Siqueira wrote: > > From: Rodrigo Siqueira > > The compute_crc() function is responsible for calculating the > framebuffer CRC value; due to the XRGB format, this function has to > ignore the alpha channel during the CRC computation. Therefore, > compute_crc() set zero to the alpha channel directly in the input > framebuffer, which is not a problem since this function receives a copy > of the original buffer. However, if we want to use this function in a > context without a buffer copy, it will change the initial value. This > patch makes compute_crc() calculate the CRC value without modifying the > input framebuffer. > > Signed-off-by: Rodrigo Siqueira > --- > drivers/gpu/drm/vkms/vkms_composer.c | 31 +++++++++++++++++----------- > 1 file changed, 19 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > index 258e659ecfba..686d25e7b01d 100644 > --- a/drivers/gpu/drm/vkms/vkms_composer.c > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > @@ -9,33 +9,40 @@ > > #include "vkms_drv.h" > > +static u32 get_pixel_from_buffer(int x, int y, const u8 *buffer, > + const struct vkms_composer *composer) > +{ > + int src_offset = composer->offset + (y * composer->pitch) > + + (x * composer->cpp); > + > + return *(u32 *)&buffer[src_offset]; > +} > + > /** > * compute_crc - Compute CRC value on output frame > * > - * @vaddr_out: address to final framebuffer > + * @vaddr: address to final framebuffer > * @composer: framebuffer's metadata > * > * returns CRC value computed using crc32 on the visible portion of > * the final framebuffer at vaddr_out > */ > -static uint32_t compute_crc(void *vaddr_out, struct vkms_composer *composer) > +static uint32_t compute_crc(const u8 *vaddr, > + const struct vkms_composer *composer) > { > - int i, j, src_offset; > + int x, y; > int x_src = composer->src.x1 >> 16; > int y_src = composer->src.y1 >> 16; > int h_src = drm_rect_height(&composer->src) >> 16; > int w_src = drm_rect_width(&composer->src) >> 16; > - u32 crc = 0; > + u32 crc = 0, pixel = 0; > > - for (i = y_src; i < y_src + h_src; ++i) { > - for (j = x_src; j < x_src + w_src; ++j) { > - src_offset = composer->offset > - + (i * composer->pitch) > - + (j * composer->cpp); > + for (y = y_src; y < y_src + h_src; ++y) { > + for (x = x_src; x < x_src + w_src; ++x) { > /* XRGB format ignores Alpha channel */ > - memset(vaddr_out + src_offset + 24, 0, 8); > - crc = crc32_le(crc, vaddr_out + src_offset, > - sizeof(u32)); > + pixel = get_pixel_from_buffer(x, y, vaddr, composer); > + bitmap_clear((void *)&pixel, 0, 8); > + crc = crc32_le(crc, (void *)&pixel, sizeof(u32)); > } > } > IMHO using something like the following makes the code far simpler and clearer. offset = composer->offset + (y_src * composer->pitch) + (x_src * composer->cpp); for (i = 0; i < h_src; i++, offset += composer->pitch) { for (j = 0; j < w_src; j++, offset += composer->cpp) { pixel = get_pixel_from_buffer(vaddr, offset); crc = crc32_le(crc, &pixel, sizeof(u32); // cast should not be needed } } With the bitmap_clear() and related comment moved into get_pixel_from_buffer(). -Emil _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel