From patchwork Fri Dec 7 12:58:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 10720805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 480B2112E for ; Mon, 10 Dec 2018 08:08:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AD4E29B0F for ; Mon, 10 Dec 2018 08:08:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F23C29B1D; Mon, 10 Dec 2018 08:08:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C80C629B0F for ; Mon, 10 Dec 2018 08:08:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BFFA6E325; Mon, 10 Dec 2018 08:07:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BDE16E745 for ; Fri, 7 Dec 2018 12:59:07 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id a18so4473958wmj.1 for ; Fri, 07 Dec 2018 04:59:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=VOstuElbSnWjht63gBCu7fmMuTQw3tfTkXOtwgjJuVg=; b=WenjL/S9M8/fsONUU/IfBgoAnZORtFFYQLtK1yjPfR7orYfSiK48lUwq7R6qbpDMxl 0l/Nw0Flsq4Oyhj1gtwsuV8GEQ+LzC3JkStixyZpkNlQJpFhEBn4lSEJrexkav3mlOoC 9RJKR+npeaofPnk5lrCJhS5H8rirTsEzU4xQsZOsLl/gs6WY1byQPrVi3CA/MNLuJLc8 7hu0g+PT2ZhWbxs1giEGJ/JozYQJvBS//v5K8vbsb5j8BFj0/+NmZXTkUNNicnxTPYvu 2cYnNaSr+Ebh7HIPy6m0C3+m/gm1aAjXhWtLbAn1iwfW+vBoO37Y0W5zgWBYaQxlgUEe cdsw== X-Gm-Message-State: AA+aEWbQXWNrlDhfnRLC/fcL3WLxOjWxz+3NAZf6iIYrmL/9AotGCMfq mJnFxMaPyN55cRe7DR0poNI= X-Google-Smtp-Source: AFSGD/UHwJ4fPpG8rxsMgHX571xxRbnkSIv0McV132Rus05KsvvAi7cQ/8HW3IprUjBoN4jasBRRRg== X-Received: by 2002:a1c:770c:: with SMTP id t12mr2147070wmi.101.1544187545813; Fri, 07 Dec 2018 04:59:05 -0800 (PST) Received: from macbookpro.malat.net (bru31-1-78-225-224-134.fbx.proxad.net. [78.225.224.134]) by smtp.gmail.com with ESMTPSA id r3sm3654635wrs.78.2018.12.07.04.59.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Dec 2018 04:59:03 -0800 (PST) Received: by macbookpro.malat.net (Postfix, from userid 1000) id 5C9E61144859; Fri, 7 Dec 2018 13:59:02 +0100 (CET) From: Mathieu Malaterre To: Rob Herring Subject: [PATCH] video: offb: Pass actual name in offb_init_palette_hacks Date: Fri, 7 Dec 2018 13:58:42 +0100 Message-Id: <20181207125844.18775-1-malat@debian.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 10 Dec 2018 08:07:52 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Mathieu Malaterre , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, stable@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name"). This is the minimal work to get a Mac Mini G4 back to a bootable state. The function offb_init_palette_hacks would need to handle the case where `name` has been set to NULL. Cc: Rob Herring Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Mathieu Malaterre --- drivers/video/fbdev/offb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c index 31f769d67195..6e75851f8142 100644 --- a/drivers/video/fbdev/offb.c +++ b/drivers/video/fbdev/offb.c @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) /* kludge for valkyrie */ if (strcmp(dp->name, "valkyrie") == 0) address += 0x1000; - offb_init_fb(no_real_node ? "bootx" : NULL, + offb_init_fb(no_real_node ? "bootx" : dp->name, width, height, depth, pitch, address, foreign_endian, no_real_node ? NULL : dp); }