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 5D99B1B80B for ; Sat, 27 Jan 2024 23:12:52 +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=1706397172; cv=none; b=m05RKtZsVnEHZOdoS/eKi1YhQ4yMhcs2X93l91vjGdPT9UsXFcItm7TTJyx4XKXuXxN4JsLkrnaHDJLXKKF8nP8zwO6LyKj0/7JWGInp7rjpp4RdvSDlTp2iBk4ahZchlP+XopY930WU3DvvEIlJgApkKbIpibvrnr+lOJL4/YE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706397172; c=relaxed/simple; bh=c9PNSjbUTA3mu9qbWxXWyxZWzxzkNnA/h/baUPgzxEY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=B6dfavq+uMxfTuHrylgnhJcJ8/OERl9l4TiBx9N4q0RcA7Clyswnx4am1FQ2MISB4se3HWQkS+2a749hlTjS31QTHg9POZhp6nZEAVC2Bxsi29DDLAIjTyqxB8atF1GG/uXVmbP8Mym3knyMXQeAGIXnAlQcaYTnyAT1yeWyzlk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WufW21lb; 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="WufW21lb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27545C43399; Sat, 27 Jan 2024 23:12:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706397172; bh=c9PNSjbUTA3mu9qbWxXWyxZWzxzkNnA/h/baUPgzxEY=; h=Subject:To:Cc:From:Date:From; b=WufW21lbBGkdPJlkEtS6c7Z0irzwEXtt/wRxLcfExTli24+P4pH/SnjY9iyRhKWel nsem334DbDNQ5HdWQ5X4hDyasFIU3R8zaJ371VWAc4aDQlGjG+dpNihETmcYlbw/1n tX14lHHiDr+Sl7wZ5m6bJ647kPh/+9+ypu4CVXTM= Subject: FAILED: patch "[PATCH] drm/panel-edp: drm/panel-edp: Fix AUO B116XAK01 name and" failed to apply to 6.1-stable tree To: hsinyi@chromium.org,dianders@chromium.org,mripard@kernel.org Cc: From: Date: Sat, 27 Jan 2024 15:12:51 -0800 Message-ID: <2024012751-duly-parchment-0e06@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 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x fc6e7679296530106ee0954e8ddef1aa58b2e0b5 # git commit -s git send-email --to '' --in-reply-to '2024012751-duly-parchment-0e06@gregkh' --subject-prefix 'PATCH 6.1.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") 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"),