From patchwork Tue Jul 14 18:42:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235543 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3990236ilg; Tue, 14 Jul 2020 11:54:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwl6MfZFIx+08SiPwbD/fCDx1ZYcwJ6ZdJmGxbnb/r/5BhyUETl7sC9SNOIYWBXvepKG0hR X-Received: by 2002:aa7:df16:: with SMTP id c22mr5762177edy.388.1594752866500; Tue, 14 Jul 2020 11:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594752866; cv=none; d=google.com; s=arc-20160816; b=pfZNMB4d2V81kjVppuu+T3C6asFOGDRuIy6GrDzdkz1UfSjrIC+8kQedOVzgqsPT19 9KY+eEXF86hW1vmZECCx5BYSAE91uR8uF7qUiRyJ7gAO3PLSWfiLybZqRvRXOWqE++kf uniTtwrXmOQ6v2i8l4z2lAtQqb+aa/6lUaFvOqgQ+n1TO0xSzgnKvVI9LUca9zhHn5AN XojY0KFmrUehg7SJl/MiyTTkobehuPrezaNbFsOZ0nQ6LdTUVmCQYjRmMNYVU9HlkAdc c/3zTYrjK1KXiN8gufH/Ka7na+yO1y5He46O9/V4liK81CRGAVMucBsovKUg8iNzDeRq pQYA== 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=GdfNC89gUy9vVdxaRCD+y4uUzEbg7kPEWMqbeEcEI6E=; b=uHrgv7HImgGclVjJQ7GY+x+1XmIjZ/y4u3SB5t6TlFjuXjh7iWnzJT6tt3PNydXNfh X71IOof/yez/Ptzn2gSVSicqjebNC/ZngbcFCxaIGoOqes2Wk1jK1yAULzYIm3fxmtu3 nJe0QVAuKpn/Tstf1EOQrwuX9Wv0fw+tvun17MOMgCaHS+81ECh2CoVGamsL/NoifnuU mY+ZdXSFnjaPN4NQrCQUT33jKSDHlC8xKsKF/IkA1txu8+ihMzoOl8gHfIpOWUXoIt/J cmKIB7heykNKX+il99ss7VzoDhQ4lEgHc7exhjKa//1/qGiXQD/RV4+CF4TIySWossIk Iq6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TGlqMsA0; 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 va7si11392538ejb.55.2020.07.14.11.54.26; Tue, 14 Jul 2020 11:54:26 -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=TGlqMsA0; 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 S1730342AbgGNSyX (ORCPT + 15 others); Tue, 14 Jul 2020 14:54:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:51796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730340AbgGNSyW (ORCPT ); Tue, 14 Jul 2020 14:54:22 -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 8E55522BEB; Tue, 14 Jul 2020 18:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752862; bh=RE38XazNYCwzs9eu9smfOGnUknFmGMxPfCedVsBQs2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TGlqMsA0Sot+P2y1LZfgO2M8At5LmYO6aGmDC25CIpsc1k6LRbLX2QTGWF3fQh12o 2/ILn98C+OWfOCgj4T+AipUTDvAxiGQaNCLRv+iRJZhq+8Jpgqcf7/2/aLPykyUs5g vbVjdepSwPO7/Myl2Z7qhi/YBHITqDLdvmupp7Ys= 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.7 014/166] drm: mcde: Fix display initialization problem Date: Tue, 14 Jul 2020 20:42:59 +0200 Message-Id: <20200714184116.579691657@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@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 f28cb7a576ba4..1e7c5aa4d5e62 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -208,7 +208,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; @@ -275,6 +274,8 @@ static int mcde_drm_bind(struct device *dev) if (ret < 0) goto unbind; + drm_fbdev_generic_setup(drm, 32); + return 0; unbind: