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

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

drm/nouveau/devinit: allow impl to select its own cold-boot method 



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

drivers/gpu/drm/nouveau/core/subdev/devinit/base.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ 




#include <core/option.h>

#include <core/option.h>





#include <subdev/bios.h>

#include <subdev/bios/init.h>

#include <subdev/vga.h>

#include <subdev/vga.h>





#include "priv.h"

#include "priv.h"
@@ -56,7 +54,7 @@ _nouveau_devinit_init(struct nouveau_object *object) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = nvbios_init(&devinit->base, devinit->post);

	ret = impl->post(&devinit->base, devinit->post);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/gpu/drm/nouveau/core/subdev/devinit/gm107.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,4 +53,5 @@ gm107_devinit_oclass = &(struct nouveau_devinit_impl) { 
	},

	},

	.pll_set = nvc0_devinit_pll_set,

	.pll_set = nvc0_devinit_pll_set,

	.disable = gm107_devinit_disable,

	.disable = gm107_devinit_disable,

	.post = nvbios_init,

}.base;
 
}.base;

drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -464,4 +464,5 @@ nv04_devinit_oclass = &(struct nouveau_devinit_impl) { 
	},

	},

	.meminit = nv04_devinit_meminit,

	.meminit = nv04_devinit_meminit,

	.pll_set = nv04_devinit_pll_set,

	.pll_set = nv04_devinit_pll_set,

	.post = nvbios_init,

}.base;
 
}.base;

drivers/gpu/drm/nouveau/core/subdev/devinit/nv05.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -136,4 +136,5 @@ nv05_devinit_oclass = &(struct nouveau_devinit_impl) { 
	},

	},

	.meminit = nv05_devinit_meminit,

	.meminit = nv05_devinit_meminit,

	.pll_set = nv04_devinit_pll_set,

	.pll_set = nv04_devinit_pll_set,

	.post = nvbios_init,

}.base;
 
}.base;

drivers/gpu/drm/nouveau/core/subdev/devinit/nv10.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -107,4 +107,5 @@ nv10_devinit_oclass = &(struct nouveau_devinit_impl) { 
	},

	},

	.meminit = nv10_devinit_meminit,

	.meminit = nv10_devinit_meminit,

	.pll_set = nv04_devinit_pll_set,

	.pll_set = nv04_devinit_pll_set,

	.post = nvbios_init,

}.base;
 
}.base;