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 45BC079DDB for ; Wed, 19 Jun 2024 08:36:28 +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=1718786189; cv=none; b=liPkqsMnVchfMkBJygwMD5LXkzhl/N2yex0O/GQPN78V0pUEFNHgrSdQGJsgxXa2FxythPhp0hx9hNkWqFDKAcygYpNoLjpiejrT3h4Km0fR9PH5Nb8LyvaIv9vKKPN9NwZi07KeIfawOmzKqFKaAQLaD9o+A1RATNu3sMJjubU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718786189; c=relaxed/simple; bh=iEaqOPx+J9kBkN2PMduUgz3HprglUAI9NEGprWtXvt0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=I8zJoaSTWq69axVyx0gB1JtQAomqySsdXe5CodugsUTzyafsPmm9gqXbd9Oi6maWpD4QvcTTvEv9GNXQzqcSRa7dajbBuQbDCGRV71OC+VhkdDU2vYRRpN1ELpNJ0Xmyij1EbqwAiLEMkkche2TP/tCVTJg3a9ApJlwZ+EM+JtE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xmGTBrt2; 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="xmGTBrt2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7050CC2BBFC; Wed, 19 Jun 2024 08:36:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718786188; bh=iEaqOPx+J9kBkN2PMduUgz3HprglUAI9NEGprWtXvt0=; h=Subject:To:Cc:From:Date:From; b=xmGTBrt26eOKNXjsxV9TvlOjMAGHv48vf4NkpkUJzBus5c2MYvFM2Ujc0+z61gcMx bKmgYVA+fUcxi8cGvYJpXdo7snFNksrs3ygZJ0Wyq1ImDdwJQEtwwkveGTqDKXxj35 JB7Devzy07n/TKWu8QXlibYX3ofNWPs5OH+QI7tg= Subject: FAILED: patch "[PATCH] drm/ast: Set DDC timeout in milliseconds" failed to apply to 6.6-stable tree To: tzimmermann@suse.de,airlied@redhat.com,jfalempe@redhat.com,maarten.lankhorst@linux.intel.com,mripard@kernel.org,stable@vger.kernel.org Cc: From: Date: Wed, 19 Jun 2024 10:36:23 +0200 Message-ID: <2024061923-equal-outtakes-2db3@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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x c0cd6925856f661e1a37278660ccae551cef7077 # git commit -s git send-email --to '' --in-reply-to '2024061923-equal-outtakes-2db3@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: c0cd6925856f ("drm/ast: Set DDC timeout in milliseconds") 42f4980da575 ("drm/ast: Rename struct ast_i2c_chan to struct ast_ddc") 0a7f04b433fc ("drm/ast: Move DDC code to ast_ddc.{c,h}") e14ab3037383 ("drm/ast: Allocate instance of struct ast_i2c_chan with managed helpers") c0af492c872b ("drm/ast: Remove struct ast_{vga,sil165}_connector") d66cdb638a49 ("drm/ast: Fail probing if DDC channel could not be initialized") ed8d84530ab0 ("Merge tag 'i2c-for-6.8-rc1-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c0cd6925856f661e1a37278660ccae551cef7077 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Wed, 3 Apr 2024 12:31:28 +0200 Subject: [PATCH] drm/ast: Set DDC timeout in milliseconds Compute the i2c timeout in jiffies from a value in milliseconds. The original values of 2 jiffies equals 2 milliseconds if HZ has been configured to a value of 1000. This corresponds to 2.2 milliseconds used by most other DRM drivers. Update ast accordingly. Signed-off-by: Thomas Zimmermann Fixes: 312fec1405dd ("drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)") Cc: Dave Airlie Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: Jocelyn Falempe Cc: dri-devel@lists.freedesktop.org Cc: # v3.5+ Reviewed-by: Jocelyn Falempe Link: https://patchwork.freedesktop.org/patch/msgid/20240403103325.30457-2-tzimmermann@suse.de diff --git a/drivers/gpu/drm/ast/ast_ddc.c b/drivers/gpu/drm/ast/ast_ddc.c index b7718084422f..3e156a6b6831 100644 --- a/drivers/gpu/drm/ast/ast_ddc.c +++ b/drivers/gpu/drm/ast/ast_ddc.c @@ -153,7 +153,7 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast) bit = &ddc->bit; bit->udelay = 20; - bit->timeout = 2; + bit->timeout = usecs_to_jiffies(2200); bit->data = ddc; bit->setsda = ast_ddc_algo_bit_data_setsda; bit->setscl = ast_ddc_algo_bit_data_setscl;