On Mon, Oct 13, 2014 at 08:16:57PM +0100, Emil Velikov wrote: > On 13/10/14 12:47, Thierry Reding wrote: > > On Mon, Jul 21, 2014 at 02:02:58PM +0200, Thierry Reding wrote: > >> From: Thierry Reding <treding@xxxxxxxxxx> > >> > >> The return type of exec_lookup() is struct nvkm_output *, so it should > >> return NULL rather than 0. > >> > >> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx> > >> --- > >> drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c > >> index fa30d8196f35..ebf64e1d0a70 100644 > >> --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c > >> +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c > >> @@ -939,7 +939,7 @@ exec_lookup(struct nv50_disp_priv *priv, int head, int or, u32 ctrl, > >> case 0x00000900: type = DCB_OUTPUT_DP; mask = 2; break; > >> default: > >> nv_error(priv, "unknown SOR mc 0x%08x\n", ctrl); > >> - return 0x0000; > >> + return NULL; > >> } > >> } > >> > > > > Ping? > > > > Thierry > > > I have an identical patch in a local branch, but with worse commit > message :) Fwiw the patch is > > Reviewed-by: Emil Velikov <emil.l.velikov@xxxxxxxxx> Ben, any chance you could pick this up? It should still apply as-is on recent trees, but I can resend if you prefer. Thierry
Attachment:
pgprjsGhcjUMZ.pgp
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
