From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB194C282CE for ; Tue, 4 Jun 2019 12:40:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF75A240B7 for ; Tue, 4 Jun 2019 12:40:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559652002; bh=z8QgKtj9rRgZF6vdCdRMWxKHb9w7bhyDxcqy7IOoekM=; h=Subject:To:Cc:From:Date:List-ID:From; b=y/Tz3TepW4+tGhrEcAjrnYs62h0OfCRvVsP8aCMP9HNL9hOxFYCLTp3fXuyB+ag+8 dqZW6zoJoGSNxm5ocQ5SA45OlmqcaSSM9kiDkmVdPr1rie4X5VZzSLaBmfsaWOt/38 GG+RkD4aJUXK/aKrIuoIeMNl5Q2xXdN/C0vWi/PU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727672AbfFDMkC (ORCPT ); Tue, 4 Jun 2019 08:40:02 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:45279 "EHLO wout4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727580AbfFDMkC (ORCPT ); Tue, 4 Jun 2019 08:40:02 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id BFADB469; Tue, 4 Jun 2019 08:40:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 04 Jun 2019 08:40:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=W8xT99 rdy1VvYBpDwYbdj/302YfStsBTX3sbyn4qR3s=; b=TgBay0jplB5IhvRMCg6jYm 7wX3UoGQc3hK9Pi/TQmn2wqH7o/63BZTTYAnUdTv6GljsTnn5dh8yFhDGUuqkF/Q 4ctzBo+9MtZpJI069P8R5S7f92nvMDgkKd1rbFnIgdjiwJhNN8thpNZjsyE1l3aB jpQPCWQO1inLeGDT7E7J68vzocFse6YLqfj4wuOGR43/Q6mDew8vrs0HuTY9b7k6 FhzQZFAdkNugsEqJf9maKAi8opX71GDQV9g+6ZiHiUb6EEtZzceeETJXhq03BS/9 ZdoOsb4aI1VuWifT1+TRxYQheTYfTB4byAXbt78ACW+V0OvtN/smyNz5ozNfjZow == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrudefledgheehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtjeenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgnecukfhppeekfedrke eirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghh rdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 3D86438008E; Tue, 4 Jun 2019 08:39:59 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/fb-helper: generic: Call drm_client_add() after setup is" failed to apply to 4.19-stable tree To: noralf@tronnes.org, daniel.vetter@ffwll.ch Cc: From: Date: Tue, 04 Jun 2019 14:39:57 +0200 Message-ID: <1559651997224@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-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 . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Mon, 1 Apr 2019 16:13:58 +0200 Subject: [PATCH] drm/fb-helper: generic: Call drm_client_add() after setup is done MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hotplug can happen while drm_fbdev_generic_setup() is running so move drm_client_add() call after setup is done to avoid drm_fbdev_client_hotplug() running in two threads at the same time. Fixes: 9060d7f49376 ("drm/fb-helper: Finish the generic fbdev emulation") Cc: stable@vger.kernel.org Reported-by: Daniel Vetter Signed-off-by: Noralf Trønnes Reviewed-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20190401141358.25309-1-noralf@tronnes.org diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0d8384e30e16..84791dd4a90d 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -3312,8 +3312,6 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp) return ret; } - drm_client_add(&fb_helper->client); - if (!preferred_bpp) preferred_bpp = dev->mode_config.preferred_depth; if (!preferred_bpp) @@ -3324,6 +3322,8 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp) if (ret) DRM_DEV_DEBUG(dev->dev, "client hotplug ret=%d\n", ret); + drm_client_add(&fb_helper->client); + return 0; } EXPORT_SYMBOL(drm_fbdev_generic_setup);