From patchwork Thu Dec 3 14:03:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuti Amonkar X-Patchwork-Id: 11951035 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 0ECD4C4361A for ; Fri, 4 Dec 2020 08:35:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B5C5E22515 for ; Fri, 4 Dec 2020 08:35:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5C5E22515 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cadence.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09F6F6EC7D; Fri, 4 Dec 2020 08:33:54 +0000 (UTC) Received: from mx0a-0014ca01.pphosted.com (mx0b-0014ca01.pphosted.com [208.86.201.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DAEF6EB79 for ; Thu, 3 Dec 2020 14:03:39 +0000 (UTC) Received: from pps.filterd (m0042333.ppops.net [127.0.0.1]) by mx0b-0014ca01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0B3E0joN031452; Thu, 3 Dec 2020 06:03:25 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=buYtU5jcisfDtmYDGcAm9iGBYG25F+WgL38x6RHz/xg=; b=RyaIr6HMhpO0DGhZE91YElZJSveUX1y0CcSE553KHQ9q77ROPyvVBzp8NSaI2oSyGHbG 0K7uT9XzT63Eg+2jbaHE9aOqR3eX4lMSBRj7cBZAnfLGhbuU0OI2IO2gDzOJZurd3Ifs ZdNOYdyA0XVJVV5mdIH2qm/LA2DOWGEjZYDfU0P77xhAwoCPsdHBB4/ElzhG1czTtFTa XmXueGtuYhXOUEQ+WXf1GAOa2oBNuNuAWb4EqV5wfINAA4aarnrQqUJQL5O44JU1lcCH gKJy5RMoBcKzLBkEdPRK8VdanknfjkUD1R7aDDOL+waymqjBn8TW9gKTXf1nBH7cqihf 9Q== Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by mx0b-0014ca01.pphosted.com with ESMTP id 355vn6f66e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Dec 2020 06:03:24 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FBpufUhZp2s9CpXfcixlpkkPVy2K2jOA6OZg9aO9BGItTJlaRtzhR4KofSUT8AKLNbjP7aXFMDMUYuUNXTwHfA99zNPs/yzpGI3XAw++3RFeU8WL7Mx9exnErqBBqAobHf3YZ8zQ7LKnCWuGrpR0tfalQzNAqJ1Y7ndsVa2AcCvCX2X9/GAwcS12adisyjfqwRmivBNhbc+se6FWU8dREMNgdw+63e4Kmvrafga50p09tNLwCDlQ5j4s21xDCUrxcqh4+zOfAxvIa0HtcuG/Ifpecof7UD37Xz6wfXp7kUzLFzP9paE81cDVH9Ec+Rv8bnxRr15fBV4dZd1nG1e0rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=buYtU5jcisfDtmYDGcAm9iGBYG25F+WgL38x6RHz/xg=; b=QJ1MW9pv+v2moTvkEtl2BmrHVG5eQ+N2ClfqVFNEkSAtSnh4kDkpd6i+t13DRjacuVbYOS8ZFkJK1cfsv+gjsFRZbhwAAwFFXCJinPjSFNdutO0YW0lr5tjq34xmEvh5hfsNVo6fEpIbBzPEe1Yqwir+Bix6pOsP7+y1SvB0Vsf1zunR//2NRo5Vyg2QmppZ983Lh6TDxaEYSH3wX+aYlVBcp8zoAoqikH4A7kv2/VYQBzcLNudW+igWCboKyc0mUjFeMG0QDlYpNsh89OmYumo6n3Urds7ouFjKA02jIRet7A4ipZErCoPK8WEc8GUUfjVkEfHcy39H9cmRaZJxLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 199.43.4.23) smtp.rcpttodomain=ffwll.ch smtp.mailfrom=cadence.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=cadence.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=buYtU5jcisfDtmYDGcAm9iGBYG25F+WgL38x6RHz/xg=; b=7oVvzMAQzw+gHIPG8hGF8GK+NGsPTDlFFAZ4Cn7tasNU+KYZZbtT68BIftcnUrHJDTCCs+0lCv3koISyhFIRJrOJcE7pAP2Kp4/kHP/BfTFFZXDdLBDwGQh2FOoqtqm8V46Bo6HiAmtoRI9kb1QsMC4Qxl2yAwc1+yyW2MjVvns= Received: from BN8PR15CA0014.namprd15.prod.outlook.com (2603:10b6:408:c0::27) by DM6PR07MB6476.namprd07.prod.outlook.com (2603:10b6:5:148::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17; Thu, 3 Dec 2020 14:03:22 +0000 Received: from BN8NAM12FT040.eop-nam12.prod.protection.outlook.com (2603:10b6:408:c0:cafe::e7) by BN8PR15CA0014.outlook.office365.com (2603:10b6:408:c0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Thu, 3 Dec 2020 14:03:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 199.43.4.23) smtp.mailfrom=cadence.com; ffwll.ch; dkim=none (message not signed) header.d=none;ffwll.ch; dmarc=pass action=none header.from=cadence.com; Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates 199.43.4.23 as permitted sender) receiver=protection.outlook.com; client-ip=199.43.4.23; helo=rmmaillnx1.cadence.com; Received: from rmmaillnx1.cadence.com (199.43.4.23) by BN8NAM12FT040.mail.protection.outlook.com (10.13.182.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Thu, 3 Dec 2020 14:03:22 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by rmmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id 0B3E3FRJ020918 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 3 Dec 2020 09:03:17 -0500 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 3 Dec 2020 15:03:14 +0100 Received: from vleu-orange.cadence.com (10.160.88.83) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Thu, 3 Dec 2020 15:03:14 +0100 Received: from vleu-orange.cadence.com (localhost.localdomain [127.0.0.1]) by vleu-orange.cadence.com (8.14.4/8.14.4) with ESMTP id 0B3E3E27022341; Thu, 3 Dec 2020 15:03:14 +0100 Received: (from yamonkar@localhost) by vleu-orange.cadence.com (8.14.4/8.14.4/Submit) id 0B3E3ECU022340; Thu, 3 Dec 2020 15:03:14 +0100 From: Yuti Amonkar To: , , , , , , , , , , Subject: [PATCH v3 1/3] drm: bridge: cdns-mhdp8546: Modify atomic_get_input_bus_format bridge function Date: Thu, 3 Dec 2020 15:03:09 +0100 Message-ID: <1607004191-22294-2-git-send-email-yamonkar@cadence.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1607004191-22294-1-git-send-email-yamonkar@cadence.com> References: <1607004191-22294-1-git-send-email-yamonkar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b3ee1fd-b965-4e89-866c-08d8979431e6 X-MS-TrafficTypeDiagnostic: DM6PR07MB6476: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:334; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ewx51zdaieraCkE7sfktrHARvx0O0jknpVdNoCrUXdMj/jrP3oM2MzcT2UtI16klgs2mUB6edJgSad4FO95/xVAhkbpqdoHvceVn49QdvZLpkFzcQJZZr47GD4N2iwy5T2olhyz1HHpNMYGM/be2H8+9kI2nnNTz8A9Vf5mkIQPSeY9XFllfS1DHlfZOian6Nv7iM2xbpNqaK8v3BR4/NUJ5I/Kjeo5WuJEOSbjqlyK+FobSds8FEUbLeooZzFgzrAksOE0FD4pRhOLH4i0/aHBfPI3S3t/WwUopVQb2yw+tWWWUK+h06/+6FqE648mgHcEKmIlFdNryx8mOUG0kpixrOH0dRYwsGZr6aHg6uOvLCRPQm7znEqZFirrzDctb8SL3PaOmgJHaKS773cg3G8KX5dMdTImEV1FecQ4W7z6WiIQuLMmTYVg5FezqEGUUhdWfy8YJ2zsXtxiWL+pwmU2W3m9Coyk995AG+RtKksk= X-Forefront-Antispam-Report: CIP:199.43.4.23; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:rmmaillnx1.cadence.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(136003)(39860400002)(396003)(376002)(346002)(36092001)(46966005)(107886003)(186003)(5660300002)(82310400003)(426003)(54906003)(356005)(7416002)(36756003)(26005)(6666004)(2616005)(110136005)(42186006)(316002)(36906005)(47076004)(81166007)(86362001)(478600001)(336012)(70586007)(70206006)(921005)(82740400003)(83380400001)(4326008)(8676002)(8936002)(2906002)(2101003)(83996005); DIR:OUT; SFP:1101; X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2020 14:03:22.0760 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b3ee1fd-b965-4e89-866c-08d8979431e6 X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[199.43.4.23]; Helo=[rmmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT040.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB6476 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-12-03_07:2020-12-03, 2020-12-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxlogscore=999 adultscore=0 spamscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 suspectscore=0 malwarescore=0 phishscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012030085 X-Mailman-Approved-At: Fri, 04 Dec 2020 08:33:34 +0000 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: mparab@cadence.com, yamonkar@cadence.com, nsekhar@ti.com, jsarha@ti.com, tomi.valkeinen@ti.com, sjakhade@cadence.com, nikhil.nd@ti.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Modify atomic_get_input_bus_format function to return input formats supported instead of using hardcoded value. Signed-off-by: Yuti Amonkar --- .../drm/bridge/cadence/cdns-mhdp8546-core.c | 83 +++++++++++++++++-- 1 file changed, 74 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index d0ed950f4f87..5ef6adb8bc82 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -2095,27 +2095,92 @@ cdns_mhdp_bridge_atomic_reset(struct drm_bridge *bridge) return &cdns_mhdp_state->base; } +#define MAX_INPUT_FORMAT 11 + static u32 *cdns_mhdp_get_input_bus_fmts(struct drm_bridge *bridge, - struct drm_bridge_state *bridge_state, - struct drm_crtc_state *crtc_state, - struct drm_connector_state *conn_state, - u32 output_fmt, - unsigned int *num_input_fmts) -{ + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + u32 output_fmt, + unsigned int *num_input_fmts) +{ + struct drm_connector *conn = conn_state->connector; + struct drm_display_info *info = &conn->display_info; u32 *input_fmts; u32 default_bus_format = MEDIA_BUS_FMT_RGB121212_1X36; + unsigned int i = 0; *num_input_fmts = 0; if (output_fmt != MEDIA_BUS_FMT_FIXED) return NULL; - input_fmts = kzalloc(sizeof(*input_fmts), GFP_KERNEL); + input_fmts = kcalloc(MAX_INPUT_FORMAT, + sizeof(*input_fmts), GFP_KERNEL); if (!input_fmts) return NULL; - *num_input_fmts = 1; - input_fmts[0] = default_bus_format; + input_fmts[i++] = default_bus_format; + + if (info->color_formats & DRM_COLOR_FORMAT_RGB444) { + if (info->bpc == 16) { + input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48; + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30; + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; + } + + if (info->bpc == 12) { + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30; + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; + } + + if (info->bpc == 10) { + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30; + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; + } + + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24; + } + + if (info->color_formats & DRM_COLOR_FORMAT_YCRCB444) { + if (info->bpc == 16) { + input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48; + input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36; + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30; + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; + } + + if (info->bpc == 12) { + input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36; + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30; + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; + } + + if (info->bpc == 10) { + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30; + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; + } + + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; + } + + if (info->color_formats & DRM_COLOR_FORMAT_YCRCB422) { + if (info->bpc == 12) { + input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24; + input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20; + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16; + } + + if (info->bpc == 10) { + input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20; + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16; + } + + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16; + } + + *num_input_fmts = i; + return input_fmts; } From patchwork Thu Dec 3 14:03:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuti Amonkar X-Patchwork-Id: 11950995 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 0AF21C4361A for ; Fri, 4 Dec 2020 08:34:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9D00822515 for ; Fri, 4 Dec 2020 08:34:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D00822515 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cadence.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5256D6EC6F; Fri, 4 Dec 2020 08:33:40 +0000 (UTC) Received: from mx0a-0014ca01.pphosted.com (mx0a-0014ca01.pphosted.com [208.84.65.235]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95AA86EB79 for ; Thu, 3 Dec 2020 14:03:41 +0000 (UTC) Received: from pps.filterd (m0042385.ppops.net [127.0.0.1]) by mx0a-0014ca01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0B3DwWIk003669; Thu, 3 Dec 2020 06:03:27 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=DFD2mXuKBLfiv0NH3LXJphzI1/8xr9KjpK3+eGBRbLQ=; b=tBy3J1zx1gFv4t2Mq+2+TxYnzZKiAusmAKL1OMJxCBe1c3FbdXuS+jYJHHpU2S/IE7nJ 8rA/cqlfZsiLnCyMEn0Gq5TOPo+41w9cm0e3ukBS4GwQLL3njMSyOBFDkhLUra8q5VuY P65U09o2e8TOZYYP7fgRKAsUvLFwir50iFFJbF6V9xTUcApV5SiM9wDcP+K2hyOd1aWb 0W2LHYhLFdmlEwmARiM+h9/3MhrGjMJEdLPDPcDyg7Zs0dkQwGteIn5yDZ+VyNG7t+bV g4hykPg6Ih90aSsJJbEMYmF2xLJSjPUZ5A9iMt2Xw2rrWJII1y6HqfbDsNl5AdDoQkmm IA== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2170.outbound.protection.outlook.com [104.47.58.170]) by mx0a-0014ca01.pphosted.com with ESMTP id 355vn4pv1r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Dec 2020 06:03:26 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XZqQ+LiOk7QadBMyMPbu10y9C7cUbKGUDDs90nPlDla3bWZBaHNILF3j0KpwezJLYdRl9TucWkoHnSThEW1S2QT0qOY5AIPqMrPLt/mhQC0LLr9VWzglhuvhZMsRc+L6Vzf0iR7he6QeD+X6/RwIrLChWwf54hiK8a/zyKTd8b/ksWXHtc3RGwmnAS9iobhsnGwqehaNQ1IIjZrRyj8gKn5rH0Q/f4rrl7hRBi5jgUoyzrX6V3ClS9Ev6UvOhyp9WxsEbAJyzkMXSC7jSud5yCp4uvSt2RO5TflKpJVlUpgDwAxRvzfOqg+WfIposSXaR/FFai71LUv8q7H9mKvbjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DFD2mXuKBLfiv0NH3LXJphzI1/8xr9KjpK3+eGBRbLQ=; b=eZc6GWqiicAlpsL4G+5MuvoWtGr9B2/+BIfQE2t7/4Bq1pXGb4Ved5mVlHtM8AHE428l6/PmglLVVvFHNPS4/hgcHWLjeLiAbDwKTyurjvF1WWqtDcBmQl+70KKngZFUYVM66IlVNO0UqLvTfK8L1G6LN6fpiv7K9XDCPhmzHbLyPSovfAo2R1H9SKTcXFzoW8PykOxioTQXvr/SPoucyMXD2Rp9If9csotMnAAHuNWvd00hdh4GcCUH9QMCsCwdmUCYwVD3EtahInOqcqLoxXPZ3DgPX98wPJjYIWtseVYAJHffdsQUawiqV8kyEojRch/yWBGOnSW/LdInWN/W/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 199.43.4.23) smtp.rcpttodomain=ffwll.ch smtp.mailfrom=cadence.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=cadence.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DFD2mXuKBLfiv0NH3LXJphzI1/8xr9KjpK3+eGBRbLQ=; b=RwkZHAeEVeluYFYz9aAJktnWdFcaB/04N7JAgyafLeZf/y3HogILxHQA2eitzx+ICv3B1jKMZ4H5puvhSs28qiUK0Ew9cv3itfus9GLD/qR5fWQN5w/XzxpocLq+WScNUfWvJ3uzQ1QN0aQmuM68OEvX7R8FpjguidUrG8WA3zw= Received: from BN6PR17CA0053.namprd17.prod.outlook.com (2603:10b6:405:75::42) by SN6PR07MB4269.namprd07.prod.outlook.com (2603:10b6:805:53::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.24; Thu, 3 Dec 2020 14:03:23 +0000 Received: from BN8NAM12FT029.eop-nam12.prod.protection.outlook.com (2603:10b6:405:75:cafe::e) by BN6PR17CA0053.outlook.office365.com (2603:10b6:405:75::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Thu, 3 Dec 2020 14:03:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 199.43.4.23) smtp.mailfrom=cadence.com; ffwll.ch; dkim=none (message not signed) header.d=none;ffwll.ch; dmarc=pass action=none header.from=cadence.com; Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates 199.43.4.23 as permitted sender) receiver=protection.outlook.com; client-ip=199.43.4.23; helo=rmmaillnx1.cadence.com; Received: from rmmaillnx1.cadence.com (199.43.4.23) by BN8NAM12FT029.mail.protection.outlook.com (10.13.183.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Thu, 3 Dec 2020 14:03:22 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by rmmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id 0B3E3FRL020918 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 3 Dec 2020 09:03:22 -0500 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 3 Dec 2020 15:03:14 +0100 Received: from vleu-orange.cadence.com (10.160.88.83) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Thu, 3 Dec 2020 15:03:14 +0100 Received: from vleu-orange.cadence.com (localhost.localdomain [127.0.0.1]) by vleu-orange.cadence.com (8.14.4/8.14.4) with ESMTP id 0B3E3Eev022345; Thu, 3 Dec 2020 15:03:14 +0100 Received: (from yamonkar@localhost) by vleu-orange.cadence.com (8.14.4/8.14.4/Submit) id 0B3E3EqM022344; Thu, 3 Dec 2020 15:03:14 +0100 From: Yuti Amonkar To: , , , , , , , , , , Subject: [PATCH v3 2/3] drm: bridge: cdns-mhdp8546: Remove setting of bus format using connector info Date: Thu, 3 Dec 2020 15:03:10 +0100 Message-ID: <1607004191-22294-3-git-send-email-yamonkar@cadence.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1607004191-22294-1-git-send-email-yamonkar@cadence.com> References: <1607004191-22294-1-git-send-email-yamonkar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6258205c-6ee7-45ef-4166-08d89794326a X-MS-TrafficTypeDiagnostic: SN6PR07MB4269: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJ3Aol+5rhTiUE23pBryDM6fZXIwfezDfT4i5MzvFWsaq8Eb3lCXUdddYecqGkCm4z7dEy9FtAK3e/2mMoxyXox8a1A+1W5OfthdwSJyAMnHqA73jK/zkBxrNcHFg7V6/cejw6VdYul3e/pH7v3JxS4VN6C34BjQjX6uQ9XGSBPVW4v/8l5CY/GpCjKeMIGOraVzT3RXFhOa7ioufbQ5bN63z4DDlA+radrYuXzVGdeLjX5dX6hADjgwbxHPj6jNEf4RHZZrtzddoOIMOio9VkfpNcZJ5RKsnwefcqNJvuJ6sG6nac9w+Hpgcr8JGwWMGNXXuyUKQ6R77pl9EfnskKUK29yr7e5qqDlKPUzYiY/fLfkoKoLrwNVpAWIyVXrOIvvROXh2MQRC1DxMbxXWgcbS+kjXczZZrVvpMmXj8tw82Uao6Xa5weBOOKLVkwEcK2FG/sBpL0We2sXx02oHAIWGtctCy4CEMPjuUUt96KU= X-Forefront-Antispam-Report: CIP:199.43.4.23; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:rmmaillnx1.cadence.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(39860400002)(346002)(136003)(376002)(396003)(36092001)(46966005)(36756003)(478600001)(110136005)(26005)(54906003)(82740400003)(36906005)(8936002)(5660300002)(81166007)(8676002)(82310400003)(6666004)(2906002)(356005)(86362001)(83380400001)(107886003)(42186006)(47076004)(336012)(921005)(7416002)(2616005)(316002)(186003)(426003)(70206006)(70586007)(4326008)(2101003)(83996005); DIR:OUT; SFP:1101; X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2020 14:03:22.9393 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6258205c-6ee7-45ef-4166-08d89794326a X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[199.43.4.23]; Helo=[rmmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT029.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4269 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-12-03_07:2020-12-03, 2020-12-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 adultscore=0 bulkscore=0 clxscore=1011 impostorscore=0 priorityscore=1501 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012030085 X-Mailman-Approved-At: Fri, 04 Dec 2020 08:33:34 +0000 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: mparab@cadence.com, yamonkar@cadence.com, nsekhar@ti.com, jsarha@ti.com, tomi.valkeinen@ti.com, sjakhade@cadence.com, nikhil.nd@ti.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" As we are using bus negotiations for selecting bus format remove the setting of bus format using the connector info structure. Signed-off-by: Yuti Amonkar --- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index 5ef6adb8bc82..d9f7eb8249e8 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -1648,7 +1648,6 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = { static int cdns_mhdp_connector_init(struct cdns_mhdp_device *mhdp) { - u32 bus_format = MEDIA_BUS_FMT_RGB121212_1X36; struct drm_connector *conn = &mhdp->connector; struct drm_bridge *bridge = &mhdp->bridge; int ret; @@ -1669,11 +1668,6 @@ static int cdns_mhdp_connector_init(struct cdns_mhdp_device *mhdp) drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs); - ret = drm_display_info_set_bus_formats(&conn->display_info, - &bus_format, 1); - if (ret) - return ret; - ret = drm_connector_attach_encoder(conn, bridge->encoder); if (ret) { dev_err(mhdp->dev, "Failed to attach connector to encoder\n"); From patchwork Thu Dec 3 14:03:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuti Amonkar X-Patchwork-Id: 11951039 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9B570C4361A for ; Fri, 4 Dec 2020 08:35:03 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 44C5E22515 for ; Fri, 4 Dec 2020 08:35:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44C5E22515 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cadence.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 25AEC6EC7E; Fri, 4 Dec 2020 08:33:54 +0000 (UTC) Received: from mx0a-0014ca01.pphosted.com (mx0a-0014ca01.pphosted.com [208.84.65.235]) by gabe.freedesktop.org (Postfix) with ESMTPS id F1D346EB78 for ; Thu, 3 Dec 2020 14:03:40 +0000 (UTC) Received: from pps.filterd (m0042385.ppops.net [127.0.0.1]) by mx0a-0014ca01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0B3DwZsh003675; Thu, 3 Dec 2020 06:03:28 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=cE8xu4v6OzdM3ML4SY7oMnxgU3rb01DJbVO5lC8n+wE=; b=PahMtpZFVOQ4T302UEJVpOisVdtTItaf6VKI5AjEFa2E6u2515nT9ptjo4b3HDtAaeuD z6eyUr5oy4m2Wmia0h1521GYqYLiv0Th2cRPQ6D8XyrSd/qgFHbWCc0IzMZI1VHbLgVC tNBWwg/05jeCUArIok1OUWC+7WY9jnKaLBB1aRdNq2MR3E9OBFeioFCh1kAmdoRr7fMO RBIEFoRlhsl9RnXxkxzl+yHFR1Ng2WffGbrvIwGTcBLHxtsQfROhU1CqKC998NnXVuAK EJXVlid6oqSAY6ft3s+qVIq4jPEtDgNFwAHTZU3cPn/62BNwRRl4uy+/9obDBdX241Y5 gQ== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2104.outbound.protection.outlook.com [104.47.55.104]) by mx0a-0014ca01.pphosted.com with ESMTP id 355vn4pv1t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Dec 2020 06:03:27 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FtoRalOgpKaNheXD2JjLtxsH3JRyjIlcLxayxayY6IZVl8dQnNlfMpe+HyvJv8+bkOp38aMlf7NvTMB+kN6jlhI/XqslrWMAnpuKrpXbTgn0i7F3XWuuLVCi1ARVtIp6Ej512I/VhwSLsI8fadIp8o8hy04XxunTIyLpgFFrbwCKvMzlPONSdcnZ76EgJamtgjZ7cjnrMkHF190NW43mezXSk5lbY+HjjQXbX+BzLCMPU1yupqG5IJKW6f7++x/K0kCTrIBrM4VoAkykYdUoWYbmtEdOnc8YguDQct2fXZQnNK6QWtixzWoMSf/cf0oru/tR4PcpbcNU6ByX/zMOvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cE8xu4v6OzdM3ML4SY7oMnxgU3rb01DJbVO5lC8n+wE=; b=b0vjBhWUxamuf2QEsxv4Jqbcev+7RK/WiBxKaCXLPyI3+jK51lTx7Z7Uh5bx0KshO7U7CbQxd65qDKcsyOLJ9FnYHPpkRn1DNEIVbSTBbYuGiG54h+3oWHVzlyhGSTGdaaNk6MhZVNciesMiEQVYzxZjekhF3E44VYfAt3d7BowNdgJ7lq36j8IprfmpeBOozZcif7+EisO5FOu+s67uGXCvJxZaY8kMAKKtfR5hht2nrVbKaN2V5ChsY1du2nnagRuak11l8R4dAL07asVDeAhtYwscVieImx9JkuXdU9v7K2930dUCMizmp8TsESQVfwHKzoD9pXoDNlkF8dg+VQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 199.43.4.23) smtp.rcpttodomain=ffwll.ch smtp.mailfrom=cadence.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=cadence.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cE8xu4v6OzdM3ML4SY7oMnxgU3rb01DJbVO5lC8n+wE=; b=0cE/lSFQBG8xGGoBSrwkCo3nq8/PbRS/0o/+etT5sE1CIe4JZYuNlNcLZx1OWAYvybWpec5fjVrhjXdKAxbrB/VmZyZolwDIM8dAyhk6tq4N5OjgL+zlA7hqJ1yzz74fTS7k8u9Lqz3Zbc3YPEO/CKmsd3H9yd9PfjvgYgYUM00= Received: from BN1PR14CA0016.namprd14.prod.outlook.com (2603:10b6:408:e3::21) by DM5PR07MB4136.namprd07.prod.outlook.com (2603:10b6:4:b6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.23; Thu, 3 Dec 2020 14:03:24 +0000 Received: from BN8NAM12FT009.eop-nam12.prod.protection.outlook.com (2603:10b6:408:e3:cafe::1b) by BN1PR14CA0016.outlook.office365.com (2603:10b6:408:e3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Thu, 3 Dec 2020 14:03:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 199.43.4.23) smtp.mailfrom=cadence.com; ffwll.ch; dkim=none (message not signed) header.d=none;ffwll.ch; dmarc=pass action=none header.from=cadence.com; Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates 199.43.4.23 as permitted sender) receiver=protection.outlook.com; client-ip=199.43.4.23; helo=rmmaillnx1.cadence.com; Received: from rmmaillnx1.cadence.com (199.43.4.23) by BN8NAM12FT009.mail.protection.outlook.com (10.13.182.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Thu, 3 Dec 2020 14:03:23 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by rmmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id 0B3E3FRM020918 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Thu, 3 Dec 2020 09:03:22 -0500 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 3 Dec 2020 15:03:14 +0100 Received: from vleu-orange.cadence.com (10.160.88.83) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Thu, 3 Dec 2020 15:03:14 +0100 Received: from vleu-orange.cadence.com (localhost.localdomain [127.0.0.1]) by vleu-orange.cadence.com (8.14.4/8.14.4) with ESMTP id 0B3E3Fxv022350; Thu, 3 Dec 2020 15:03:15 +0100 Received: (from yamonkar@localhost) by vleu-orange.cadence.com (8.14.4/8.14.4/Submit) id 0B3E3EEv022349; Thu, 3 Dec 2020 15:03:14 +0100 From: Yuti Amonkar To: , , , , , , , , , , Subject: [PATCH v3 3/3] drm: bridge: cdns-mhdp8546: Retrieve the pixel format and bpc based on bus format Date: Thu, 3 Dec 2020 15:03:11 +0100 Message-ID: <1607004191-22294-4-git-send-email-yamonkar@cadence.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1607004191-22294-1-git-send-email-yamonkar@cadence.com> References: <1607004191-22294-1-git-send-email-yamonkar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5e8bf0b-d02e-44b3-6072-08d89794330a X-MS-TrafficTypeDiagnostic: DM5PR07MB4136: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:148; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B6zSfg7pNCl3xgLKec8tBpQXyEBmxKkmNuclEc9yTaTMC9HEM4Atvbw2Ii+B1HtK0rm5lq9+/RAA2Z0Py8rJksKHqW11fO+CWDCku05TksU0vlcAKy7zSmnhxMI8J4R49XS2JtJ6etYkL7Duw6qQd5wipFeW8LFzymx9gTP6V9Xkshz407zr5JzjndNfHX/EBrVFOUsV69gRwNmHMKursYMTen57zhKcErfRF40aH8zm/JJRRKOWg3ljikKrVD+gJR2H+63SFzz5wpe9tauaHgntxVwGYxlbmeOeTJDwo9TJrEZu8DQbiGkoHASdXcnEmMSGR0wv+2vh0OdQ1w9GoLaA72P3E84Zol4YrX7QY7gP82X1Fu1UouA55JpkjCmNqI2xbPyjOOL5/iAmsxbwHzePfL/qPYyb4E9za47pX4wZK/IJpr2u7RQNDxnGcb6DPN/ZSobC2YAFMEjAlCTRnZARgfYC/d+RFLwrunEonA9BEAS/RLfBFc5rqt+f1HxN X-Forefront-Antispam-Report: CIP:199.43.4.23; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:rmmaillnx1.cadence.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(136003)(396003)(346002)(39860400002)(376002)(36092001)(46966005)(107886003)(2906002)(70206006)(2616005)(47076004)(83380400001)(42186006)(426003)(7416002)(54906003)(336012)(36906005)(36756003)(110136005)(316002)(921005)(6666004)(5660300002)(186003)(478600001)(8676002)(82310400003)(81166007)(26005)(8936002)(4326008)(356005)(70586007)(82740400003)(86362001)(83996005)(2101003)(358055004); DIR:OUT; SFP:1101; X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2020 14:03:23.9867 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5e8bf0b-d02e-44b3-6072-08d89794330a X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[199.43.4.23]; Helo=[rmmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT009.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB4136 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-12-03_07:2020-12-03, 2020-12-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012030085 X-Mailman-Approved-At: Fri, 04 Dec 2020 08:33:34 +0000 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: mparab@cadence.com, yamonkar@cadence.com, nsekhar@ti.com, jsarha@ti.com, tomi.valkeinen@ti.com, sjakhade@cadence.com, nikhil.nd@ti.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Get the pixel format and bpc based on the output bus format negotiated instead of hardcoding the values. Signed-off-by: Yuti Amonkar --- .../drm/bridge/cadence/cdns-mhdp8546-core.c | 82 +++++++++++++++---- 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index d9f7eb8249e8..2ad5cad46599 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -1530,24 +1530,8 @@ static int cdns_mhdp_get_modes(struct drm_connector *connector) drm_connector_update_edid_property(connector, edid); num_modes = drm_add_edid_modes(connector, edid); - kfree(edid); - /* - * HACK: Warn about unsupported display formats until we deal - * with them correctly. - */ - if (connector->display_info.color_formats && - !(connector->display_info.color_formats & - mhdp->display_fmt.color_format)) - dev_warn(mhdp->dev, - "%s: No supported color_format found (0x%08x)\n", - __func__, connector->display_info.color_formats); - - if (connector->display_info.bpc && - connector->display_info.bpc < mhdp->display_fmt.bpc) - dev_warn(mhdp->dev, "%s: Display bpc only %d < %d\n", - __func__, connector->display_info.bpc, - mhdp->display_fmt.bpc); + kfree(edid); return num_modes; } @@ -1706,6 +1690,66 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge, return 0; } +static void cdns_mhdp_get_display_fmt(struct cdns_mhdp_device *mhdp, + struct drm_bridge_state *state) +{ + u32 bus_fmt, bpc, pxlfmt; + + bus_fmt = state->output_bus_cfg.format; + switch (bus_fmt) { + case MEDIA_BUS_FMT_RGB161616_1X48: + pxlfmt = DRM_COLOR_FORMAT_RGB444; + bpc = 16; + break; + case MEDIA_BUS_FMT_YUV16_1X48: + pxlfmt = DRM_COLOR_FORMAT_YCRCB444; + bpc = 16; + break; + case MEDIA_BUS_FMT_RGB121212_1X36: + pxlfmt = DRM_COLOR_FORMAT_RGB444; + bpc = 12; + break; + case MEDIA_BUS_FMT_UYVY12_1X24: + pxlfmt = DRM_COLOR_FORMAT_YCRCB422; + bpc = 12; + break; + case MEDIA_BUS_FMT_YUV12_1X36: + pxlfmt = DRM_COLOR_FORMAT_YCRCB444; + bpc = 12; + break; + case MEDIA_BUS_FMT_RGB101010_1X30: + pxlfmt = DRM_COLOR_FORMAT_RGB444; + bpc = 10; + break; + case MEDIA_BUS_FMT_UYVY10_1X20: + pxlfmt = DRM_COLOR_FORMAT_YCRCB422; + bpc = 10; + break; + case MEDIA_BUS_FMT_YUV10_1X30: + pxlfmt = DRM_COLOR_FORMAT_YCRCB444; + bpc = 10; + break; + case MEDIA_BUS_FMT_RGB888_1X24: + pxlfmt = DRM_COLOR_FORMAT_RGB444; + bpc = 8; + break; + case MEDIA_BUS_FMT_UYVY8_1X16: + pxlfmt = DRM_COLOR_FORMAT_YCRCB422; + bpc = 8; + break; + case MEDIA_BUS_FMT_YUV8_1X24: + pxlfmt = DRM_COLOR_FORMAT_YCRCB444; + bpc = 8; + break; + default: + pxlfmt = DRM_COLOR_FORMAT_RGB444; + bpc = 8; + } + + mhdp->display_fmt.color_format = pxlfmt; + mhdp->display_fmt.bpc = bpc; +} + static void cdns_mhdp_configure_video(struct cdns_mhdp_device *mhdp, const struct drm_display_mode *mode) { @@ -2186,6 +2230,8 @@ static int cdns_mhdp_atomic_check(struct drm_bridge *bridge, struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge); const struct drm_display_mode *mode = &crtc_state->adjusted_mode; + cdns_mhdp_get_display_fmt(mhdp, bridge_state); + mutex_lock(&mhdp->link_mutex); if (!cdns_mhdp_bandwidth_ok(mhdp, mode, mhdp->link.num_lanes, @@ -2499,7 +2545,7 @@ static int cdns_mhdp_probe(struct platform_device *pdev) mhdp->link.rate = mhdp->host.link_rate; mhdp->link.num_lanes = mhdp->host.lanes_cnt; - /* The only currently supported format */ + /* Initialize color format bpc and y_only to default values*/ mhdp->display_fmt.y_only = false; mhdp->display_fmt.color_format = DRM_COLOR_FORMAT_RGB444; mhdp->display_fmt.bpc = 8;