On Tue, Mar 25, 2014 at 8:58 AM, Thierry Reding <thierry.reding@xxxxxxxxx> wrote: > On Mon, Mar 24, 2014 at 05:42:30PM +0900, Alexandre Courbot wrote: > [...] >> diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c >> index 6ef8bf181b2d..f997a18f5760 100644 >> --- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c >> +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c >> @@ -1133,10 +1133,14 @@ nvc0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine, >> struct nvc0_graph_oclass *oclass = (void *)bclass; >> struct nouveau_device *device = nv_device(parent); >> struct nvc0_graph_priv *priv; >> + bool use_fw; > > Perhaps "ext_fw" or "use_ext_fw" would be more accurate. > >> int ret, i; >> >> + use_fw = nouveau_boolopt(device->cfgopt, "NvGrUseFW", false); >> + >> ret = nouveau_graph_create(parent, engine, bclass, >> - (oclass->fecs.ucode != NULL), &priv); >> + (oclass->fecs.ucode != NULL) || use_fw, >> + &priv); > > Or perhaps a more intuitive way would be to name the variable "enable" > and have something like: > > if (!nouveau_boolopt(device->cfgopt, "NvGrUseFW", false)) > enable = oclass->fecs.ucode != NULL; > else > enable = true; > > ret = nouveau_graph_create(parent, engine, bclass, enable, &priv); > ... Agreed, this looks a lot nicer. > > Thierry > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
