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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F394EC19F21 for ; Thu, 4 Aug 2022 20:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232290AbiHDUQg (ORCPT ); Thu, 4 Aug 2022 16:16:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234479AbiHDUQe (ORCPT ); Thu, 4 Aug 2022 16:16:34 -0400 Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54E33B1F1 for ; Thu, 4 Aug 2022 13:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=LVncPQXIZVvjSfd4GM0AAxotgY9J9oMnM/NO6XDb2GY=; b=H696l484/nQn59x89uR1DGFRId9zm1G9ToGQvVlcWBJbPRVoDYOudr9b+3OEoq9tUXVfnoaSKc8Ie vIinjs9ySCuJobittjlf9lTHuRGN8qnKIn1nTmkus7RhhYnUEmBBZ30RcDYOC9xEEkV2Zk2RXRll11 oc43PH1BA4JvP8hLb+HyI8VrdZbBIIaI1ZS8bDtQaext+h2e7vF1PrDEQqPgEFiEcrj83oB29RENFt uJTyMNwMfsnSwgUdS/MuBYpHTQBPb3JTPjwKYrCBNxkpOLZbJjbCVDwD8O4901pHMsbrt2PmCrlpow S227EK0+/WGADAz6+3FWn6qpEWBhc/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=LVncPQXIZVvjSfd4GM0AAxotgY9J9oMnM/NO6XDb2GY=; b=/1067wmZlwYm2a+CpkHk59xt5O93iYIO4qG9XslvEGMlf8a4jGjr51FzUKQsuCW7T9VOM1onWK2YL F4AP1XjDQ== X-HalOne-Cookie: b1085953002d688f6251e9593a9590aff04e2dbf X-HalOne-ID: 533de0be-1432-11ed-a91b-d0431ea8a290 Received: from mailproxy1.cst.dirpod4-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id 533de0be-1432-11ed-a91b-d0431ea8a290; Thu, 04 Aug 2022 20:16:29 +0000 (UTC) Date: Thu, 4 Aug 2022 22:16:28 +0200 From: Sam Ravnborg To: Thomas Zimmermann Cc: noralf@tronnes.org, daniel@ffwll.ch, airlied@linux.ie, mripard@kernel.org, maarten.lankhorst@linux.intel.com, airlied@redhat.com, javierm@redhat.com, drawat.floss@gmail.com, kraxel@redhat.com, david@lechnology.com, jose.exposito89@gmail.com, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH 08/12] drm/format-helper: Rework RGB888-to-XRGB8888 conversion Message-ID: References: <20220727113312.22407-1-tzimmermann@suse.de> <20220727113312.22407-9-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220727113312.22407-9-tzimmermann@suse.de> Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org On Wed, Jul 27, 2022 at 01:33:08PM +0200, Thomas Zimmermann wrote: > Update RGB888-to-XRGB8888 conversion to support struct iosys_map > and convert all users. Although these are single-plane color formats, > the new interface supports multi-plane formats for consistency with > drm_fb_blit(). > > Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg > --- > drivers/gpu/drm/drm_format_helper.c | 25 ++++++++++++++++++------- > 1 file changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c > index 5ef06f696657..155827eebe99 100644 > --- a/drivers/gpu/drm/drm_format_helper.c > +++ b/drivers/gpu/drm/drm_format_helper.c > @@ -465,12 +465,24 @@ static void drm_fb_rgb888_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne > } > } > > -static void drm_fb_rgb888_to_xrgb8888_toio(void __iomem *dst, unsigned int dst_pitch, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip) > +static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch, > + const struct iosys_map *vmap, > + const struct drm_framebuffer *fb, > + const struct drm_rect *clip) > { > - drm_fb_xfrm_toio(dst, dst_pitch, 4, vaddr, fb, clip, false, > - drm_fb_rgb888_to_xrgb8888_line); > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > + 0, 0, 0, 0 > + }; > + > + if (!dst_pitch) > + dst_pitch = default_dst_pitch; > + > + if (dst[0].is_iomem) > + drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], 4, vmap[0].vaddr, fb, > + clip, false, drm_fb_rgb888_to_xrgb8888_line); > + else > + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 4, vmap[0].vaddr, fb, > + clip, false, drm_fb_rgb888_to_xrgb8888_line); > } > > static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, unsigned int pixels) > @@ -608,8 +620,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d > } > } else if (dst_format == DRM_FORMAT_XRGB8888) { > if (fb_format == DRM_FORMAT_RGB888) { > - drm_fb_rgb888_to_xrgb8888_toio(dst[0].vaddr_iomem, dst_pitch[0], > - vmap[0].vaddr, fb, clip); > + drm_fb_rgb888_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); > return 0; > } else if (fb_format == DRM_FORMAT_RGB565) { > drm_fb_rgb565_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); > -- > 2.37.1 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 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0836AC25B06 for ; Thu, 4 Aug 2022 20:16:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8A9EA41CFB; Thu, 4 Aug 2022 20:16:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8A9EA41CFB Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=ravnborg.org header.i=@ravnborg.org header.a=rsa-sha256 header.s=rsa1 header.b=H696l484; dkim=fail reason="signature verification failed" header.d=ravnborg.org header.i=@ravnborg.org header.a=ed25519-sha256 header.s=ed1 header.b=/1067wmZ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ll7mmtOs6EM8; Thu, 4 Aug 2022 20:16:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 68FA141CF3; Thu, 4 Aug 2022 20:16:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 68FA141CF3 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3D695C0033; Thu, 4 Aug 2022 20:16:35 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id B3A1AC002D for ; Thu, 4 Aug 2022 20:16:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7394840147 for ; Thu, 4 Aug 2022 20:16:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 7394840147 Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=ravnborg.org header.i=@ravnborg.org header.a=rsa-sha256 header.s=rsa1 header.b=H696l484; dkim=pass header.d=ravnborg.org header.i=@ravnborg.org header.a=ed25519-sha256 header.s=ed1 header.b=/1067wmZ X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lcrTwTGRjImG for ; Thu, 4 Aug 2022 20:16:32 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 84B494013D Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by smtp2.osuosl.org (Postfix) with ESMTPS id 84B494013D for ; Thu, 4 Aug 2022 20:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=LVncPQXIZVvjSfd4GM0AAxotgY9J9oMnM/NO6XDb2GY=; b=H696l484/nQn59x89uR1DGFRId9zm1G9ToGQvVlcWBJbPRVoDYOudr9b+3OEoq9tUXVfnoaSKc8Ie vIinjs9ySCuJobittjlf9lTHuRGN8qnKIn1nTmkus7RhhYnUEmBBZ30RcDYOC9xEEkV2Zk2RXRll11 oc43PH1BA4JvP8hLb+HyI8VrdZbBIIaI1ZS8bDtQaext+h2e7vF1PrDEQqPgEFiEcrj83oB29RENFt uJTyMNwMfsnSwgUdS/MuBYpHTQBPb3JTPjwKYrCBNxkpOLZbJjbCVDwD8O4901pHMsbrt2PmCrlpow S227EK0+/WGADAz6+3FWn6qpEWBhc/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=LVncPQXIZVvjSfd4GM0AAxotgY9J9oMnM/NO6XDb2GY=; b=/1067wmZlwYm2a+CpkHk59xt5O93iYIO4qG9XslvEGMlf8a4jGjr51FzUKQsuCW7T9VOM1onWK2YL F4AP1XjDQ== X-HalOne-Cookie: b1085953002d688f6251e9593a9590aff04e2dbf X-HalOne-ID: 533de0be-1432-11ed-a91b-d0431ea8a290 Received: from mailproxy1.cst.dirpod4-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id 533de0be-1432-11ed-a91b-d0431ea8a290; Thu, 04 Aug 2022 20:16:29 +0000 (UTC) Date: Thu, 4 Aug 2022 22:16:28 +0200 From: Sam Ravnborg To: Thomas Zimmermann Subject: Re: [PATCH 08/12] drm/format-helper: Rework RGB888-to-XRGB8888 conversion Message-ID: References: <20220727113312.22407-1-tzimmermann@suse.de> <20220727113312.22407-9-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220727113312.22407-9-tzimmermann@suse.de> Cc: linux-hyperv@vger.kernel.org, david@lechnology.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, maarten.lankhorst@linux.intel.com, javierm@redhat.com, mripard@kernel.org, virtualization@lists.linux-foundation.org, drawat.floss@gmail.com, noralf@tronnes.org, daniel@ffwll.ch, jose.exposito89@gmail.com, airlied@redhat.com X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Wed, Jul 27, 2022 at 01:33:08PM +0200, Thomas Zimmermann wrote: > Update RGB888-to-XRGB8888 conversion to support struct iosys_map > and convert all users. Although these are single-plane color formats, > the new interface supports multi-plane formats for consistency with > drm_fb_blit(). > > Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg > --- > drivers/gpu/drm/drm_format_helper.c | 25 ++++++++++++++++++------- > 1 file changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c > index 5ef06f696657..155827eebe99 100644 > --- a/drivers/gpu/drm/drm_format_helper.c > +++ b/drivers/gpu/drm/drm_format_helper.c > @@ -465,12 +465,24 @@ static void drm_fb_rgb888_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne > } > } > > -static void drm_fb_rgb888_to_xrgb8888_toio(void __iomem *dst, unsigned int dst_pitch, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip) > +static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch, > + const struct iosys_map *vmap, > + const struct drm_framebuffer *fb, > + const struct drm_rect *clip) > { > - drm_fb_xfrm_toio(dst, dst_pitch, 4, vaddr, fb, clip, false, > - drm_fb_rgb888_to_xrgb8888_line); > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > + 0, 0, 0, 0 > + }; > + > + if (!dst_pitch) > + dst_pitch = default_dst_pitch; > + > + if (dst[0].is_iomem) > + drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], 4, vmap[0].vaddr, fb, > + clip, false, drm_fb_rgb888_to_xrgb8888_line); > + else > + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 4, vmap[0].vaddr, fb, > + clip, false, drm_fb_rgb888_to_xrgb8888_line); > } > > static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, unsigned int pixels) > @@ -608,8 +620,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d > } > } else if (dst_format == DRM_FORMAT_XRGB8888) { > if (fb_format == DRM_FORMAT_RGB888) { > - drm_fb_rgb888_to_xrgb8888_toio(dst[0].vaddr_iomem, dst_pitch[0], > - vmap[0].vaddr, fb, clip); > + drm_fb_rgb888_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); > return 0; > } else if (fb_format == DRM_FORMAT_RGB565) { > drm_fb_rgb565_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); > -- > 2.37.1 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 55560C19F21 for ; Thu, 4 Aug 2022 20:16:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D9C612B874; Thu, 4 Aug 2022 20:16:42 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id F276512B57A for ; Thu, 4 Aug 2022 20:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=LVncPQXIZVvjSfd4GM0AAxotgY9J9oMnM/NO6XDb2GY=; b=H696l484/nQn59x89uR1DGFRId9zm1G9ToGQvVlcWBJbPRVoDYOudr9b+3OEoq9tUXVfnoaSKc8Ie vIinjs9ySCuJobittjlf9lTHuRGN8qnKIn1nTmkus7RhhYnUEmBBZ30RcDYOC9xEEkV2Zk2RXRll11 oc43PH1BA4JvP8hLb+HyI8VrdZbBIIaI1ZS8bDtQaext+h2e7vF1PrDEQqPgEFiEcrj83oB29RENFt uJTyMNwMfsnSwgUdS/MuBYpHTQBPb3JTPjwKYrCBNxkpOLZbJjbCVDwD8O4901pHMsbrt2PmCrlpow S227EK0+/WGADAz6+3FWn6qpEWBhc/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=LVncPQXIZVvjSfd4GM0AAxotgY9J9oMnM/NO6XDb2GY=; b=/1067wmZlwYm2a+CpkHk59xt5O93iYIO4qG9XslvEGMlf8a4jGjr51FzUKQsuCW7T9VOM1onWK2YL F4AP1XjDQ== X-HalOne-Cookie: b1085953002d688f6251e9593a9590aff04e2dbf X-HalOne-ID: 533de0be-1432-11ed-a91b-d0431ea8a290 Received: from mailproxy1.cst.dirpod4-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id 533de0be-1432-11ed-a91b-d0431ea8a290; Thu, 04 Aug 2022 20:16:29 +0000 (UTC) Date: Thu, 4 Aug 2022 22:16:28 +0200 From: Sam Ravnborg To: Thomas Zimmermann Subject: Re: [PATCH 08/12] drm/format-helper: Rework RGB888-to-XRGB8888 conversion Message-ID: References: <20220727113312.22407-1-tzimmermann@suse.de> <20220727113312.22407-9-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220727113312.22407-9-tzimmermann@suse.de> 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: linux-hyperv@vger.kernel.org, david@lechnology.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, javierm@redhat.com, virtualization@lists.linux-foundation.org, drawat.floss@gmail.com, noralf@tronnes.org, kraxel@redhat.com, jose.exposito89@gmail.com, airlied@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jul 27, 2022 at 01:33:08PM +0200, Thomas Zimmermann wrote: > Update RGB888-to-XRGB8888 conversion to support struct iosys_map > and convert all users. Although these are single-plane color formats, > the new interface supports multi-plane formats for consistency with > drm_fb_blit(). > > Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg > --- > drivers/gpu/drm/drm_format_helper.c | 25 ++++++++++++++++++------- > 1 file changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c > index 5ef06f696657..155827eebe99 100644 > --- a/drivers/gpu/drm/drm_format_helper.c > +++ b/drivers/gpu/drm/drm_format_helper.c > @@ -465,12 +465,24 @@ static void drm_fb_rgb888_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne > } > } > > -static void drm_fb_rgb888_to_xrgb8888_toio(void __iomem *dst, unsigned int dst_pitch, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip) > +static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch, > + const struct iosys_map *vmap, > + const struct drm_framebuffer *fb, > + const struct drm_rect *clip) > { > - drm_fb_xfrm_toio(dst, dst_pitch, 4, vaddr, fb, clip, false, > - drm_fb_rgb888_to_xrgb8888_line); > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > + 0, 0, 0, 0 > + }; > + > + if (!dst_pitch) > + dst_pitch = default_dst_pitch; > + > + if (dst[0].is_iomem) > + drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], 4, vmap[0].vaddr, fb, > + clip, false, drm_fb_rgb888_to_xrgb8888_line); > + else > + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 4, vmap[0].vaddr, fb, > + clip, false, drm_fb_rgb888_to_xrgb8888_line); > } > > static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, unsigned int pixels) > @@ -608,8 +620,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d > } > } else if (dst_format == DRM_FORMAT_XRGB8888) { > if (fb_format == DRM_FORMAT_RGB888) { > - drm_fb_rgb888_to_xrgb8888_toio(dst[0].vaddr_iomem, dst_pitch[0], > - vmap[0].vaddr, fb, clip); > + drm_fb_rgb888_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); > return 0; > } else if (fb_format == DRM_FORMAT_RGB565) { > drm_fb_rgb565_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); > -- > 2.37.1