From patchwork Mon Nov 6 23:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 162234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp3002205vqu; Mon, 6 Nov 2023 16:02:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHKy7e/7MeLsWPIH6Wm0XGuKVPyhqurb580s94l59ZZalcP2LyH+DeuOYqVGmDUYxJAWgma X-Received: by 2002:a05:6a21:71c7:b0:181:6f91:efe with SMTP id ay7-20020a056a2171c700b001816f910efemr13551740pzc.19.1699315351772; Mon, 06 Nov 2023 16:02:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699315351; cv=none; d=google.com; s=arc-20160816; b=np0CiSt9vHb6ReK2LuJvsV47r7/1VdgDiN8IiVWP3vybShdxJ9WOzV20ar6L+4gP69 MaQ32+h5AjCfEMZj+gJ9RLdXNLyx6fsoFxI1OS7nTI31UeGdNdBW1ckQrWiSxESHTU2u 0kCAS2lVwplO5kES2yD6hdwVjyDfcUkvzKXL4DkPXVOOQ7ZybI5TTe8ha/cCKl2C/pMx bCii8o+1GycdaAGP51ncK51UbDOSXJCWFp3J7XPB60g590Ntok1ppJ7QZqLp/73EMZVm v3HqnuhqswMFmFlEBqYyJYpE05jZ9CT8eg+/YfnTHah3Z+ZjXQjhT8Vwnat8ni3BwIhk jWCg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bdzwYBIp8oE+FGXK79RX2ZgMcbwotMlBVaAFWxWkmk4=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=qiaEOwaYur8s+a/qC3CJmtMQYOZJ1O5SbGRiQJS/79/wxRQB48peOVyGT7D3M2pTid 9c1/Z9rmS0PCCM+HH4qupowYg770YN+Yz8X7hH6rI16ffucmAZK+QB6DMCHiIMjtwIxG M+vSHs6Ujhf0D1juz7kn8l/Xz08vW7Omkn1YPOTqEZUgkAKJGTAffKz6ZYtnvWoU7l+x 025m9S5PS5cZ9NmERmCu3iv1iZOT111ftKVM0YAlh2iVNngjtzp3sSibPQRE3KwWtKFo FUEyXdNFHFvmh1ZgQ9myXr9zfQ4Lfa5cG2CJBrFK2ePR628WFbw2aqPuQKS6lJXyOra9 +FAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=k4fre46U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id t20-20020a056a00139400b006c33988ea3esi9290576pfg.402.2023.11.06.16.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:02:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=k4fre46U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4D1618098498; Mon, 6 Nov 2023 16:00:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233396AbjKGAAh (ORCPT + 33 others); Mon, 6 Nov 2023 19:00:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233081AbjKGAAc (ORCPT ); Mon, 6 Nov 2023 19:00:32 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A513134 for ; Mon, 6 Nov 2023 16:00:30 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-280cc5f3fdcso4785739a91.1 for ; Mon, 06 Nov 2023 16:00:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699315230; x=1699920030; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bdzwYBIp8oE+FGXK79RX2ZgMcbwotMlBVaAFWxWkmk4=; b=k4fre46UY1d1meVEfgtvl2+wDsrXHTGOeBmF7H5V8zILOV8La/R4kIN3QB4EOxkUc+ bK+9IKorSuhtVf2mYAtB/zuVJahEtQGykzzZHlZRek4NTIX7ODMegNbQR5prCynlNH/f C86Lb6bJsewRHM/0RtG/b6wvdoVeJM38nRlZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699315230; x=1699920030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bdzwYBIp8oE+FGXK79RX2ZgMcbwotMlBVaAFWxWkmk4=; b=kU5FB5SNzpWihqJcE1uqpIaRRPHeLLOMlE4kWQvHvQJ90RO9uGcqvHt5lYEkgkhBhJ nWmATA6fibyU6AnRz2V+aVfNyEbIlYt5jwR9KY5m6By4ovKpKns8JQxx+dkNbQCwsaBs 0nC1ao3fSUqf46sBP0nUUtJZGQ35luxUdU15pD1AwZujofoGipiszkizYH8XaTFiPGTC qMhjRcOqZ4crRDAX0TkoIIec1mznargIl8wFNbH70Au4xc7RYh7EcNUwISqqm6SvjZe0 28/O+o1Cs71kjMtLdkffdqyvFgZ2Lx6nFPrl38eHq2o0QFfEx0CziB5m2YCxTRkYkdeM 3T8A== X-Gm-Message-State: AOJu0YxDt3ru30Dke7dC3ikNWW7eWUIejSMrJB/edjBlMNQxtP0d27aW AdJzhSZfmG57x+8xw3b0ORd6Bg== X-Received: by 2002:a17:90b:e14:b0:27e:31a:2ab2 with SMTP id ge20-20020a17090b0e1400b0027e031a2ab2mr24488613pjb.34.1699315229679; Mon, 06 Nov 2023 16:00:29 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id fw11-20020a17090b128b00b00268b439a0cbsm5852866pjb.23.2023.11.06.16.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:00:29 -0800 (PST) From: Hsin-Yi Wang To: Douglas Anderson Cc: Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v5 1/4] drm/panel-edp: drm/panel-edp: Fix AUO B116XTN02, B116XAK01 name and timing Date: Mon, 6 Nov 2023 15:51:32 -0800 Message-ID: <20231107000023.2928195-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107000023.2928195-1-hsinyi@chromium.org> References: <20231107000023.2928195-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 06 Nov 2023 16:00:43 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781861294528161810 X-GMAIL-MSGID: 1781861294528161810 According to decoding edid and datahseet: - Rename AUO 0x235c B116XTN02 to B116XTN02.3 - Rename AUO 0x405c B116XAK01 to B116XAK01.0 and adjust the timing of auo_b116xak01: T3=200, T12=500, T7_max = 50. Fixes: 3db2420422a5 ("drm/panel-edp: Add AUO B116XTN02, BOE NT116WHM-N21,836X2, NV116WHM-N49 V8.0") Fixes: da458286a5e2 ("drm/panel: Add support for AUO B116XAK01 panel") Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson --- v4->v5: separate fixes patch. --- drivers/gpu/drm/panel/panel-edp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 9dce4c702414..d41d205f7f5b 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -973,6 +973,8 @@ static const struct panel_desc auo_b116xak01 = { }, .delay = { .hpd_absent = 200, + .unprepare = 500, + .enable = 50, }, }; @@ -1869,8 +1871,8 @@ static const struct edp_panel_entry edp_panels[] = { EDP_PANEL_ENTRY('A', 'U', 'O', 0x145c, &delay_200_500_e50, "B116XAB01.4"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x1e9b, &delay_200_500_e50, "B133UAN02.1"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x1ea5, &delay_200_500_e50, "B116XAK01.6"), - EDP_PANEL_ENTRY('A', 'U', 'O', 0x235c, &delay_200_500_e50, "B116XTN02"), - EDP_PANEL_ENTRY('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x235c, &delay_200_500_e50, "B116XTN02.3"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.0"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x582d, &delay_200_500_e50, "B133UAN01.0"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x615c, &delay_200_500_e50, "B116XAN06.1"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x8594, &delay_200_500_e50, "B133UAN01.0"), From patchwork Mon Nov 6 23:51:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 162236 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp3002237vqu; Mon, 6 Nov 2023 16:02:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IE8cmNKIX5M/MQkHiz/8yW9BhC2Stk0EFsVc8Smghoe+5MnSrmdnhlTxEmGdIGVBfQMI1Gi X-Received: by 2002:a17:902:e802:b0:1cc:7af4:d136 with SMTP id u2-20020a170902e80200b001cc7af4d136mr15688863plg.28.1699315354637; Mon, 06 Nov 2023 16:02:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699315354; cv=none; d=google.com; s=arc-20160816; b=UHwVp7EJ4HOTs/zHlh+MxIfD1JikLelkzetbUny4E/yRrANV9xDxHoNrW2wiENNlxu Sm46CkB/vz3n5UWGqNuIEQL/bfOZ4v1Ja42dwi1utqcHjavUDZuDQPd3PpcrnCZARdjn pMbeT5Mi/RvbiBHiYDeXduGUFr+G5Cha9bslHaj71DCMquTymIKOo+kzpI/Rl+G7v8Ub hAHXKo4KRqVJVBVN1TEM9JzuWH73qm7Z7kNfh4bELK6nliOUkpEEeF4fryPNdVP8wIyh 3CHkGiFitrVbI/1w9BHglyZ6cvbOPnHiIZW+8iwhpCIEDu/825vYV+GgyWEec3IJT3AA BD9Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=megi+idfKyZxANurxPNtnWd6V7EyY7HllNmpRhBdpws=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=0dpxPbIdO9I4zUmu42WmtBFSwL66fkv2t8LtVemI63366iWwQbb5xCTkdFUGq4fe50 b6RGDWtb4EQzLuvq4yhQh6vOfG9gaXwM6RCL4fEzOVXzylexvp2dY7W0pGpX16xKZCP0 IdibEocWDy1aSVG3y47Hc9rirObH5VIt6r3uWXn8TVmFG7KVCWsxEmYYRBWJpRFegFDw 5wx4+fno2UE0RDDqFVuTLP7xs3u4iyP3zE70HtLyzQhz/0xyamoDVkuts+N7fFxd4hm9 /9bo8kK8p6fBW6hSqgcd6Q2VVuKsAnfXNFbYVpdmWXGjZMvH72h1shYyrkvTOi8umMYi zLNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Q+itk1AD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y19-20020a170902e19300b001c9af07788csi8442406pla.76.2023.11.06.16.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:02:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Q+itk1AD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 95C928090047; Mon, 6 Nov 2023 16:00:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233242AbjKGAAk (ORCPT + 33 others); Mon, 6 Nov 2023 19:00:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232702AbjKGAAe (ORCPT ); Mon, 6 Nov 2023 19:00:34 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59898BB for ; Mon, 6 Nov 2023 16:00:31 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-5bd6ac9833fso1170461a12.0 for ; Mon, 06 Nov 2023 16:00:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699315231; x=1699920031; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=megi+idfKyZxANurxPNtnWd6V7EyY7HllNmpRhBdpws=; b=Q+itk1AD7Pm7aEBCAnMDB8pgBZt1zrKPoygh3MsIPlcAC6twFZ3i5wDGy6cj6aZwVg Zjb7dlmKJrpQ/qhyD0TA/Ynf5kVXlZiexhrClSYTyzlG12Dry5HC/1wgSj70lc5HlX6R 7+dds4kALQeQv2+ndRrS/7pF1oMVm3re06VBc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699315231; x=1699920031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=megi+idfKyZxANurxPNtnWd6V7EyY7HllNmpRhBdpws=; b=aFyalITV5noUtad05Gh11JKcWEshmbzZJ/UotGfcy40wSj3yPpxEysYKqdexLbQTuW li3lTwJIyyFOJlsWxaul5khPpaeX3qyE4/c1xG28UonIp4Urjf2V3rGWlNDHaeEEDp76 UiDQMKQJseVAT4i46mRfi/RUwLCioWWdZcjqF1ChwKfw0m4SrQZ1znk0HBOcKEeylitf G8TfNyaohQFNUkf28MaBRn08X0qR+u3YMR521q31Sg/Wk7uQMyVEo08s133gE05BlcW+ IeDS59AoHklEy4dbnlaVH1pekHjhdFwKwQtd+mduEXc/aPMVskFWbueCMjLrYqWi6O3t T4bw== X-Gm-Message-State: AOJu0YxpRK/thyd70LF/gJ1eftVk0nXocpyF8p94GYDYsTPzHjyR2rSn skFN+6POHXbFl3zOO1213zNyuA== X-Received: by 2002:a05:6a21:4847:b0:181:ed8b:4823 with SMTP id au7-20020a056a21484700b00181ed8b4823mr9649364pzc.43.1699315230786; Mon, 06 Nov 2023 16:00:30 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id fw11-20020a17090b128b00b00268b439a0cbsm5852866pjb.23.2023.11.06.16.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:00:30 -0800 (PST) From: Hsin-Yi Wang To: Douglas Anderson Cc: Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v5 2/4] drm/panel-edp: drm/panel-edp: Add several generic edp panels Date: Mon, 6 Nov 2023 15:51:33 -0800 Message-ID: <20231107000023.2928195-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107000023.2928195-1-hsinyi@chromium.org> References: <20231107000023.2928195-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 06 Nov 2023 16:00:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781861297169954478 X-GMAIL-MSGID: 1781861297169954478 Add a few generic edp panels used by mt8186 chromebooks. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson --- v4->v5: seperate fixes patch --- drivers/gpu/drm/panel/panel-edp.c | 51 +++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index d41d205f7f5b..599a949d74d1 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1832,6 +1832,12 @@ static const struct panel_delay delay_200_500_e50 = { .enable = 50, }; +static const struct panel_delay delay_200_500_e80 = { + .hpd_absent = 200, + .unprepare = 500, + .enable = 80, +}; + static const struct panel_delay delay_200_500_e80_d50 = { .hpd_absent = 200, .unprepare = 500, @@ -1851,6 +1857,19 @@ static const struct panel_delay delay_200_500_e200 = { .enable = 200, }; +static const struct panel_delay delay_200_500_e200_d10 = { + .hpd_absent = 200, + .unprepare = 500, + .enable = 200, + .disable = 10, +}; + +static const struct panel_delay delay_200_150_e200 = { + .hpd_absent = 200, + .unprepare = 150, + .enable = 200, +}; + #define EDP_PANEL_ENTRY(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _delay, _name) \ { \ .name = _name, \ @@ -1871,37 +1890,69 @@ static const struct edp_panel_entry edp_panels[] = { EDP_PANEL_ENTRY('A', 'U', 'O', 0x145c, &delay_200_500_e50, "B116XAB01.4"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x1e9b, &delay_200_500_e50, "B133UAN02.1"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x1ea5, &delay_200_500_e50, "B116XAK01.6"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x208d, &delay_200_500_e50, "B140HTN02.1"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x235c, &delay_200_500_e50, "B116XTN02.3"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x239b, &delay_200_500_e50, "B116XAN06.1"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x255c, &delay_200_500_e50, "B116XTN02.5"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x403d, &delay_200_500_e50, "B140HAN04.0"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.0"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x582d, &delay_200_500_e50, "B133UAN01.0"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x615c, &delay_200_500_e50, "B116XAN06.1"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x635c, &delay_200_500_e50, "B116XAN06.3"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0x639c, &delay_200_500_e50, "B140HAK02.7"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x8594, &delay_200_500_e50, "B133UAN01.0"), + EDP_PANEL_ENTRY('A', 'U', 'O', 0xf390, &delay_200_500_e50, "B140XTN07.7"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0715, &delay_200_150_e200, "NT116WHM-N21"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0731, &delay_200_500_e80, "NT116WHM-N42"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0741, &delay_200_500_e200, "NT116WHM-N44"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x0786, &delay_200_500_p2e80, "NV116WHM-T01"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x07d1, &boe_nv133fhm_n61.delay, "NV133FHM-N61"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x07f6, &delay_200_500_e200, "NT140FHM-N44"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x082d, &boe_nv133fhm_n61.delay, "NV133FHM-N62"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x08b2, &delay_200_500_e200, "NT140WHM-N49"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x09c3, &delay_200_500_e50, "NT116WHM-N21,836X2"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x094b, &delay_200_500_e50, "NT116WHM-N21"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0951, &delay_200_500_e80, "NV116WHM-N47"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x095f, &delay_200_500_e50, "NE135FBM-N41 v8.1"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x0979, &delay_200_500_e50, "NV116WHM-N49 V8.0"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x098d, &boe_nv110wtm_n61.delay, "NV110WTM-N61"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x09ae, &delay_200_500_e200, "NT140FHM-N45"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x09dd, &delay_200_500_e50, "NT116WHM-N21"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x0a5d, &delay_200_500_e50, "NV116WHM-N45"), EDP_PANEL_ENTRY('B', 'O', 'E', 0x0ac5, &delay_200_500_e50, "NV116WHM-N4C"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0b43, &delay_200_500_e200, "NV140FHM-T09"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0b56, &delay_200_500_e80, "NT140FHM-N47"), + EDP_PANEL_ENTRY('B', 'O', 'E', 0x0c20, &delay_200_500_e80, "NT140FHM-N47"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1132, &delay_200_500_e80_d50, "N116BGE-EA2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1138, &innolux_n116bca_ea1.delay, "N116BCA-EA1-RC4"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1139, &delay_200_500_e80_d50, "N116BGE-EA2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1145, &delay_200_500_e80_d50, "N116BCN-EB1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x114c, &innolux_n116bca_ea1.delay, "N116BCA-EA1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1152, &delay_200_500_e80_d50, "N116BCN-EA1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1153, &delay_200_500_e80_d50, "N116BGE-EA2"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1154, &delay_200_500_e80_d50, "N116BCA-EA2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1157, &delay_200_500_e80_d50, "N116BGE-EA2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x115b, &delay_200_500_e80_d50, "N116BCN-EB1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1247, &delay_200_500_e80_d50, "N120ACA-EA1"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x142b, &delay_200_500_e80_d50, "N140HCA-EAC"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x144f, &delay_200_500_e80_d50, "N140HGA-EA1"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1468, &delay_200_500_e80, "N140HGA-EA1"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x14e5, &delay_200_500_e80_d50, "N140HGA-EA1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x14d4, &delay_200_500_e80_d50, "N140HCA-EAC"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x14d6, &delay_200_500_e80_d50, "N140BGA-EA4"), + + EDP_PANEL_ENTRY('H', 'K', 'C', 0x2d5c, &delay_200_500_e200, "MB116AN01-2"), + EDP_PANEL_ENTRY('I', 'V', 'O', 0x048e, &delay_200_500_e200_d10, "M116NWR6 R5"), EDP_PANEL_ENTRY('I', 'V', 'O', 0x057d, &delay_200_500_e200, "R140NWF5 RH"), EDP_PANEL_ENTRY('I', 'V', 'O', 0x854a, &delay_200_500_p2e100, "M133NW4J"), EDP_PANEL_ENTRY('I', 'V', 'O', 0x854b, &delay_200_500_p2e100, "R133NW4K-R0"), + EDP_PANEL_ENTRY('I', 'V', 'O', 0x8c4d, &delay_200_150_e200, "R140NWFM R1"), EDP_PANEL_ENTRY('K', 'D', 'B', 0x0624, &kingdisplay_kd116n21_30nv_a010.delay, "116N21-30NV-A010"), + EDP_PANEL_ENTRY('K', 'D', 'C', 0x0809, &delay_200_500_e50, "KD116N2930A15"), EDP_PANEL_ENTRY('K', 'D', 'B', 0x1120, &delay_200_500_e80_d50, "116N29-30NK-C007"), EDP_PANEL_ENTRY('S', 'H', 'P', 0x1511, &delay_200_500_e50, "LQ140M1JW48"), From patchwork Mon Nov 6 23:51:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 162233 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp3001723vqu; Mon, 6 Nov 2023 16:01:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IG1f11zjivAYCSGanPIlRh/CRsbr/x3RAZkXEfafcTXw0I34fMitpfcBhKvgOmWElyaWsdD X-Received: by 2002:a17:903:2306:b0:1cc:3357:2ee8 with SMTP id d6-20020a170903230600b001cc33572ee8mr25392880plh.25.1699315304931; Mon, 06 Nov 2023 16:01:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699315304; cv=none; d=google.com; s=arc-20160816; b=gNXDf8TDgpiaLuxLIcm1Fz0iJcxZ9KyT4aSraSaiBdL66crxrQ+vqPqB7swT4IVPrc +2kUxI9fy6wNrOscK78cAW2L0LQLHh1T7lbmutB/1dH3w7EuUC35JoRc1iW4E51c9Brv mYWR5LQHFKIuK04nl/NaX0bWVezeebWPrTjQbYqu+ucyVNCz48IlOhm2JRpGQT9RHR0m Xn8RNt6woI7n0oJaS+1QBC4bs0oIenQ3f3Blv1Okh7uQxAbnDx8uDt/mi5Pla7Hh3Bad aqRkC1j8id8nux2MpE8sTPJc9Dg7XXK70IqrPfNblut/Wm5yj08AMIJW1fiz8o12L1k7 agvA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nExiIqIE5poHUcHshO31rcWQ0P0GIrJm7ZyDGwrfXOM=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=aLTmQVxU+hiTij1J4jzTKOsr1MkIUJYUzMFZ0kR4dmuhiBxLSC3vYC5sZyx6cVCTtv eznS9h8ZCq8HyImlfeyZhg0pzkkh/Xu7z9xV8lB2KBoZkW+78CfZL8AhOiZuExz0Euz3 X8AJJxnoCu6ac2CQTEPgD4rfd6lxhV1tWfIYREhwwWJtWaB6MMciWRPRNIwY3NKxrOyN xXeT9wync64YNDJLsqbnwkj9HA5ympuxv6nPrskfE8D83KEuuTv+DRE3AD/8SP4sG+TN MQId4mmxKxRaxfKouF2WWnKmacEIZ4cp/FIxKijfEVM4bVQ/W2sR5eu3rgQFBRsRUsAk aQsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=di7VKaUx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id u14-20020a17090341ce00b001c9ca0167e2si10221556ple.420.2023.11.06.16.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:01:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=di7VKaUx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 4E4D180984A5; Mon, 6 Nov 2023 16:01:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233453AbjKGAAn (ORCPT + 33 others); Mon, 6 Nov 2023 19:00:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233324AbjKGAAf (ORCPT ); Mon, 6 Nov 2023 19:00:35 -0500 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86D40125 for ; Mon, 6 Nov 2023 16:00:32 -0800 (PST) Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-5bd099e3d3cso3203088a12.1 for ; Mon, 06 Nov 2023 16:00:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699315232; x=1699920032; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nExiIqIE5poHUcHshO31rcWQ0P0GIrJm7ZyDGwrfXOM=; b=di7VKaUxngbg8IQhlM8x2RHuBEEsryoe0ZvybcK2NlieybH6aIAjnllIA6lHNZ386s KP1AvoOrPrDe/A2UuThOMDr5JBF3+nnmxiR0sOObW0IVYaliNPQ7Kncb2FTeHkIJ0pAU y4HsMW4qPYVMC/HnrkglFei1MI+fFSJXKx7Oo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699315232; x=1699920032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nExiIqIE5poHUcHshO31rcWQ0P0GIrJm7ZyDGwrfXOM=; b=pB8sgpokWEmoOpEXmA4k3bonl8nRGpzpL/iScXvvEiPsR4a8jtEtBnayikvDdYzRAK qC0aCgzIvF+KA8P5mWzPQ0pdmHmMUxBRmUoNITnt4Sa1PhhIX+1F+RluAIbgHgbJT3+T 2by+XgP8EgFh6yShMFL7wwwmtX2BlTLHrbqAQhDvXDkqfaAsO1XGa6o/HOtaPbL4Su/U ShXm0LEWRn0ZCOW8+sgUlY5+ThHUqjIfM9gMe1vGXXBL5RzVRtuxPTSimINTeNW6KJoo uznx2kZOSXdWmTI2nahqbblNuq+7OkphbE3IcLInQAlOvxFjqCyXX+baSwfJu3kKRALw 3BAQ== X-Gm-Message-State: AOJu0YxxWfV3ZyvjNsPRY5hcxUAHTdIvcPcXH1HjlNRuY41ZvtDGj667 HQOloENw5H+6+xfxEu3UXxyOfQ== X-Received: by 2002:a17:90b:3746:b0:280:c85d:450 with SMTP id ne6-20020a17090b374600b00280c85d0450mr11795381pjb.44.1699315231923; Mon, 06 Nov 2023 16:00:31 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id fw11-20020a17090b128b00b00268b439a0cbsm5852866pjb.23.2023.11.06.16.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:00:31 -0800 (PST) From: Hsin-Yi Wang To: Douglas Anderson Cc: Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v5 3/4] drm/panel-edp: Add override_edid_mode quirk for generic edp Date: Mon, 6 Nov 2023 15:51:34 -0800 Message-ID: <20231107000023.2928195-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107000023.2928195-1-hsinyi@chromium.org> References: <20231107000023.2928195-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 06 Nov 2023 16:01:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781861245148174272 X-GMAIL-MSGID: 1781861245148174272 Generic edp gets mode from edid. However, some panels report incorrect mode in this way, resulting in glitches on panel. Introduce a new quirk additional_mode to the generic edid to pick a correct hardcoded mode. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson --- v4->v5: fix coding style comments from v4. --- drivers/gpu/drm/panel/panel-edp.c | 67 ++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 599a949d74d1..c0c24d94c3a0 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -203,6 +203,9 @@ struct edp_panel_entry { /** @name: Name of this panel (for printing to logs). */ const char *name; + + /** @override_edid_mode: Override the mode obtained by edid. */ + const struct drm_display_mode *override_edid_mode; }; struct panel_edp { @@ -301,6 +304,24 @@ static unsigned int panel_edp_get_display_modes(struct panel_edp *panel, return num; } +static int panel_edp_override_edid_mode(struct panel_edp *panel, + struct drm_connector *connector, + const struct drm_display_mode *override_mode) +{ + struct drm_display_mode *mode; + + mode = drm_mode_duplicate(connector->dev, override_mode); + if (!mode) { + dev_err(panel->base.dev, "failed to add additional mode\n"); + return 0; + } + + mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + drm_mode_set_name(mode); + drm_mode_probed_add(connector, mode); + return 1; +} + static int panel_edp_get_non_edid_modes(struct panel_edp *panel, struct drm_connector *connector) { @@ -568,6 +589,9 @@ static int panel_edp_get_modes(struct drm_panel *panel, { struct panel_edp *p = to_panel_edp(panel); int num = 0; + bool has_override_edid_mode = p->detected_panel && + p->detected_panel != ERR_PTR(-EINVAL) && + p->detected_panel->override_edid_mode; /* probe EDID if a DDC bus is available */ if (p->ddc) { @@ -575,9 +599,18 @@ static int panel_edp_get_modes(struct drm_panel *panel, if (!p->edid) p->edid = drm_get_edid(connector, p->ddc); - - if (p->edid) - num += drm_add_edid_modes(connector, p->edid); + if (p->edid) { + if (has_override_edid_mode) { + /* + * override_edid_mode is specified. Use + * override_edid_mode instead of from edid. + */ + num += panel_edp_override_edid_mode(p, connector, + p->detected_panel->override_edid_mode); + } else { + num += drm_add_edid_modes(connector, p->edid); + } + } pm_runtime_mark_last_busy(panel->dev); pm_runtime_put_autosuspend(panel->dev); @@ -950,6 +983,19 @@ static const struct panel_desc auo_b101ean01 = { }, }; +static const struct drm_display_mode auo_b116xa3_mode = { + .clock = 70589, + .hdisplay = 1366, + .hsync_start = 1366 + 40, + .hsync_end = 1366 + 40 + 40, + .htotal = 1366 + 40 + 40 + 32, + .vdisplay = 768, + .vsync_start = 768 + 10, + .vsync_end = 768 + 10 + 12, + .vtotal = 768 + 10 + 12 + 6, + .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, +}; + static const struct drm_display_mode auo_b116xak01_mode = { .clock = 69300, .hdisplay = 1366, @@ -1878,6 +1924,15 @@ static const struct panel_delay delay_200_150_e200 = { .delay = _delay \ } +#define EDP_PANEL_ENTRY2(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _delay, _name, _mode) \ +{ \ + .name = _name, \ + .panel_id = drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2, \ + product_id), \ + .delay = _delay, \ + .override_edid_mode = _mode \ +} + /* * This table is used to figure out power sequencing delays for panels that * are detected by EDID. Entries here may point to entries in the @@ -1895,9 +1950,11 @@ static const struct edp_panel_entry edp_panels[] = { EDP_PANEL_ENTRY('A', 'U', 'O', 0x239b, &delay_200_500_e50, "B116XAN06.1"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x255c, &delay_200_500_e50, "B116XTN02.5"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x403d, &delay_200_500_e50, "B140HAN04.0"), - EDP_PANEL_ENTRY('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.0"), + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.0", + &auo_b116xa3_mode), EDP_PANEL_ENTRY('A', 'U', 'O', 0x582d, &delay_200_500_e50, "B133UAN01.0"), - EDP_PANEL_ENTRY('A', 'U', 'O', 0x615c, &delay_200_500_e50, "B116XAN06.1"), + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x615c, &delay_200_500_e50, "B116XAN06.1", + &auo_b116xa3_mode), EDP_PANEL_ENTRY('A', 'U', 'O', 0x635c, &delay_200_500_e50, "B116XAN06.3"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x639c, &delay_200_500_e50, "B140HAK02.7"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x8594, &delay_200_500_e50, "B133UAN01.0"), From patchwork Mon Nov 6 23:51:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 162235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp3002223vqu; Mon, 6 Nov 2023 16:02:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMGXRjARZqUR8GiuNrhHvTZ8MzTWPeML0yA5lLcGE0erl+yZtRbDLXKARcDPMgTjoHkx5i X-Received: by 2002:a05:6a20:1587:b0:16b:d137:de59 with SMTP id h7-20020a056a20158700b0016bd137de59mr38479828pzj.28.1699315353347; Mon, 06 Nov 2023 16:02:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699315353; cv=none; d=google.com; s=arc-20160816; b=A9gC1s1ICDQaqQ5751ZZiNnoIqMkX88S5ch4e9YViP2+/EKeumUv/2inr8K5XwcHIu C7QX0QVd3JaESESxP3pRh253rT674wDiTipCoAr3SKQA7TNojmnwSC7hJ0GLgI1tcUro qZR/Fa1xc7knDAyhLv/2JyS3eHBNdRnUzxsH/eq6cJqFPOT0Kj/Fug+PSp4D5/3lx951 nEMV/rSE7tjlNDL0PvlpGHyCd87du50LXHnp6uRBBDtv4lwhR54mokle0xVd7AGawF9L Cf5yHSZnPVcUwA0HU53OHAAmZ4X5r6pPrNuzpGQKKrfy29x9gJVkvMC+TY7X6PuRGqbb Htig== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9SxHcJHXQ0Dgu/1LSV/bZ2Cmouuh15UgwvxxZf23/GE=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=O3bKVX9vVxWFuymwUYHmg0CdSkDDA6j8OtP6lz9tEy2nTPOA9kmO/ipIa4jiSTQDIs M4N6wm+X0cHH+dPneBCoZnLhsnP6EnABtQ5FHKw/XuE6QYtxbWhYp/svjXSqeAB7XP1L rCtJts3bM2J/TU2gLG/kZQzl1QXdFNcavTJ927Y2+Ik3pTzP6OyDb0BZGVaO6nqHCe08 Ex3P/+j/LKkhjRDt8inAKQeXWEdXQQ35wkM2x2Q2wLMhNee/dJH9R7BPSfjCkGb/yZVW xs8vJD19Vyn1X1KgKCbQuyh72pZE744cu5tZDnL+lvqjRIPOWoHPjibpITSIBNL3wKLO U5Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Fg8IxiPH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id r136-20020a632b8e000000b005a9f776c57dsi764853pgr.644.2023.11.06.16.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:02:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Fg8IxiPH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 156C2805F9C9; Mon, 6 Nov 2023 16:00:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233470AbjKGAAp (ORCPT + 33 others); Mon, 6 Nov 2023 19:00:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233390AbjKGAAg (ORCPT ); Mon, 6 Nov 2023 19:00:36 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E309B6 for ; Mon, 6 Nov 2023 16:00:33 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5b9a7357553so3949435a12.0 for ; Mon, 06 Nov 2023 16:00:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699315233; x=1699920033; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9SxHcJHXQ0Dgu/1LSV/bZ2Cmouuh15UgwvxxZf23/GE=; b=Fg8IxiPHgClq5gddwW56nUKr9WjyiaYICR5LmF59h+UY9CE4YKZLzeKY4R3YEanS1Z LFdMQYhr4KSfgtU94qHpT22ifIwiASpsaUiOM5+zYMP0f9ornSz60hZvebXEGqsWlwIm NwTfSQTQ1QidMmMjuj8FfhACy4mqLeCacxpzA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699315233; x=1699920033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9SxHcJHXQ0Dgu/1LSV/bZ2Cmouuh15UgwvxxZf23/GE=; b=jDTaQZPvMe1ThaeAfiJ5siIGTuOb2ILoHmNuDF/Mp/PeCh/VIpK1xcEeFsLZr44Abi jkjmj75GoAIToBqBy8R8HJXEa1Ov12nhPwtBUqXzg7pHR4rySP95Winzi9k9/yINnGg5 u63VZxewxMH8Jnl6NdCpPQ1uaJ//2U2Ul2rXj0Fbvdq14vF6C1PFiW2CSv2fGD91NyWZ +PdcgSzjYjhjw2VaOdM/hV8AjRiA4zO5lljbHCN1GLqJi26MZloogJmSirvofrbXp3Uk SuU3KhXGDvM6oPbCtp9oYxGD3baC1bNsdD0Jm4LBpK2k0sJf+tzVTuFzzuOWeNriJYW/ 08hQ== X-Gm-Message-State: AOJu0Yx+ESuYKFDX1Ko609t7JBj06vvFQTMYZu8rJNLkA3rl5iKimG5q WdLYpGfK5R9orsSd+LyyQhw9OQ== X-Received: by 2002:a05:6a21:790b:b0:181:125:e85c with SMTP id bg11-20020a056a21790b00b001810125e85cmr23690070pzc.53.1699315232986; Mon, 06 Nov 2023 16:00:32 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id fw11-20020a17090b128b00b00268b439a0cbsm5852866pjb.23.2023.11.06.16.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:00:32 -0800 (PST) From: Hsin-Yi Wang To: Douglas Anderson Cc: Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v5 4/4] drm/panel-edp: Avoid adding multiple preferred modes Date: Mon, 6 Nov 2023 15:51:35 -0800 Message-ID: <20231107000023.2928195-5-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107000023.2928195-1-hsinyi@chromium.org> References: <20231107000023.2928195-1-hsinyi@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 06 Nov 2023 16:00:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781861295941422368 X-GMAIL-MSGID: 1781861295941422368 If a non generic edp-panel is under aux-bus, the mode read from edid would still be selected as preferred and results in multiple preferred modes, which is ambiguous. If both hard-coded mode and edid exists, only add mode from hard-coded. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson --- v4->v5: remove inapplicable comments. --- drivers/gpu/drm/panel/panel-edp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index c0c24d94c3a0..006939cc3fee 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -589,6 +589,7 @@ static int panel_edp_get_modes(struct drm_panel *panel, { struct panel_edp *p = to_panel_edp(panel); int num = 0; + bool has_hard_coded_modes = p->desc->num_timings || p->desc->num_modes; bool has_override_edid_mode = p->detected_panel && p->detected_panel != ERR_PTR(-EINVAL) && p->detected_panel->override_edid_mode; @@ -599,7 +600,11 @@ static int panel_edp_get_modes(struct drm_panel *panel, if (!p->edid) p->edid = drm_get_edid(connector, p->ddc); - if (p->edid) { + /* + * If both edid and hard-coded modes exists, skip edid modes to + * avoid multiple preferred modes. + */ + if (p->edid && !has_hard_coded_modes) { if (has_override_edid_mode) { /* * override_edid_mode is specified. Use @@ -616,12 +621,7 @@ static int panel_edp_get_modes(struct drm_panel *panel, pm_runtime_put_autosuspend(panel->dev); } - /* - * Add hard-coded panel modes. Don't call this if there are no timings - * and no modes (the generic edp-panel case) because it will clobber - * the display_info that was already set by drm_add_edid_modes(). - */ - if (p->desc->num_timings || p->desc->num_modes) + if (has_hard_coded_modes) num += panel_edp_get_non_edid_modes(p, connector); else if (!num) dev_warn(p->base.dev, "No display modes\n");