From nobody Wed Dec 31 04:54:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A087FC4167D for ; Tue, 7 Nov 2023 20:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343883AbjKGUqY (ORCPT ); Tue, 7 Nov 2023 15:46:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234488AbjKGUqV (ORCPT ); Tue, 7 Nov 2023 15:46:21 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F5A3137 for ; Tue, 7 Nov 2023 12:46:19 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6b2018a11efso6250069b3a.0 for ; Tue, 07 Nov 2023 12:46:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699389979; x=1699994779; 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=DfxpAYOWmleR8K355O3R14aCnteWRdFE5O9l2OhvQSo=; b=Ijk4D8eubXCqvIJ7oCth+BKcSlqrIyOBDb+81HvzbcDSwPmwEO20vW9pLMBF3dXe3l ukJFoqQBVhMj31s164Qj/8vpF/sQ+O25/AgTb29uf0m9NzZMuAB6FbK92Ir1AiEbuRbo bhUWSbALuI05aLJejgTBnyRCFq2XlJ0UoFh5g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699389979; x=1699994779; 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=DfxpAYOWmleR8K355O3R14aCnteWRdFE5O9l2OhvQSo=; b=RcnYJ2ZmlryxCLwN1JObpq60AY9MRZq8x7T8jdXukm9DavU21Nb00X7Sbk81F0v+a3 QRVPa3PB2spigCY1h1Tse2BgFuKzUpjVHtbL0ZsqkoJjRD3/2I2kO/Xc3PO0k4QZkqQG iDM5hX4InEnButSjUdvbb7cOrU5ifyWXyqbuSdlhVxgyuDJtGYwcikIJ+rjSqCSF78tu 1KxZKHZpp9PWCwApn4DbgRAV74lYDNlxx/RQYDPm3Cc1HdyTpcioP/uisaJqCHzcn59r f8SsG9zc0JU0abDD9lLKTtH95fx0GS0jsnflSIc8CMlMNIsQDIMgPk2+0wgu/1CueJXd L1Tg== X-Gm-Message-State: AOJu0YyQ64P/Hk5ZwEiqrROL/9gToAHOj+OdHhWtA+vUTK03bIJxyRXM +9XXLtuyvI7/s7FVlkMgedanfw== X-Google-Smtp-Source: AGHT+IGsveKs3LwTQ3bVZb/XOA2HeSV60NxgDj9v7CvUPzNo+vvUKGEt1p5IB2LltiYD/vVyUmpTdQ== X-Received: by 2002:a05:6a00:234f:b0:68a:5cf8:dac5 with SMTP id j15-20020a056a00234f00b0068a5cf8dac5mr129018pfj.22.1699389978852; Tue, 07 Nov 2023 12:46:18 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id e7-20020a630f07000000b005ab46970aaasm1750211pgl.17.2023.11.07.12.46.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:18 -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 v6 1/5] drm/panel-edp: drm/panel-edp: Fix AUO B116XAK01 name and timing Date: Tue, 7 Nov 2023 12:41:51 -0800 Message-ID: <20231107204611.3082200-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107204611.3082200-1-hsinyi@chromium.org> References: <20231107204611.3082200-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename AUO 0x405c B116XAK01 to B116XAK01.0 and adjust the timing of auo_b116xak01: T3=3D200, T12=3D500, T7_max =3D 50 according to decoding edid and datasheet. Fixes: da458286a5e2 ("drm/panel: Add support for AUO B116XAK01 panel") Cc: stable@vger.kernel.org Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson Acked-by: Maxime Ripard --- v5->v6: split to 2 patches. --- drivers/gpu/drm/panel/panel-edp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index 9dce4c702414..2fba7c1f49ce 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 =3D { }, .delay =3D { .hpd_absent =3D 200, + .unprepare =3D 500, + .enable =3D 50, }, }; =20 @@ -1870,7 +1872,7 @@ static const struct edp_panel_entry edp_panels[] =3D { 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', 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"), --=20 2.42.0.869.gea05f2083d-goog From nobody Wed Dec 31 04:54:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F75EC4332F for ; Tue, 7 Nov 2023 20:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343952AbjKGUq3 (ORCPT ); Tue, 7 Nov 2023 15:46:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234238AbjKGUqW (ORCPT ); Tue, 7 Nov 2023 15:46:22 -0500 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A18F210CC for ; Tue, 7 Nov 2023 12:46:20 -0800 (PST) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1ef9f1640a5so3564985fac.3 for ; Tue, 07 Nov 2023 12:46:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699389980; x=1699994780; 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=i41FF+96jxQO4vU9afEGpgkE+iKipgdZiL7y6ifmJls=; b=UDuhrvu0UI1ueoWgWJuOtaOoZTb7tQLGgVh4moYTDhh6Ujm/I4sJZ7WtXpB/emeIjY VOrZW4HT3xIIw8q/Nt10TBHBxQX9cph7Aias3sR8jN0ON1wZM+8FXTxWHOo/rDHLsXRn EvkjA9zDsV+2IQgjdNsT/XAWXHl8Wf1Esh6wY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699389980; x=1699994780; 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=i41FF+96jxQO4vU9afEGpgkE+iKipgdZiL7y6ifmJls=; b=j28W45zurjDVvT7UByL/DKaKu9Pq3xUwylpbKzhIvYvZQ60kLN0ePYrzR09mraw4RP JwxTIyaPX7rk6igzGGWR45e1zpcZ5Sy19HIM9/M34Kvwww4bVAR62Ce8tQCXL7Sj/yGi bNAOr5Je4rJU5cY118Q5gfuY2/enzIt7cUNMuS4kJ7uqsPdbbexDOVoJLb89YGjYaiHF dWoOVqHb30KgpbecfHzeg+Jnr1C+rxnl+qutUwpLxlNcv8sfasN5avA+NkBVP7xfOZUK j5aq68Cac7LsW2KfMY1hLGY6G6b3uOaISEI4VhLgLSiThu/yoj31HADS56+y8VQj6ji8 BcLQ== X-Gm-Message-State: AOJu0YxNpOVeiB+fCR2vLrL2oNZzV778mllu2RH68RPf+w75CFFEkWUX agh1SPuNg0mnX495cX/YNvv/zg== X-Google-Smtp-Source: AGHT+IEOYtRda4YV3C9U3Tghr/ogU7feGJsqqa94Akf8g04V9mLzXLDXBiz0ZBVMNFxEnBunA5AcfA== X-Received: by 2002:a05:6870:4c85:b0:1ea:131f:5fb7 with SMTP id pi5-20020a0568704c8500b001ea131f5fb7mr4815336oab.26.1699389979943; Tue, 07 Nov 2023 12:46:19 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id e7-20020a630f07000000b005ab46970aaasm1750211pgl.17.2023.11.07.12.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:19 -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 v6 2/5] drm/panel-edp: drm/panel-edp: Fix AUO B116XTN02 name Date: Tue, 7 Nov 2023 12:41:52 -0800 Message-ID: <20231107204611.3082200-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107204611.3082200-1-hsinyi@chromium.org> References: <20231107204611.3082200-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename AUO 0x235c B116XTN02 to B116XTN02.3 according to decoding edid. Fixes: 3db2420422a5 ("drm/panel-edp: Add AUO B116XTN02, BOE NT116WHM-N21,83= 6X2, NV116WHM-N49 V8.0") Cc: stable@vger.kernel.org Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson Acked-by: Maxime Ripard --- v5->v6: split to 2 patches. --- drivers/gpu/drm/panel/panel-edp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index 2fba7c1f49ce..d41d205f7f5b 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1871,7 +1871,7 @@ static const struct edp_panel_entry edp_panels[] =3D { 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', 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"), --=20 2.42.0.869.gea05f2083d-goog From nobody Wed Dec 31 04:54:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96F1EC4167D for ; Tue, 7 Nov 2023 20:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343999AbjKGUqd (ORCPT ); Tue, 7 Nov 2023 15:46:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343784AbjKGUqY (ORCPT ); Tue, 7 Nov 2023 15:46:24 -0500 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB468137 for ; Tue, 7 Nov 2023 12:46:21 -0800 (PST) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1f03db0a410so3730323fac.1 for ; Tue, 07 Nov 2023 12:46:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699389981; x=1699994781; 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=PpHS/LBFZbf/UTq/uL6m+esGIqX7QNRVv1WgI8K7Qww=; b=N2Jo9D7tNjRTfWqvDTieSjgO+WyxQoy6CMZ7eQ/UeG8X9+vSQkgSYx9fiPorGdgEKV 3uMiyCsW+9Z4N5ruCOKRutA3eOdNhfTWK4BZNPSk2BbxKnU42KpOvAyLUUSpc+xGgNuM DHmhA/Gnv9r2L5rYTMttzhSbc8JIrXOwGO48I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699389981; x=1699994781; 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=PpHS/LBFZbf/UTq/uL6m+esGIqX7QNRVv1WgI8K7Qww=; b=XKoROJv3yPR5I2o2BFx/Q7i+FndZy5qmRNY+kbljD5tKv5bS00tbg96E2qCokkglk3 atVnqbQezGmymkk3tyYOQnD8YwC9RniGdVU3G4DK+8Q9Yo7E/Nan0hGGut6o9QbZvQ2D WlXouTLEK2ZGWIgfLqvR47j9oIQl/t4alLLGKSYAMOY20olXaNAC5778PFPplFkjlf0S Ri6Fdm16qc1bocNuRo2mPflZlYbe5IXgI+78uSrbgN9Jj2HTygJceEek4IyQ2Bg0UkiV 5r03E1QjRVZ1WxYwiqX4H9XUnHd6uFfExC6a/QiA/OupN+HYQx2R7Qzvrez4KGKo2m5f XQIg== X-Gm-Message-State: AOJu0YzUTtJ5B7Vv9KFsVYmXy+4iKKw7vJQyQtfeM2GAp/HGc894NroA 9cNQRe+8EWOSlFBx/uN5ZRm5Yg== X-Google-Smtp-Source: AGHT+IG/myymL9GoL3WEGcL390V5Cd0FJi3fQ1GxDN08NqBDrqQlRbCsP2R41RXdxWywrx7lx90uRQ== X-Received: by 2002:a05:6870:9597:b0:1e9:c28f:45ba with SMTP id k23-20020a056870959700b001e9c28f45bamr4410028oao.16.1699389981125; Tue, 07 Nov 2023 12:46:21 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id e7-20020a630f07000000b005ab46970aaasm1750211pgl.17.2023.11.07.12.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:20 -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 v6 3/5] drm/panel-edp: drm/panel-edp: Add several generic edp panels Date: Tue, 7 Nov 2023 12:41:53 -0800 Message-ID: <20231107204611.3082200-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107204611.3082200-1-hsinyi@chromium.org> References: <20231107204611.3082200-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a few generic edp panels used by mt8186 chromebooks. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson Acked-by: Maxime Ripard --- no change. --- 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/pane= l-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 = =3D { .enable =3D 50, }; =20 +static const struct panel_delay delay_200_500_e80 =3D { + .hpd_absent =3D 200, + .unprepare =3D 500, + .enable =3D 80, +}; + static const struct panel_delay delay_200_500_e80_d50 =3D { .hpd_absent =3D 200, .unprepare =3D 500, @@ -1851,6 +1857,19 @@ static const struct panel_delay delay_200_500_e200 = =3D { .enable =3D 200, }; =20 +static const struct panel_delay delay_200_500_e200_d10 =3D { + .hpd_absent =3D 200, + .unprepare =3D 500, + .enable =3D 200, + .disable =3D 10, +}; + +static const struct panel_delay delay_200_150_e200 =3D { + .hpd_absent =3D 200, + .unprepare =3D 150, + .enable =3D 200, +}; + #define EDP_PANEL_ENTRY(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _d= elay, _name) \ { \ .name =3D _name, \ @@ -1871,37 +1890,69 @@ static const struct edp_panel_entry edp_panels[] = =3D { 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"), =20 + 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-T0= 1"), 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"= ), =20 + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1132, &delay_200_500_e80_d50, "N116BGE-E= A2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1138, &innolux_n116bca_ea1.delay, "N116B= CA-EA1-RC4"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1139, &delay_200_500_e80_d50, "N116BGE-E= A2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1145, &delay_200_500_e80_d50, "N116BCN-E= B1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x114c, &innolux_n116bca_ea1.delay, "N116B= CA-EA1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1152, &delay_200_500_e80_d50, "N116BCN-E= A1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1153, &delay_200_500_e80_d50, "N116BGE-E= A2"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1154, &delay_200_500_e80_d50, "N116BCA-E= A2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x1157, &delay_200_500_e80_d50, "N116BGE-E= A2"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x115b, &delay_200_500_e80_d50, "N116BCN-E= B1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x1247, &delay_200_500_e80_d50, "N120ACA-E= A1"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x142b, &delay_200_500_e80_d50, "N140HCA-E= AC"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x144f, &delay_200_500_e80_d50, "N140HGA-E= A1"), + 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-E= A1"), EDP_PANEL_ENTRY('C', 'M', 'N', 0x14d4, &delay_200_500_e80_d50, "N140HCA-E= AC"), + EDP_PANEL_ENTRY('C', 'M', 'N', 0x14d6, &delay_200_500_e80_d50, "N140BGA-E= A4"), + + EDP_PANEL_ENTRY('H', 'K', 'C', 0x2d5c, &delay_200_500_e200, "MB116AN01-2"= ), =20 + 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-R= 0"), + EDP_PANEL_ENTRY('I', 'V', 'O', 0x8c4d, &delay_200_150_e200, "R140NWFM R1"= ), =20 EDP_PANEL_ENTRY('K', 'D', 'B', 0x0624, &kingdisplay_kd116n21_30nv_a010.de= lay, "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-30= NK-C007"), =20 EDP_PANEL_ENTRY('S', 'H', 'P', 0x1511, &delay_200_500_e50, "LQ140M1JW48"), --=20 2.42.0.869.gea05f2083d-goog From nobody Wed Dec 31 04:54:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C9B5C4332F for ; Tue, 7 Nov 2023 20:46:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343811AbjKGUqh (ORCPT ); Tue, 7 Nov 2023 15:46:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343923AbjKGUqZ (ORCPT ); Tue, 7 Nov 2023 15:46:25 -0500 Received: from mail-oo1-xc33.google.com (mail-oo1-xc33.google.com [IPv6:2607:f8b0:4864:20::c33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA5F710DA for ; Tue, 7 Nov 2023 12:46:22 -0800 (PST) Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-586940ee5a5so3115791eaf.0 for ; Tue, 07 Nov 2023 12:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699389982; x=1699994782; 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=IVj66de+ZU4J9B/JF+Kuq5s4IrsGcC8ZccXdAT8ojUQ=; b=dQ9ny+J5se6mk/zmI8+Sk1x8Yx0u348RvKK/irMbfXRS/RU3T8JR/KXTPaVK++1Q1x vFMvfYTYjVKzm0EIp/5pO82ZtFpcc58jMRAMrCG+rrsh87aF02imWt3TE9vxR7OtqM+3 i+mUWmtd7L0iVK34Y7xNE4e+Sd9NeY4YbU73k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699389982; x=1699994782; 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=IVj66de+ZU4J9B/JF+Kuq5s4IrsGcC8ZccXdAT8ojUQ=; b=qQ4KnDQE4+dDidM0PBaSTS+bLeIfUgBSPS6JNej6O+E+rxtMVB7shIWmMvKKqSOdd1 2dSQFMRQH9raX9rK92amr/u9APQa4LYgxasAoviMSRoHGUotEdhBUWl+CQEHQHxxPQ/+ ZqPYIAZucf+lsIKfCDnNutEZLScbmIgLs/X3sedTA5EvVfIqMbQ9y7GaGeQnhcIpPVU8 cEj/mO0un5sSx2wqnljPhr5v9C/5BODDd6LbWLiD7nWetu/U4VwegH+Z2kepGJIxdUo/ qrLxqNqt5Uq0oN00EGvcnzcx4siPFEnhn8iFT/fU18YZv/tHIqhRIhGDR6LwCYUeWV1n 6v7w== X-Gm-Message-State: AOJu0YwGnZ9f9TD7AaKrfovmDM5RVCkZ+6rOyQm8zGMUeBB2y54IfxAB KuAmbPjgASx0KXHQowhsLy5FgQ== X-Google-Smtp-Source: AGHT+IH6Uv7JYUwdo8yfcbwEsukaVGH7H5Mp4LMP/0UAQPwSErHm8Mj7dKVdObFZWp5sdD6x9EhSTw== X-Received: by 2002:a05:6358:786:b0:169:4c8a:7ebf with SMTP id n6-20020a056358078600b001694c8a7ebfmr44973063rwj.7.1699389982185; Tue, 07 Nov 2023 12:46:22 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id e7-20020a630f07000000b005ab46970aaasm1750211pgl.17.2023.11.07.12.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:21 -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 v6 4/5] drm/panel-edp: Add override_edid_mode quirk for generic edp Date: Tue, 7 Nov 2023 12:41:54 -0800 Message-ID: <20231107204611.3082200-5-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107204611.3082200-1-hsinyi@chromium.org> References: <20231107204611.3082200-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- no change. --- 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/pane= l-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 { =20 /** @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; }; =20 struct panel_edp { @@ -301,6 +304,24 @@ static unsigned int panel_edp_get_display_modes(struct= panel_edp *panel, return num; } =20 +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 =3D drm_mode_duplicate(connector->dev, override_mode); + if (!mode) { + dev_err(panel->base.dev, "failed to add additional mode\n"); + return 0; + } + + mode->type |=3D 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 =3D to_panel_edp(panel); int num =3D 0; + bool has_override_edid_mode =3D p->detected_panel && + p->detected_panel !=3D ERR_PTR(-EINVAL) && + p->detected_panel->override_edid_mode; =20 /* 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, =20 if (!p->edid) p->edid =3D drm_get_edid(connector, p->ddc); - - if (p->edid) - num +=3D 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 +=3D panel_edp_override_edid_mode(p, connector, + p->detected_panel->override_edid_mode); + } else { + num +=3D drm_add_edid_modes(connector, p->edid); + } + } =20 pm_runtime_mark_last_busy(panel->dev); pm_runtime_put_autosuspend(panel->dev); @@ -950,6 +983,19 @@ static const struct panel_desc auo_b101ean01 =3D { }, }; =20 +static const struct drm_display_mode auo_b116xa3_mode =3D { + .clock =3D 70589, + .hdisplay =3D 1366, + .hsync_start =3D 1366 + 40, + .hsync_end =3D 1366 + 40 + 40, + .htotal =3D 1366 + 40 + 40 + 32, + .vdisplay =3D 768, + .vsync_start =3D 768 + 10, + .vsync_end =3D 768 + 10 + 12, + .vtotal =3D 768 + 10 + 12 + 6, + .flags =3D DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, +}; + static const struct drm_display_mode auo_b116xak01_mode =3D { .clock =3D 69300, .hdisplay =3D 1366, @@ -1878,6 +1924,15 @@ static const struct panel_delay delay_200_150_e200 = =3D { .delay =3D _delay \ } =20 +#define EDP_PANEL_ENTRY2(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _= delay, _name, _mode) \ +{ \ + .name =3D _name, \ + .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2= , \ + product_id), \ + .delay =3D _delay, \ + .override_edid_mode =3D _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[] =3D= { 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"), --=20 2.42.0.869.gea05f2083d-goog From nobody Wed Dec 31 04:54:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00493C4332F for ; Tue, 7 Nov 2023 20:46:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344053AbjKGUqm (ORCPT ); Tue, 7 Nov 2023 15:46:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234488AbjKGUq0 (ORCPT ); Tue, 7 Nov 2023 15:46:26 -0500 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D617F10DB for ; Tue, 7 Nov 2023 12:46:23 -0800 (PST) Received: by mail-oi1-x22f.google.com with SMTP id 5614622812f47-3b2ec9a79bdso4213259b6e.3 for ; Tue, 07 Nov 2023 12:46:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699389983; x=1699994783; 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=91MByGmQVl2taa6i/AdbRt3neF5iZF/QU7vQ/CbO+ic=; b=QMWK1Y2sL1M8kS8g8pkP6ydMYFQ+WRaw58mPq7S/x6YIy0XyxA506a0M/nmHlD0YqV 4z2ZArku/fMtQqAv8aVQfBW5gWpSWRMQT+Km9PIBB/BNMDq7kaWstvAKbrLmbBKy60C9 WXRC3dw9Llgya3yRDkXQNlvgTI4we0+HqKpv0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699389983; x=1699994783; 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=91MByGmQVl2taa6i/AdbRt3neF5iZF/QU7vQ/CbO+ic=; b=P+7KNXn1v8DNMPGZ8tPmOmU+WlsDhe/+xUTAf1yLlOeB1gF7twjWt9bcolpyh+MFvU ecSv2vynUQ+O0mntjaqWYMH1SELqlEq4c2p7MiHcyzlkjc7OOXEHVJjFMjoJUk+NM8Wp zmsVzykd/wN+TCn5bQRXvJ3V32NHw35xxsAhcUBRqzHoUTSX9dTDYOTqSuj1LqfnyJXf 0txqQ3JEuKqqUa5VvXmUnXCk/CM9PrhMuFT4LYHQ4piFYNzvE+vN1jo9VoTpPBTGCDsf mXwfyw/Ef/ghARuo7VDBQk03yWxgJViYNRPr2/PifxmDJN9fh2wyN+SmIiCkg/NVFWDY xKQw== X-Gm-Message-State: AOJu0Yw+94xQQTuyDYbvf16Wz7j3em70ZqSFrgyqlD/3+PZfu7RwQsoX /kPLLc1WdriHZiPhO88AbncdvQ== X-Google-Smtp-Source: AGHT+IHOdRvi2sA6xJA8wOXbmKn0wVvuBxDWH43DQAj9SH8vpgSEQnHazF4kXFckivDZv66HPcNLEA== X-Received: by 2002:a05:6870:2423:b0:1e9:b025:cf88 with SMTP id n35-20020a056870242300b001e9b025cf88mr4646934oap.36.1699389983229; Tue, 07 Nov 2023 12:46:23 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id e7-20020a630f07000000b005ab46970aaasm1750211pgl.17.2023.11.07.12.46.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:22 -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 v6 5/5] drm/panel-edp: Avoid adding multiple preferred modes Date: Tue, 7 Nov 2023 12:41:55 -0800 Message-ID: <20231107204611.3082200-6-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107204611.3082200-1-hsinyi@chromium.org> References: <20231107204611.3082200-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- no change. --- 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/pane= l-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 =3D to_panel_edp(panel); int num =3D 0; + bool has_hard_coded_modes =3D p->desc->num_timings || p->desc->num_modes; bool has_override_edid_mode =3D p->detected_panel && p->detected_panel !=3D ERR_PTR(-EINVAL) && p->detected_panel->override_edid_mode; @@ -599,7 +600,11 @@ static int panel_edp_get_modes(struct drm_panel *panel, =20 if (!p->edid) p->edid =3D 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); } =20 - /* - * 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 +=3D panel_edp_get_non_edid_modes(p, connector); else if (!num) dev_warn(p->base.dev, "No display modes\n"); --=20 2.42.0.869.gea05f2083d-goog