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;
From:   "Wang, Zhi A" <zhi.a.wang@intel.com>
To:     Jason Gunthorpe <jgg@nvidia.com>,
        Alex Williamson <alex.williamson@redhat.com>
CC:     Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        "Vivi, Rodrigo" <rodrigo.vivi@intel.com>,
        Christoph Hellwig <hch@lst.de>,
        "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>,
        "intel-gvt-dev@lists.freedesktop.org" 
        <intel-gvt-dev@lists.freedesktop.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Zhenyu Wang <zhenyuw@linux.intel.com>
Subject: Re: [PULL v2] gvt-next
Thread-Topic: [PULL v2] gvt-next
Thread-Index: AQHYVNSMOPXpKvGgN0OvGCZ3HfiQDqz5AfeAgAAP2ICAAAGGAIAAJZkAgACWCIA=
Date:   Thu, 21 Apr 2022 04:57:34 +0000
Message-ID: <55cb46db-754e-e339-178c-0a2cfaf65810@intel.com>
References: <5a8b9f48-2c32-8177-1c18-e3bd7bfde558@intel.com>
 <20220420164351.GC2120790@nvidia.com>
 <20220420114033.7f8b57c7.alex.williamson@redhat.com>
 <20220420174600.GD2120790@nvidia.com> <20220420200034.GE2120790@nvidia.com>
In-Reply-To: <20220420200034.GE2120790@nvidia.com>
Accept-Language: en-FI, en-US
Content-Language: aa
user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?Windows-1252?Q?B17fq3ig7uol1wIi88ENc2Klzcg7M8b3KROGvA46+IfpGYjnMR5lnFaK?=
 =?Windows-1252?Q?PG4UnoJk1zGLIm4EYZOYQPgTsGe4ovWRhXRM/wu2dzPIEUvRJRYZkKJw?=
 =?Windows-1252?Q?UPsVKgqWPYa8x+LvHfz4PsBs/3XjjaUSDGwaG4G0rzYKVhC1ei+RvQB6?=
 =?Windows-1252?Q?Ud0vG4dF2pKpWLRe9U+Cmm7anqqO1CiRKh9PvhgDlOhdpGkzGjYsN8et?=
 =?Windows-1252?Q?sReHs9rb0hzJGQ7GssJzBHvsN7z0eG1HChwzBxL5T9iMJX4M5oduqcG2?=
 =?Windows-1252?Q?xnaVXJbyAi9taQ6AcV/zV73VE++GxcXg2HgoVf+d22MkZRqmO4Ndbewp?=
 =?Windows-1252?Q?xhzjnMu8OMxu9OgvMKAqgN1pSuW3ayhTqXZQFZ8q084xDyKu2iPBzuBW?=
 =?Windows-1252?Q?U42nZSNJDuQbtb/tt4zKutaFnM/hksYPLY5mEtwEh7/xf7/DQxrDJqey?=
 =?Windows-1252?Q?vMXnvC20kUqVMrZTePtE4yyQ/bpggOiCpvGKzMI8XNuOe1BaJE8vrcOK?=
 =?Windows-1252?Q?7uGOHdrkVtDsqWNFXEdtCO33Egfvwe+Y0FOVZy83h3vVd1IWlcYOvcxk?=
 =?Windows-1252?Q?1HDxFez+BAiPtlhMG3twlUODagiaVTo9SEJj+Iex3X9ele1cubmWg5Fi?=
 =?Windows-1252?Q?vAV8fRsZH3bh6M8enrNwsBd/ws9j6rJXuMPJ6vD8GXpsoFUDvgnK8oBt?=
 =?Windows-1252?Q?QuVQphxesvxM3FRqJ+S+9FDKn8zt5D7yqbOgsMw0Aam/+iHpslxyU7Pf?=
 =?Windows-1252?Q?tHtqs3E/rgIjjhowEykFc34MUhBaZNiMuBGJTlw5zL7jhd/4A1f7gfQi?=
 =?Windows-1252?Q?rl5M+if5MU5JkMs+8W/j9n6AFy2S720M8yE4XLAC9n0Gyuv6K1hGax66?=
 =?Windows-1252?Q?z0+EhKqpUaoCzzJIaLiYG5rRVkvWiXnOv0KNkSmQ+isdrg7Du8m897mB?=
 =?Windows-1252?Q?qtnePbq07rUPZ24cMyYKDqmKpKEeDM/+fnl0IiaMS4h9GLeWqv06WtHc?=
 =?Windows-1252?Q?sGpB3DdwKGszR17jJIt7nsde8qaJozmBsi9j9Fc2Wse238+XBMjs2Weq?=
 =?Windows-1252?Q?dF4ybW8tLtWddufuCgjmq+h9jWq9IocMXj3HmfLqgCBQQq7VV3kVkG3z?=
 =?Windows-1252?Q?WdcH3bnZ9GJcm5PRB/6yFVPu86NRA9CUzNFf3Qw2JLGnBeKqU0vBQ4Wa?=
 =?Windows-1252?Q?GBSDX0Qb9mHIM2VWqpPAMk078HC6xduZiLBdTRSCxaE0zM6rrUFEygpr?=
 =?Windows-1252?Q?Qc9n1fbbh5IbC7ZkdeUExfGejt2uT8AGn8vFd/LhKBNiTXsWSMbj88gV?=
 =?Windows-1252?Q?L1Jm/TFwjtLE8hQZMx1ZWpiYamSrwg3uDL0ljXjB/SdYxoKu3Zx8uhIX?=
 =?Windows-1252?Q?CiG3xOoYf3TIxHA9qwin2xJgE+gUS9hURYkx0S72c0S7JsLti3vhhOPe?=
 =?Windows-1252?Q?n83gp5Trkyxfrek6k4c0cvVeA7fgw3bx56cvc9ey0WzpoMPEj4cD77zl?=
 =?Windows-1252?Q?5jfllZzRotPlfyGCeI9Tztpy9h8P6XH/OnjQa9EONvc8FPZxqy4EVIA6?=
 =?Windows-1252?Q?0u7MV6ejGPo7rsDC0GF7MHiOwGm85NNxUpPN48gDFiN3XLF87Lw9mNcH?=
 =?Windows-1252?Q?VFPqBCEgaifKEvhHyGOArvzOaMmvNCtXNXeDP8f8NcT2xtLESQt21m+X?=
 =?Windows-1252?Q?IMefdkb4/a2CMkydrU1pbGXVajdpZNmCq91u/iMOV28+2PQ2oJzueBKN?=
 =?Windows-1252?Q?aSFj3HTFOnhMlWP74OyzkGhiLOaB7yz5LFhxMWfAEGELg4XtUfY/1PCF?=
 =?Windows-1252?Q?eB6IxY35WO8fS/W60UQPAv+RZfVONnC5P3Vy40f+cQp//vjhVB+qJLau?=
 =?Windows-1252?Q?3os94sLVFYNf/Q=3D=3D?=
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <102C5A74ED774B4D869495C2D540C81F@namprd11.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5549.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 68bb0dca-a6a9-42e9-c868-08da235372d2
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Apr 2022 04:57:34.1552
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: gnj7YSzhSA6eEljOERZNUrOuRyrSBSUWCZFBrcYrD1mnI9BPkWe8dQt3yztZagRLicxBKNLh0kWi6IXF178MiQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3398
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_HI,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 4/20/22 8:00 PM, Jason Gunthorpe wrote:
> On Wed, Apr 20, 2022 at 02:46:00PM -0300, Jason Gunthorpe wrote:
>> On Wed, Apr 20, 2022 at 11:40:33AM -0600, Alex Williamson wrote:
>>> On Wed, 20 Apr 2022 13:43:51 -0300
>>> Jason Gunthorpe <jgg@nvidia.com> wrote:
>>>
>>>> On Wed, Apr 20, 2022 at 04:34:47PM +0000, Wang, Zhi A wrote:
>>>>> Hi folks:
>>>>>
>>>>> Here is the PR of gvt-next. Thanks so much for the patience.
>>>>>
>>>>> Mostly it includes the patch bundle of GVT-g re-factor patches for ad=
apting the GVT-g with the
>>>>> new MDEV interfaces:
>>>>>
>>>>> - Separating the MMIO table from GVT-g. (Zhi)
>>>>> - GVT-g re-factor. (Christoph)
>>>>> - GVT-g mdev API cleanup. (Jason)
>>>>> - GVT-g trace/makefile cleanup. (Jani)
>>>>>
>>>>> Thanks so much for making this happen.
>>>>>
>>>>> This PR has been tested as following and no problem shows up:
>>>>>
>>>>> $dim update-branches
>>>>> $dim apply-pull drm-intel-next < this_email.eml
>>>>>
>>>>> The following changes since commit 3123109284176b1532874591f7c81f3837=
bbdc17:
>>>>>
>>>>>   Linux 5.18-rc1 (2022-04-03 14:08:21 -0700)
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>>   https://github.com/intel/gvt-linux tags/gvt-next-2022-04-20-for-chr=
istoph
>>>>>
>>>>> for you to fetch changes up to ae7875879b7c838bffb42ed6db4658e5c50403=
2e:
>>>>>
>>>>>   vfio/mdev: Remove mdev drvdata (2022-04-20 03:15:58 -0400) =20
>>>>
>>>> This looks well constructed now! thanks
>>>>
>>>> Alex you can pull this for VFIO after Jani&co grab it
>>>>
>>>> I'll respin my vfio_group series on top of this branch
>>>
>>> Sure, so just to confirm tags/gvt-next-2022-04-20-for-christoph is
>>> pruned down to exactly the commits we're looking for now?  Thanks,
>>
>> Yes, the above is correct and the tag points to commit
>> ae7875879b7c838bffb42ed6db4658e5c504032e
>>
>> It is the bare minimum series
>=20
> Actually this topic branch doesn't compile:
>=20
> ../drivers/gpu/drm/i915/intel_gvt_mmio_table.c:7:10: fatal error: 'displa=
y/intel_dmc_regs.h' file not found
> #include "display/intel_dmc_regs.h"
>          ^~~~~~~~~~~~~~~~~~~~~~~~~~
> 1 error generated.
>=20
> :( :(
>=20
> This is the merge conflict that was mentioned. This topic branch needs
> to delete the above intel_dmc_regs.h include file
>=20
> When drm-intel-next merges this PR then need to add it back as part of
> the merge resolution - so explain this in the PR text above and
> include a diff that does it when you send it again. (or do the merge
> yourself as I showed before, it depends on what drm-intel-next wants)
>=20
Hi Jason:

Is it possible that I can send two different pull based on the same branch?
I was thinking I can remove this line in the original patch and then add a
small patch to add this line back on the top. Then make two different tags
before and after that small patch, send one pull with tag that includes tha=
t
small patch to i915 and the other pull with tag that doesn't includes it to
VFIO?

Thanks,
Zhi.

> Jason
>=20