From patchwork Tue Jul 14 18:43:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 235550 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4001563ilg; Tue, 14 Jul 2020 12:08:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFPfIfLHeYkIUiz9eURp0xiQe59ArA5b0Iws9rmEo/gk2O+7d9IkaLA23XRLQ2Nn2JPu89 X-Received: by 2002:a17:906:1102:: with SMTP id h2mr5772269eja.356.1594753735408; Tue, 14 Jul 2020 12:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753735; cv=none; d=google.com; s=arc-20160816; b=ixj24BXMvkS6XUMQeVAcGVFlEBKxBgAUDwPR9qQDH/3uA79Oz17b+zGvqKgs0i55Hv WpUYHx/7UfDmyjWnIt8zk1IoaYRp8HoCVHWSe3DpffFhndcs0BuYEbX4S8StHdA0qybB 1EGXZxpRB8Q51OOHiLKCtfuVg1QOQCbfjmKqaTdT1N4WFcW4890ORNpGwM+rlrpXfM59 KjG8UFUTqLpxCXHuSMANTOUTOPF75BJxbtqQzk+O/5uE/qIxhZGmROxbfuRyb/62YGL+ 6JoNezBZvtN52nwykhr7cky7Ky6s6OsfFyYs2jdY/YtEcZ+mxMUz7gmz99N1UKaU6kFL YVtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Mz+LfgG1EoKd/Q08AJ0Dzal1J+6PJP9RKXhpVnTbEqs=; b=dJ3nfYyi8dFnE3w94I/K0apckJK643HK61KVON8i9OofLDY/VD4UnuTU0Cd0Ka0hcv c6zMqXhyvF9lo+WJIUFv+Fz3jvX57RWcfr51PJszLWOywcEpxgJ8RLYAa2RJGzQicKBN GPqqiMGOm3Is7ZhkF8Yf7DDQM3K9YpMmRwGE0k0NwngR5uukI0QXPwcWfllHgj7OtcDh tPkr5BpqjRGM4vfNdWB5pWfjCfmJ4cLefEepoMLW/nsVL0l2MEpY13KtlSDWwh6S6UYU dAUM8IRbRpc1YNpSow93kLCotYQHdQdt3zQTIsHTkmpWyCKMeXUQpaI4ZnH6xTfqttIl ZK4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DJTW43fD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y18si11840231eds.226.2020.07.14.12.08.55; Tue, 14 Jul 2020 12:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DJTW43fD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730149AbgGNStf (ORCPT + 15 others); Tue, 14 Jul 2020 14:49:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:45350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730147AbgGNSte (ORCPT ); Tue, 14 Jul 2020 14:49:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 236E2222E9; Tue, 14 Jul 2020 18:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752573; bh=Xi7/eg4OGJypXMWBSatH0ZdfxFUt+M0VePkYdJ7Z6v4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJTW43fDpEmUxHcaSy3uVf2JzOeCr7L0L7Pjyoij4+xVIswgVKYn6tjx1LD5Y6mkK lt8IDpd2yI90mfaXKkiDAlDNO2e1cQJcJZ4MOvYNhDUbwQ45Ck7JtM5HsYKO1qQB2O DE03qeJqsf960vyMYbTxsVdD116Naak1EyRWczzQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sam Ravnborg , Sasha Levin Subject: [PATCH 5.4 011/109] drm: mcde: Fix display initialization problem Date: Tue, 14 Jul 2020 20:43:14 +0200 Message-Id: <20200714184106.066312422@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit b984b6d8b52372b98cce0a6ff6c2787f50665b87 ] The following bug appeared in the MCDE driver/display initialization during the recent merge window. First the place we call drm_fbdev_generic_setup() in the wrong place: this needs to be called AFTER calling drm_dev_register() else we get this splat: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at ../drivers/gpu/drm/drm_fb_helper.c:2198 drm_fbdev_generic_setup+0x164/0x1a8 mcde a0350000.mcde: Device has not been registered. Modules linked in: Hardware name: ST-Ericsson Ux5x0 platform (Device Tree Support) [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0x9c/0xb0) [] (dump_stack) from [] (__warn+0xb8/0xd0) [] (__warn) from [] (warn_slowpath_fmt+0x74/0xb8) [] (warn_slowpath_fmt) from [] (drm_fbdev_generic_setup+0x164/0x1a8) [] (drm_fbdev_generic_setup) from [] (mcde_drm_bind+0xc4/0x160) [] (mcde_drm_bind) from [] (try_to_bring_up_master+0x15c/0x1a4) (...) Signed-off-by: Linus Walleij Reviewed-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20200613223027.4189309-1-linus.walleij@linaro.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/mcde/mcde_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index 5649887d2b901..16e5fb9ec784d 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -215,7 +215,6 @@ static int mcde_modeset_init(struct drm_device *drm) drm_mode_config_reset(drm); drm_kms_helper_poll_init(drm); - drm_fbdev_generic_setup(drm, 32); return 0; @@ -282,6 +281,8 @@ static int mcde_drm_bind(struct device *dev) if (ret < 0) goto unbind; + drm_fbdev_generic_setup(drm, 32); + return 0; unbind: