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 5DA46195985 for ; Tue, 30 Jul 2024 09:30:27 +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=1722331827; cv=none; b=ZIhsT2S9LH73BNiB0lH8zDYgF7BzgcRghYQjI3E8uViCRKFUQRrPhxPZoae0VtUX2l545Vlmw0+GBDXX7HBbCJ7fYaIWh1GllnCLVJhWTXD0gsmztTaQwsy0T1wLGiX9lye94aPtAlKAFoWRG6v2CtAjSInvHR5WlkAJ0Fp1kLs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722331827; c=relaxed/simple; bh=MuA6DWqOKrP0M1fyYbzp41wYvYM/JIEWE4AW0lEERvQ=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=r4HmnbdVj38HoezzTKN5HZGc/UeoIs8QaTP8yHUXuj9Zfl43CBzwVotnssETHfp5AwYwxAiIQC2B4iutRHmCG+LQImG7MHFGLq3ZEOEtLJFdorzMID4UYBlrZpQaWT+wIiNQR/MqjvNBXkO9TLVnlwUUCz/bb8OBGeU7SCH2E4o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MOP9uO2P; 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="MOP9uO2P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D50E5C32782; Tue, 30 Jul 2024 09:30:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722331827; bh=MuA6DWqOKrP0M1fyYbzp41wYvYM/JIEWE4AW0lEERvQ=; h=Subject:To:Cc:From:Date:From; b=MOP9uO2Pb+m4TM/iTcqQ/SaYwslYuZGejARhvW8ZiJgr0fHM4OuqvM6++rWwgF51R d4W45U83bXCsD72l+3KT78HmsncKntVPKmv8SvPzj3xem4GxoXGZgEW5C1toyZTgBH 5TzpKBxrRMRPVVY+XHWco1I0lfkmCOnfC/9fVsX4= Subject: FAILED: patch "[PATCH] drm/udl: Remove DRM_CONNECTOR_POLL_HPD" failed to apply to 5.4-stable tree To: tzimmermann@suse.de,airlied@redhat.com,alexander.deucher@amd.com,jani.nikula@intel.com,sean@poorly.run,stable@vger.kernel.org,tutankhamen@chromium.org Cc: From: Date: Tue, 30 Jul 2024 11:30:11 +0200 Message-ID: <2024073010-pond-chamber-4302@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.4-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.4.y git checkout FETCH_HEAD git cherry-pick -x 5aed213c7c6c4f5dcb1a3ef146f493f18fe703dc # git commit -s git send-email --to '' --in-reply-to '2024073010-pond-chamber-4302@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 5aed213c7c6c ("drm/udl: Remove DRM_CONNECTOR_POLL_HPD") 0862cfd3e22f ("drm/udl: Move connector to modesetting code") 43858eb41e0d ("drm/udl: Various improvements to the connector") 2c1eafc40e53 ("drm/udl: Use USB timeout constant when reading EDID") c020f66013b6 ("drm/udl: Test pixel limit in mode-config's mode-valid function") 59a811faa74f ("drm/udl: Rename struct udl_drm_connector to struct udl_connector") 255490f9150d ("drm: Drop drm_edid.h from drm_crtc.h") 0f95ee9a0c57 ("Merge tag 'drm-misc-next-2022-06-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5aed213c7c6c4f5dcb1a3ef146f493f18fe703dc Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 10 May 2024 17:47:08 +0200 Subject: [PATCH] drm/udl: Remove DRM_CONNECTOR_POLL_HPD DisplayLink devices do not generate hotplug events. Remove the poll flag DRM_CONNECTOR_POLL_HPD, as it may not be specified together with DRM_CONNECTOR_POLL_CONNECT or DRM_CONNECTOR_POLL_DISCONNECT. Signed-off-by: Thomas Zimmermann Fixes: afdfc4c6f55f ("drm/udl: Fixed problem with UDL adpater reconnection") Reviewed-by: Jani Nikula Cc: Robert Tarasov Cc: Alex Deucher Cc: Dave Airlie Cc: Sean Paul Cc: Thomas Zimmermann Cc: dri-devel@lists.freedesktop.org Cc: # v4.15+ Link: https://patchwork.freedesktop.org/patch/msgid/20240510154841.11370-2-tzimmermann@suse.de diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 7702359c90c2..751da3a294c4 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -527,8 +527,7 @@ struct drm_connector *udl_connector_init(struct drm_device *dev) drm_connector_helper_add(connector, &udl_connector_helper_funcs); - connector->polled = DRM_CONNECTOR_POLL_HPD | - DRM_CONNECTOR_POLL_CONNECT | + connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT; return connector;