Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp5590085rwb; Wed, 21 Sep 2022 09:42:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM76gag9kHfWTcd+ilOAcwgHSv1Ox+xeKthfatuQZLtgex4rBnnblbQYLCMcSgpDnvTtoeNl X-Received: by 2002:a17:906:794f:b0:781:dbee:4256 with SMTP id l15-20020a170906794f00b00781dbee4256mr6140426ejo.404.1663778542189; Wed, 21 Sep 2022 09:42:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663778542; cv=none; d=google.com; s=arc-20160816; b=LglyMzdD8oFe2hJ1y6i/N7Mmmq3QWapA/3uZf1psmpsWpzZMAMAJcdanhXn4VyoHxl HyEGNn4Kx7MnvyBpOyqpX/NxOQ3I79z74ODSk/VOGeXOHZwwItbT4cZls9zbUp62//jw y24C37ZIrQ4QV6MreBudpd4DanYy3EKpMWbITUClkiEdzmcHS36nn8VhuxEOge9Xd5Gr AELcigk6h3Q52/aJpnogd8IsCjMznrh2JXGGps9+1RK9VsAQJi7TyDuDXVLvxFtUHM8C NdGaLmIvDoMvmFxXG7VW/8wykcUje/CycJPJwLYfm+DcQ91B8kZ1ucCqG3K+0r3LVHHg hpaA== 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=3qJPfY9xJ0wzBTBLy2LpWReJ8gMT4Cu5Njc5H+R1sIU=; b=MCvSe+lZdy9dDF2mT4NZ5KS2tJKUplPeU6qKwa2IkmA6gdEOpB/B8KNWadd+A2naL1 lWwKc+ZsXXnMqhxMWro9T81IlTXgUcwodBWOwvf01K6aTpj7Cnx9TcvYlY2AxubjOajV vPwxC6PByp1z8Oo2XvAmOmAaVO9anZaZjeiNXGoRCtVYsyoRePkMb8Zdn+ccNLyDnQfV 8CI2zYiyJjjaXgDNx+svfl58jb7ZFcG+HaTIdrRaiWrXqdyW2siW/3/Pab8tAb4uiJ5J DwHVjUSkIWO2JCnPyhy7oSqBVxpVrEJuGCchPy/ipKW6d9n35Au0ykPzEVukjDIcwvmv XHsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WpdDu2Fk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m22-20020a056402431600b00454bae0cee0si3019981edc.406.2022.09.21.09.41.55; Wed, 21 Sep 2022 09:42:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WpdDu2Fk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231668AbiIUPva (ORCPT + 99 others); Wed, 21 Sep 2022 11:51:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231370AbiIUPuv (ORCPT ); Wed, 21 Sep 2022 11:50:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FE219AFF8; Wed, 21 Sep 2022 08:48:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BEC7963141; Wed, 21 Sep 2022 15:48:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFC1DC433D6; Wed, 21 Sep 2022 15:48:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663775315; bh=6Cceott/YXODbjHwpzVuoUWmAECTmhrg0aAWRMZUg3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WpdDu2FkY+cl2Ac+iWOE3hXjI/RpKDhfll32Vl/zmz3ggFXPReXxOm4N6Y2xxYGIM /T8r4NgzHSyseNMxd8wZhGK4hxMtN+XQZWzVwJ/fvDIjhoEZdycIx2EH7kg1XK0Er4 dBa7sUurb0DhVKOUtk9DlFMO7NL9N7G9GUmaypSA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stuart Menefy , Neil Armstrong , Sasha Levin Subject: [PATCH 5.15 12/45] drm/meson: Correct OSD1 global alpha value Date: Wed, 21 Sep 2022 17:46:02 +0200 Message-Id: <20220921153647.294852095@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220921153646.931277075@linuxfoundation.org> References: <20220921153646.931277075@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 From: Stuart Menefy [ Upstream commit 6836829c8ea453c9e3e518e61539e35881c8ed5f ] VIU_OSD1_CTRL_STAT.GLOBAL_ALPHA is a 9 bit field, so the maximum value is 0x100 not 0xff. This matches the vendor kernel. Signed-off-by: Stuart Menefy Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Reviewed-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20220908155103.686904-1-stuart.menefy@mathembedded.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/meson/meson_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c index 8640a8a8a469..44aa52629443 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -168,7 +168,7 @@ static void meson_plane_atomic_update(struct drm_plane *plane, /* Enable OSD and BLK0, set max global alpha */ priv->viu.osd1_ctrl_stat = OSD_ENABLE | - (0xFF << OSD_GLOBAL_ALPHA_SHIFT) | + (0x100 << OSD_GLOBAL_ALPHA_SHIFT) | OSD_BLK0_ENABLE; priv->viu.osd1_ctrl_stat2 = readl(priv->io_base + -- 2.35.1