Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3329906rwa; Tue, 23 Aug 2022 03:00:01 -0700 (PDT) X-Google-Smtp-Source: AA6agR57eJN0RF7bVhJj7V63ydnuY1f5a0OaKG99NHPgaEbDRUsQa4ZDKFjZ/bKO+PQ0tRRqq/tQ X-Received: by 2002:a05:6402:d06:b0:440:3e9d:77d with SMTP id eb6-20020a0564020d0600b004403e9d077dmr2872248edb.286.1661248801699; Tue, 23 Aug 2022 03:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661248801; cv=none; d=google.com; s=arc-20160816; b=LB3Lv1vc6EUOZtgtvRrlr6sy146GdKrfPHlNkZIlvKEqpTK9unZ78HiY/cTKV15Sxa lx8DgGW7SRp0sj4t1mQx4j37xKlIyf+aE1SZAr3FKH6kJZBxiPeSIPP+Pmk2eKwOiBem bGQfPaKbLQ1gOqcR9MbycrJNGi63alkVnl5oqU6WwGxJv0QxJx5Uqf6AgOoUxrUVr+W3 43GIh7MSx6oE4rc6NF1COAmQmPumzEnEIRFTCkHeuqO9H6DVBSl2hv0MTaain+NOr5wL mdwF5lq+WJs+uoFAuC3Ks2hLsJTsHxQEDK4DAJRvAvztj5C3PpXuw2gunFtTToFtA5CV Djtw== 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=zIzJjzjQaXLzEmTydquTa1nEgItXUO73gIvL0Ze82uQ=; b=g2cFhyJIlq549osvGmzeozPmOtdmN2bMzQiHTW1ZhJuuRhrGyakpqGTD9ogXkgyjUY XEP5Ld4MAr32r/3MibILr4Q6VMS1MJQaW22DslA06t4inbZEPiCcUNrRu0bbLrRYgbjX hsNnv9aMZ6lCjJR3dfZFkUjZ/UEL/6XR05FqC+wlHXdb5b4TvlbRbQPEoV1HuUpIWNP7 Uu/Di+kJDxKVFZuWzelXN5T0pYbi8SIT6Os6U5KxEOEbPW3i7bwIN1ohfi6/ZCfWj0ce Uy16WZXFyM331wOaBixOi99/+KNLcsH8B01g1vS5gDFPdTXqHx31JallFtBmWo3D2NVJ fEqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CdHDgkxv; 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 dy6-20020a05640231e600b0043bc6117edcsi1352772edb.531.2022.08.23.02.59.35; Tue, 23 Aug 2022 03:00:01 -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=CdHDgkxv; 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 S243706AbiHWJsC (ORCPT + 99 others); Tue, 23 Aug 2022 05:48:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351916AbiHWJpl (ORCPT ); Tue, 23 Aug 2022 05:45:41 -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 80DDB2F7; Tue, 23 Aug 2022 01:43:16 -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 1EDD4B81C4F; Tue, 23 Aug 2022 08:43:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A1B2C433D6; Tue, 23 Aug 2022 08:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661244180; bh=wvDu/ipmfAlirHb5j2FpWgwFya3KrOeJTyYaZnia1G8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CdHDgkxv9ioSHTRq9P0KRjNy/4t4kgWU6FkAj7L2NNPtTA1u8laAXlvFu9n+iTPvF tJErhwXKTCMRGJ6tl5SVxZGywEpu0rcD5/2VGSCMyZGmr8yMyNj9Rnb1++1DDV2adk 7cfS7/35s77wW9XbS8l3SIZOWQFAagdZ06kv4BO4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bo-Chen Chen , Chun-Kuang Hu , Sasha Levin Subject: [PATCH 4.14 069/229] drm/mediatek: dpi: Remove output format of YUV Date: Tue, 23 Aug 2022 10:23:50 +0200 Message-Id: <20220823080056.184219976@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080053.202747790@linuxfoundation.org> References: <20220823080053.202747790@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,T_SCC_BODY_TEXT_LINE 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: Bo-Chen Chen [ Upstream commit c9ed0713b3c35fc45677707ba47f432cad95da56 ] DPI is not support output format as YUV, but there is the setting of configuring output YUV. Therefore, remove them in this patch. Fixes: 9e629c17aa8d ("drm/mediatek: Add DPI sub driver") Signed-off-by: Bo-Chen Chen Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220701035845.16458-5-rex-bc.chen@mediatek.com/ Signed-off-by: Chun-Kuang Hu Signed-off-by: Sasha Levin --- drivers/gpu/drm/mediatek/mtk_dpi.c | 31 ++++++------------------------ 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index e80a603e5fb0..6b12be8ca33e 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -51,13 +51,7 @@ enum mtk_dpi_out_channel_swap { }; enum mtk_dpi_out_color_format { - MTK_DPI_COLOR_FORMAT_RGB, - MTK_DPI_COLOR_FORMAT_RGB_FULL, - MTK_DPI_COLOR_FORMAT_YCBCR_444, - MTK_DPI_COLOR_FORMAT_YCBCR_422, - MTK_DPI_COLOR_FORMAT_XV_YCC, - MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL, - MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL + MTK_DPI_COLOR_FORMAT_RGB }; struct mtk_dpi { @@ -346,24 +340,11 @@ static void mtk_dpi_config_2n_h_fre(struct mtk_dpi *dpi) static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, enum mtk_dpi_out_color_format format) { - if ((format == MTK_DPI_COLOR_FORMAT_YCBCR_444) || - (format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) { - mtk_dpi_config_yuv422_enable(dpi, false); - mtk_dpi_config_csc_enable(dpi, true); - mtk_dpi_config_swap_input(dpi, false); - mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_BGR); - } else if ((format == MTK_DPI_COLOR_FORMAT_YCBCR_422) || - (format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) { - mtk_dpi_config_yuv422_enable(dpi, true); - mtk_dpi_config_csc_enable(dpi, true); - mtk_dpi_config_swap_input(dpi, true); - mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); - } else { - mtk_dpi_config_yuv422_enable(dpi, false); - mtk_dpi_config_csc_enable(dpi, false); - mtk_dpi_config_swap_input(dpi, false); - mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); - } + /* only support RGB888 */ + mtk_dpi_config_yuv422_enable(dpi, false); + mtk_dpi_config_csc_enable(dpi, false); + mtk_dpi_config_swap_input(dpi, false); + mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); } static void mtk_dpi_power_off(struct mtk_dpi *dpi, enum mtk_dpi_power_ctl pctl) -- 2.35.1