Nouveau - Feb 2014 - [PATCH] drm/nv50/gr: add missing nv_error parameter priv

Commit ea7dce901 ("drm/nv50/gr: print mpc trap name when it's not an mp
trap") added an nv_error call that was missing the priv parameter. This
causes GPFs if the error is ever hit.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---

Sorry, my bad! But... I hit it and it killed my computer. So things are
probably even.

 drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
index 6da473c..ef38320 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
@@ -540,7 +540,7 @@ nv50_priv_tp_trap(struct nv50_graph_priv *priv, int type,
u32 ustatus_old,
 				ustatus &= ~0x04030000;
 			}
 			if (ustatus && display) {
-				nv_error("%s - TP%d:", name, i);
+				nv_error(priv, "%s - TP%d:", name, i);
 				nouveau_bitfield_print(nv50_mpc_traps, ustatus);
 				pr_cont("\n");
 				ustatus = 0;
-- 
1.8.3.2

On Sun, Feb 9, 2014 at 1:35 PM, Ilia Mirkin <imirkin at alum.mit.edu>
wrote:
> Commit ea7dce901 ("drm/nv50/gr: print mpc trap name when it's not
an mp
> trap") added an nv_error call that was missing the priv parameter.
This
> causes GPFs if the error is ever hit.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Merged, thanks :)
> ---
>
> Sorry, my bad! But... I hit it and it killed my computer. So things are
> probably even.
>
>  drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
> index 6da473c..ef38320 100644
> --- a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
> +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
> @@ -540,7 +540,7 @@ nv50_priv_tp_trap(struct nv50_graph_priv *priv, int
type, u32 ustatus_old,
>                                 ustatus &= ~0x04030000;
>                         }
>                         if (ustatus && display) {
> -                               nv_error("%s - TP%d:", name, i);
> +                               nv_error(priv, "%s - TP%d:",
name, i);
>                                 nouveau_bitfield_print(nv50_mpc_traps,
ustatus);
>                                 pr_cont("\n");
>                                 ustatus = 0;
> --
> 1.8.3.2
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau