[Groovy][PATCH] drm/nouveau/device: return error for unknown chipsets

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[Groovy][PATCH] drm/nouveau/device: return error for unknown chipsets

dann frazier-4
From: Karol Herbst <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1898130

Previously the code relied on device->pri to be NULL and to fail probing
later. We really should just return an error inside nvkm_device_ctor for
unsupported GPUs.

Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")

Signed-off-by: Karol Herbst <[hidden email]>
Cc: dann frazier <[hidden email]>
Cc: dri-devel <[hidden email]>
Cc: Dave Airlie <[hidden email]>
Cc: [hidden email]
Reviewed-by: Jeremy Cline <[hidden email]>
Signed-off-by: Dave Airlie <[hidden email]>
Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@...
(cherry picked from commit c3e0276c31ca8c7b8615da890727481260d4676f linux-next)
Signed-off-by: dann frazier <[hidden email]>
---
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 5b90c2a1bf3d..7c2e5db840be 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
  case 0x168: device->chip = &nv168_chipset; break;
  default:
  nvdev_error(device, "unknown chipset (%08x)\n", boot0);
+ ret = -ENODEV;
  goto done;
  }
 
--
2.28.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [Groovy][PATCH] drm/nouveau/device: return error for unknown chipsets

Kleber Souza
On 08.10.20 14:43, dann frazier wrote:

> From: Karol Herbst <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1898130
>
> Previously the code relied on device->pri to be NULL and to fail probing
> later. We really should just return an error inside nvkm_device_ctor for
> unsupported GPUs.
>
> Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")
>
> Signed-off-by: Karol Herbst <[hidden email]>
> Cc: dann frazier <[hidden email]>
> Cc: dri-devel <[hidden email]>
> Cc: Dave Airlie <[hidden email]>
> Cc: [hidden email]
> Reviewed-by: Jeremy Cline <[hidden email]>
> Signed-off-by: Dave Airlie <[hidden email]>
> Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@...
> (cherry picked from commit c3e0276c31ca8c7b8615da890727481260d4676f linux-next)
> Signed-off-by: dann frazier <[hidden email]>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

> ---
>  drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> index 5b90c2a1bf3d..7c2e5db840be 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
> @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
>   case 0x168: device->chip = &nv168_chipset; break;
>   default:
>   nvdev_error(device, "unknown chipset (%08x)\n", boot0);
> + ret = -ENODEV;
>   goto done;
>   }
>  
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED[G/Unstable]: [Groovy][PATCH] drm/nouveau/device: return error for unknown chipsets

Seth Forshee
In reply to this post by dann frazier-4
On Thu, Oct 08, 2020 at 06:43:51AM -0600, dann frazier wrote:

> From: Karol Herbst <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1898130
>
> Previously the code relied on device->pri to be NULL and to fail probing
> later. We really should just return an error inside nvkm_device_ctor for
> unsupported GPUs.
>
> Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")
>
> Signed-off-by: Karol Herbst <[hidden email]>
> Cc: dann frazier <[hidden email]>
> Cc: dri-devel <[hidden email]>
> Cc: Dave Airlie <[hidden email]>
> Cc: [hidden email]
> Reviewed-by: Jeremy Cline <[hidden email]>
> Signed-off-by: Dave Airlie <[hidden email]>
> Link: https://patchwork.freedesktop.org/patch/msgid/20201006220528.13925-1-kherbst@...
> (cherry picked from commit c3e0276c31ca8c7b8615da890727481260d4676f linux-next)
> Signed-off-by: dann frazier <[hidden email]>

Applied to groovy/master-next and unstable/master, thanks!

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team