Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeb9cc01 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0: fix init without firmware present 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 47a44d27

drivers/gpu/drm/nouveau/nvc0_graph.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -584,7 +584,7 @@ nvc0_graph_init_ctxctl(struct drm_device *dev) 
	r000260 = nv_mask(dev, 0x000260, 0x00000001, 0x00000000);

	r000260 = nv_mask(dev, 0x000260, 0x00000001, 0x00000000);

	ret = nvc0_fuc_load_fw(dev, 0x409000, "fuc409c", "fuc409d");

	ret = nvc0_fuc_load_fw(dev, 0x409000, "fuc409c", "fuc409d");

	if (ret == 0)

	if (ret == 0)

		nvc0_fuc_load_fw(dev, 0x41a000, "fuc41ac", "fuc41ad");

		ret = nvc0_fuc_load_fw(dev, 0x41a000, "fuc41ac", "fuc41ad");

	nv_wr32(dev, 0x000260, r000260);

	nv_wr32(dev, 0x000260, r000260);





	if (ret)

	if (ret)
@@ -686,9 +686,7 @@ nvc0_graph_init(struct drm_device *dev) 
	nv_wr32(dev, 0x400054, 0x34ce3464);

	nv_wr32(dev, 0x400054, 0x34ce3464);





	ret = nvc0_graph_init_ctxctl(dev);

	ret = nvc0_graph_init_ctxctl(dev);

	if (ret)

	if (ret == 0)

		return ret;



		dev_priv->engine.graph.accel_blocked = false;

		dev_priv->engine.graph.accel_blocked = false;

	return 0;

	return 0;

}

}