Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp6012712pxb; Mon, 14 Feb 2022 13:07:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj3H+r8cQFQh2bslrFabBIAjNWCcCwU7l9NeROkZNAEugsu/o8JNwhtEXv4MYPHZFOPqu7 X-Received: by 2002:a65:4c4b:: with SMTP id l11mr765609pgr.310.1644872840800; Mon, 14 Feb 2022 13:07:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644872840; cv=none; d=google.com; s=arc-20160816; b=TAlTHlB5Z760milGuSc5UvLnshPI554kR/B7U/ADg5yCDE/QXX5y/nDzUdaT3S6XpY YRbMvsRp2viUEvLaiWZSfpnXO6YyfirVA/PhgZB8+9WWWxRxXM0t94bvCPfn4475WcJe H2hEoSxy45h4oBPuHJYRHtWAsrjZhSxBow3TTpgKeD205v2hPUyIO79JjsFT76+8UL6a 1rXmuAWsDrdMzMBohSbJAvXcx/z6aLwE3xKO5zrXSLtz2L2pO05fhQ4Ox/0Mg5xpVl0m peL/ZZ0apsalRy8qdvAEkFGQr78GA7HMtPIdKRewKMY/nux65GCRFKI4QSm0jfPVY+41 OTdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ILqcNl7SxjPgFQCP8+crw0LC4dKhu9ku66ujsvKVzkY=; b=gDyGLwTkbMqNaG9N5E7F68UECXIdJ5RpoAnL7rxTJn7ejviphvfN9JypqJASzm6DEy kLgC8arHl16jB70BKJ8p8qwgJqm6AxAlkyvsqxv+0vZ2Y9uAfBQVH74jbGHhR4/thaOh Lfp73CVEhun/f1A3LqKJictZV1oWIgTcJ/oLVkSN3NbufZp2mLOItQQZqrBSr96Mzkd8 ZETNqbM+lBV2Vupbp5f7P4Jetk9DzK9eda/gJzlYiiPqnxzNi6RIZXW5L7/qoGDFJkG0 rNt5jKRJ+Honuqke6Uww4Z9rrV0tI7FvpIszpxQOu3e+tlic52HIv/tjAvM0rUQ9IRjb I7yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@aosc.io header.s=default header.b=MEnyUJ7N; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id r74si697257pgr.435.2022.02.14.13.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 13:07:20 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=fail header.i=@aosc.io header.s=default header.b=MEnyUJ7N; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7841E18D027; Mon, 14 Feb 2022 12:27:50 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245289AbiBNQDZ (ORCPT + 99 others); Mon, 14 Feb 2022 11:03:25 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:49012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230159AbiBNQDX (ORCPT ); Mon, 14 Feb 2022 11:03:23 -0500 X-Greylist: delayed 449 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 14 Feb 2022 08:03:14 PST Received: from relay-us1.mymailcheap.com (relay-us1.mymailcheap.com [51.81.35.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 733FE19C3E for ; Mon, 14 Feb 2022 08:03:14 -0800 (PST) Received: from relay5.mymailcheap.com (relay5.mymailcheap.com [159.100.248.207]) by relay-us1.mymailcheap.com (Postfix) with ESMTPS id A51962001E for ; Mon, 14 Feb 2022 15:55:44 +0000 (UTC) Received: from relay2.mymailcheap.com (relay2.mymailcheap.com [217.182.113.132]) by relay5.mymailcheap.com (Postfix) with ESMTPS id CCC0F267CE for ; Mon, 14 Feb 2022 15:55:41 +0000 (UTC) Received: from filter1.mymailcheap.com (filter1.mymailcheap.com [149.56.130.247]) by relay2.mymailcheap.com (Postfix) with ESMTPS id DAE5D3EDEC; Mon, 14 Feb 2022 16:55:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by filter1.mymailcheap.com (Postfix) with ESMTP id 3D7CD2A35B; Mon, 14 Feb 2022 15:55:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at filter1.mymailcheap.com Received: from filter1.mymailcheap.com ([127.0.0.1]) by localhost (filter1.mymailcheap.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eU2a3EGzd8VZ; Mon, 14 Feb 2022 15:55:38 +0000 (UTC) Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by filter1.mymailcheap.com (Postfix) with ESMTPS; Mon, 14 Feb 2022 15:55:38 +0000 (UTC) Received: from ice-e5v2.lan (unknown [59.41.163.244]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail20.mymailcheap.com (Postfix) with ESMTPSA id 25D67424E6; Mon, 14 Feb 2022 15:55:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default; t=1644854137; bh=1GTF2NsHj3ZBXPclibNh2/lJMbhULqnyJD2XKSlxgps=; h=From:To:Cc:Subject:Date:From; b=MEnyUJ7Nm3KnigPQI7oVCwI98sdJmq0MHRKMeTZ8mVcFZzeQWQ6e0CCzXAvhEtmt+ uqKSIXH1zqBWApUv9R6O+wtSdXfdxHm8QaGL3cXh7xqNtMe19pTAuLoaa+Hz1qKgJi Ma11SBIxtadPwNA8athuskRw8rP4x96XO3TrroKI= From: Icenowy Zheng To: Ben Skeggs , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH] drm/nouveau/bios: Use HWSQ entry 1 for PowerBook6,1 Date: Mon, 14 Feb 2022 23:55:18 +0800 Message-Id: <20220214155518.2980270-1-icenowy@aosc.io> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On PowerBook6,1 (PowerBook G4 867 12") HWSQ entry 0 (which is currently always used by nouveau) fails, but the BIOS declares 2 HWSQ entries and entry 1 works. Add a quirk to use HWSQ entry 1. Signed-off-by: Icenowy Zheng --- drivers/gpu/drm/nouveau/nouveau_bios.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index e8c445eb11004..2691d0e0cf9f1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -1977,6 +1977,13 @@ static int load_nv17_hw_sequencer_ucode(struct drm_device *dev, if (!hwsq_offset) return 0; +#ifdef __powerpc__ + /* HWSQ entry 0 fails on PowerBook G4 867 12" (Al) */ + if (of_machine_is_compatible("PowerBook6,1")) + return load_nv17_hwsq_ucode_entry(dev, bios, + hwsq_offset + sz, 1); +#endif + /* always use entry 0? */ return load_nv17_hwsq_ucode_entry(dev, bios, hwsq_offset + sz, 0); } -- 2.30.2