From patchwork Mon Oct 17 10:46:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 3390 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1380612wrs; Mon, 17 Oct 2022 03:58:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/BBhAKPsjR+F4uNt4u+B+YdCVr04LGAAy8teRTeL/L/f2KqFHt/12b/j9bkTu1/rJyizy X-Received: by 2002:a05:6a00:1501:b0:563:9f05:bd6e with SMTP id q1-20020a056a00150100b005639f05bd6emr12125631pfu.48.1666004310533; Mon, 17 Oct 2022 03:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666004310; cv=none; d=google.com; s=arc-20160816; b=V2jeABMPKqlvsMKmwoTTNmz4LbafcIIkD+Y1TJIp8FzuG2TJiENX7VHa7bqTBtS28P q2zf22GXvDPovCfsWlY6qCJlducx31Ztlwu3alJNBvkM88vNp3JHWkaq6H8twZaLlihv edoHbSrEiMY2GaAuaOkWwg7ln1O5l+4NTlx2b0hIDIpboD38mlaxBEwmNU1vprRnjoWj TFIoipl1bU26l+5rVVEt4TUvn0dETL3koUFwPrh41OJ4MzDfP5USa18S/oavxSrznXDG FaDJYM3iokj+JIhfJQsmJ112kXNucKvABPwe35Kltd2M7J/GgjqvFkRJiWHGEOEFtKZq 0+Bg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YGdJu+abhxHHBSod+2U7lIGR4LGbdTSiRfIK2OJW2tA=; b=Eb2oqh5NaAB3eblqu7aHb6Peciii3vbiWFRZkMFem/EWttvJ20Nw3AoWLdX3RUxI5c hSqha6HvqVlwxT7CC2RpdzTXrYMSXmpWJFSpxrlPdcVFAq3jQvY2z/rRmZbpjufZNqsE kCqvnMZrme0wf5/HYxA8qf+axTGm+CGIfsTyyn4dwLBN/vVg5dpsXrqX0l/vd7xwW25X apf7FXSPBkVFE7wq+wR5jd60VNfapzs9MIwMxkIsitAv3rFa+VWXSGFPVxZ2hUcc5wti kP76vf8sCKk3bmZ5apC1IDLJpmsO+XPDqy25xa9YmKXv1+wPsiAtepCOTdh8IJTn9vg8 sFig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o6-20020a056a0015c600b005364d3b5482si13045948pfu.99.2022.10.17.03.58.17; Mon, 17 Oct 2022 03:58:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230199AbiJQKqT (ORCPT + 99 others); Mon, 17 Oct 2022 06:46:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbiJQKqN (ORCPT ); Mon, 17 Oct 2022 06:46:13 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A3EAC1A04D for ; Mon, 17 Oct 2022 03:46:12 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9D33D1FC4; Mon, 17 Oct 2022 03:46:18 -0700 (PDT) Received: from e122027.arm.com (unknown [10.57.1.201]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 345FD3F67D; Mon, 17 Oct 2022 03:46:11 -0700 (PDT) From: Steven Price To: Alyssa Rosenzweig , =?utf-8?q?Adri?= =?utf-8?q?=C3=A1n_Larumbe?= Cc: Steven Price , Rob Herring , Tomeu Vizoso , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Robin Murphy Subject: [PATCH v2 1/2] drm/panfrost: Remove type name from internal structs Date: Mon, 17 Oct 2022 11:46:01 +0100 Message-Id: <20221017104602.142992-2-steven.price@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221017104602.142992-1-steven.price@arm.com> References: <20221017104602.142992-1-steven.price@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746932135385282509?= X-GMAIL-MSGID: =?utf-8?q?1746932135385282509?= The two structs internal to struct panfrost_dump_object_header were named, but sadly that is incompatible with C++, causing an error: "an anonymous union may only have public non-static data members". However nothing refers to struct pan_reg_hdr and struct pan_bomap_hdr and there's no need to export these definitions, so lets drop them. This fixes the C++ build error with the minimum change in userspace API. Reported-by: Adrián Larumbe Fixes: 730c2bf4ad39 ("drm/panfrost: Add support for devcoredump") Signed-off-by: Steven Price --- include/uapi/drm/panfrost_drm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h index eac87310b348..bd77254be121 100644 --- a/include/uapi/drm/panfrost_drm.h +++ b/include/uapi/drm/panfrost_drm.h @@ -242,7 +242,7 @@ struct panfrost_dump_object_header { __le32 file_offset; union { - struct pan_reg_hdr { + struct { __le64 jc; __le32 gpu_id; __le32 major; @@ -250,7 +250,7 @@ struct panfrost_dump_object_header { __le64 nbos; } reghdr; - struct pan_bomap_hdr { + struct { __le32 valid; __le64 iova; __le32 data[2];