Hi Danilo,
On Wed, 19 Mar 2025 12:16:39 +0100 Danilo Krummrich <dakr@xxxxxxxxxx> wrote:
>
> The following diff should fix the below conflict.
>
> diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs
> index 63c19f140fbd..a08fb6599267 100644
> --- a/drivers/gpu/nova-core/driver.rs
> +++ b/drivers/gpu/nova-core/driver.rs
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
>
> -use kernel::{bindings, c_str, pci, prelude::*};
> +use kernel::{bindings, c_str, device::Core, pci, prelude::*};
>
> use crate::gpu::Gpu;
>
> @@ -27,7 +27,7 @@ impl pci::Driver for NovaCore {
> type IdInfo = ();
> const ID_TABLE: pci::IdTable<Self::IdInfo> = &PCI_TABLE;
>
> - fn probe(pdev: &mut pci::Device, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
> + fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
> dev_dbg!(pdev.as_ref(), "Probe Nova Core GPU driver.\n");
>
> pdev.enable_device_mem()?;
>
I have added that to the merge resolution for the merge of the
driver-core tree today and it works for me. Thanks.
--
Cheers,
Stephen Rothwell
Attachment:
pgpYmcV4AcLqj.pgp
Description: OpenPGP digital signature
