From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC732200AA for ; Sat, 27 Jan 2024 23:12:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706397174; cv=none; b=ZtPzSSHmi3/TabFhKT9ZLkJTwvjU2YKQMciT8avmojAMbP6E5sITB0Ksvr0uKV71J+gEen1JmZL7ssD2LoCNwgTRyA4T4IhQnm94xcS7UNsf5Awu0rD5N10Jpdof8YlGYxt6bmSLraddMPvE2KyQLFcTIWc3n3SAliqNb0XB2iA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706397174; c=relaxed/simple; bh=wDSByeOYnJTeQA1w7CLe6GrdMKdg/f5z0M5sR5RwSnc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=WRS6mcbiGUXP7Ouy3JbX8cubcQ3h/PGWncdlIUeecVHIlsZcLMvGbgu/rWv3CaTM693Gbx7IxIEpWmlaXXKTqT3XiSCGgVWdy4rnQNq4bVuJEXrHJM0zvx+hEodPXaMT8g+ogXzP8j+eU4kruXKk+99qgvksobXeevU3X+4gdec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ja/SxiR/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ja/SxiR/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15EA9C433C7; Sat, 27 Jan 2024 23:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706397174; bh=wDSByeOYnJTeQA1w7CLe6GrdMKdg/f5z0M5sR5RwSnc=; h=Subject:To:Cc:From:Date:From; b=ja/SxiR/vOgfKh2NCMxXo7m/VYFCapZCcAxxasJKg619dXLRXayQvTQjdcRI6s/2I Dz07v88KfAITMdChH0+8cngpW/Q2ymFlUeBoped3LB4EhyA6mY4FmG6tUzz8Nr/bbZ qldgzcM+LKsv5+1RnS6cxHlCKNokQoCLxK5FHZLw= Subject: FAILED: patch "[PATCH] drm/panel-edp: drm/panel-edp: Fix AUO B116XAK01 name and" failed to apply to 5.10-stable tree To: hsinyi@chromium.org,dianders@chromium.org,mripard@kernel.org Cc: From: Date: Sat, 27 Jan 2024 15:12:53 -0800 Message-ID: <2024012753-henna-remorse-89ff@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x fc6e7679296530106ee0954e8ddef1aa58b2e0b5 # git commit -s git send-email --to '' --in-reply-to '2024012753-henna-remorse-89ff@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: fc6e76792965 ("drm/panel-edp: drm/panel-edp: Fix AUO B116XAK01 name and timing") 3db2420422a5 ("drm/panel-edp: Add AUO B116XTN02, BOE NT116WHM-N21,836X2, NV116WHM-N49 V8.0") a80c882183e3 ("drm/panel-edp: Add AUO NE135FBM-N41 v8.1 panel entry") 981f8866754d ("drm/panel-edp: Add B133UAN01.0 edp panel entry") a70abdd994cb ("drm/panel-edp: Add AUO B116XAK01.6") 43bee41415a6 ("drm/panel-edp: Add BOE NT116WHM-N21 (HW: V8.1)") ee50b0024408 ("drm/panel-edp: add AUO B133UAN02.1 panel entry") b68735e8ef58 ("drm/panel-edp: Add panel entry for B120XAN01.0") 7d1be0a09fa6 ("drm/edid: Fix EDID quirk compile error on older compilers") 5540cf8f3e8d ("drm/panel-edp: Implement generic "edp-panel"s probed by EDID") 52824ca4502d ("drm/panel-edp: Better describe eDP panel delays") 9ea10a500045 ("drm/panel-edp: Split the delay structure out") 3fd68b7b13c2 ("drm/panel-edp: Move some wayward panels to the eDP driver") 5f04e7ce392d ("drm/panel-edp: Split eDP panels out of panel-simple") e8de4d55c259 ("drm/edid: Use new encoded panel id style for quirks matching") d9f91a10c3e8 ("drm/edid: Allow querying/working with the panel ID from the EDID") 7c4125b093d5 ("Revert "drm/panel-simple: Add Samsung ATNA33XC20"") 93ea7aa8dfc0 ("drm/panel: simple: Add support for two more AUO panels") 5ead9b5b1575 ("drm/panel-simple: Power the panel when probing DP AUX backlight") 4bfe6c8f7c23 ("drm/panel-simple: Add Samsung ATNA33XC20") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From fc6e7679296530106ee0954e8ddef1aa58b2e0b5 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Wang Date: Tue, 7 Nov 2023 12:41:51 -0800 Subject: [PATCH] drm/panel-edp: drm/panel-edp: Fix AUO B116XAK01 name and timing Rename AUO 0x405c B116XAK01 to B116XAK01.0 and adjust the timing of auo_b116xak01: T3=200, T12=500, T7_max = 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 Signed-off-by: Douglas Anderson Link: https://patchwork.freedesktop.org/patch/msgid/20231107204611.3082200-2-hsinyi@chromium.org diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-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 = { }, .delay = { .hpd_absent = 200, + .unprepare = 500, + .enable = 50, }, }; @@ -1870,7 +1872,7 @@ static const struct edp_panel_entry edp_panels[] = { 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"),