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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 7E721C433DF for ; Fri, 19 Jun 2020 07:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 506F120809 for ; Fri, 19 Jun 2020 07:02:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729867AbgFSHCc (ORCPT ); Fri, 19 Jun 2020 03:02:32 -0400 Received: from gloria.sntech.de ([185.11.138.130]:59348 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727916AbgFSHCc (ORCPT ); Fri, 19 Jun 2020 03:02:32 -0400 Received: from p5b127c2f.dip0.t-ipconnect.de ([91.18.124.47] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jmB2d-00087c-5B; Fri, 19 Jun 2020 09:02:23 +0200 From: Heiko Stuebner To: Sandy Huang Cc: David Airlie , Daniel Vetter , andy.yan@rock-chips.com, huangtao@rock-chips.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/rockchip: vop: fix vop full rgb24 r/b color error Date: Fri, 19 Jun 2020 09:02:22 +0200 Message-ID: <2786595.VspqIdsi2r@phil> In-Reply-To: <20200619021251.22991-1-hjc@rock-chips.com> References: <20200619021251.22991-1-hjc@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sandy, Am Freitag, 19. Juni 2020, 04:12:51 CEST schrieb Sandy Huang: > RGB888 format msb is red component and the lsb is blue component, > at vop full platform this is swapped, and this is different from vop > lite and vop next, so add this patch to fix it. just me struggling with color formats ... and wondering why this never came up so far - with Version 3 being all major SoCs of the last years. So I guess the reason that nobody noticed so far is, that most things will use ARGB888 instead of RGB888? One implementation nit below as well. > Signed-off-by: Sandy Huang > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index c80f7d9fd13f..1c17048ad737 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -132,6 +132,7 @@ struct vop_win { > > struct rockchip_rgb; > struct vop { > + uint32_t version; > struct drm_crtc crtc; > struct device *dev; > struct drm_device *drm_dev; > @@ -989,6 +990,12 @@ static void vop_plane_atomic_update(struct drm_plane *plane, > VOP_WIN_SET(vop, win, dsp_st, dsp_st); > > rb_swap = has_rb_swapped(fb->format->format); > + /* > + * VOP full need to do rb swap to show rgb888/bgr888 format color correctly > + */ one-line-comment? /* VOP-full needs rb_swap for correctly showing rgb888/bgr888 */ > + if ((fb->format->format == DRM_FORMAT_RGB888 || fb->format->format == DRM_FORMAT_BGR888) && > + VOP_MAJOR(vop->version) == 3) > + rb_swap = !rb_swap; can we move this into the existing has_rb_swapped() function? Like doing rb_swap = has_rb_swapped(vop, fb->format->format) and adding your conditional to the end there? Thanks Heiko > VOP_WIN_SET(vop, win, rb_swap, rb_swap); > > /* > @@ -2091,6 +2098,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data) > vop->dev = dev; > vop->data = vop_data; > vop->drm_dev = drm_dev; > + vop->version = vop_data->version; > dev_set_drvdata(dev, vop); > > vop_win_init(vop); >