Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp832101rwb; Mon, 26 Sep 2022 06:28:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yJcVXKyh1BV53ePS8Ulw/NwZ4MzNJSQE01it+4mUYHlzYNbpGb+isD/t6knbjXCV2TgwZ X-Received: by 2002:a17:907:c1c:b0:782:9d80:8bbf with SMTP id ga28-20020a1709070c1c00b007829d808bbfmr14064710ejc.203.1664198910757; Mon, 26 Sep 2022 06:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664198910; cv=none; d=google.com; s=arc-20160816; b=rbcEjI7JA9fKQrEVZGawnUhatS1nQDHZhjRdEEB977l1mWsIaKdI4JOV3dWK+LERXr KNkhnPRtspOoACrfFdJAZLgCAL90nc6vs9d9Ev2M8oylwfUI2JqqjpiLB1xy5jv2t4Y9 O0eBwMTZRFLQOPJh9LT8b5clC4vH//ljHz11oAef/ZyXvNOTg1WzLt5pzFSUTJWoZBky 5X/VGfHjKIINtkcEGcocPNukRYjge70I+aanNCmeNoqQ9fVWmlMO5wF2j0+UlFK78BwL NG/nrrDbMheWmyFF5Xu26Lh4zz1IcjLtwGpAlgC/8o3Y1tV8mXDd/tSMFYZeYiEU44ru tp8w== 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=dCQbej/plhuq0NOEMA2CIf8KbHS2ZZDnlabha/ectLQ=; b=WoaSjtiJNB3CrwglMsHQttNvJkoyTkAge8ALONQOAT3uC2Uhjofl+11pSPGIEBLRbj 64Ey6Out9ENgCwdcnsCnVgZLAhv9jjGNZqdajAW6im9k5x4cioU8b3ylYZQGOdMYe8PY uxgJNjt/KEhgaTxI9PH520GqWqIQvJVeKSDidOO7VwINW0A260rhBJwXMVZbeuj3s0Lz Z/zuh6gL0+qkL70StP7TdHD1XeTSe5Gr7dOhoBWcad5uFLahSN48BIEHjnqEzFzUqGme 8wlfxFkDTiKFPvBtFMBzIY9VnZJf5efHKCGuQoIKt18ZE3P3KILrSPMWkHHKh3wwxT9K KvLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zUMPkf5y; 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 qf42-20020a1709077f2a00b0073d78bbd49csi11976602ejc.666.2022.09.26.06.28.04; Mon, 26 Sep 2022 06:28:30 -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=zUMPkf5y; 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 S235485AbiIZK1O (ORCPT + 99 others); Mon, 26 Sep 2022 06:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235612AbiIZKYY (ORCPT ); Mon, 26 Sep 2022 06:24:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E0AF167E7; Mon, 26 Sep 2022 03:17:51 -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 ams.source.kernel.org (Postfix) with ESMTPS id DB063B80835; Mon, 26 Sep 2022 10:17:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42F21C433C1; Mon, 26 Sep 2022 10:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664187460; bh=sILuuaYyBeePaquCIlj5Gx3I8blekWSyIqEjdryyzRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zUMPkf5yyarh2uUy5W3l/brZ7LhpTBft+7mbjHkU6AYf3R3hBaa3SKOdH8w6guw7g VO4q2wZWJXIR/Y5bWS2pDuUkw//PxIBiVRLGfRDgssPel6c/lz6QyggkUlPm3XtgzM 2JErPKv1qkAOMeUMFDVu1oPt7xQChA0cAUifRUYc= 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 4.19 03/58] drm/meson: Correct OSD1 global alpha value Date: Mon, 26 Sep 2022 12:11:22 +0200 Message-Id: <20220926100741.557776852@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100741.430882406@linuxfoundation.org> References: <20220926100741.430882406@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.2 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 c7daae53fa1f..26ff2dc56419 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -101,7 +101,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; /* Set up BLK0 to point to the right canvas */ -- 2.35.1