public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/nouveau/devinit/nv50: remove unneeded variable

Browse source 
We never use any nv50-specific member in this nv50_devinit_preinit().

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Alexandre Courbot 2016-02-11 11:09:52 +09:00 • committed by Ben Skeggs
parent db1eb52846
commit 8fb1240a71
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
View file

@ -93,28 +93,27 @@ nv50_devinit_disable(struct nvkm_devinit *init)
void void
nv50_devinit_preinit(struct nvkm_devinit *base) nv50_devinit_preinit(struct nvkm_devinit *base)
{ {
struct nv50_devinit *init = nv50_devinit(base); struct nvkm_subdev *subdev = &base->subdev;
struct nvkm_subdev *subdev = &init->base.subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
/* our heuristics can't detect whether the board has had its /* our heuristics can't detect whether the board has had its
* devinit scripts executed or not if the display engine is * devinit scripts executed or not if the display engine is
* missing, assume it's a secondary gpu which requires post * missing, assume it's a secondary gpu which requires post
*/ */
if (!init->base.post) { if (!base->post) {
u64 disable = nvkm_devinit_disable(&init->base); u64 disable = nvkm_devinit_disable(base);
if (disable & (1ULL << NVKM_ENGINE_DISP)) if (disable & (1ULL << NVKM_ENGINE_DISP))
init->base.post = true; base->post = true;
} }
/* magic to detect whether or not x86 vbios code has executed /* magic to detect whether or not x86 vbios code has executed
* the devinit scripts to initialise the board * the devinit scripts to initialise the board
*/ */
if (!init->base.post) { if (!base->post) {
if (!nvkm_rdvgac(device, 0, 0x00) && if (!nvkm_rdvgac(device, 0, 0x00) &&
!nvkm_rdvgac(device, 0, 0x1a)) { !nvkm_rdvgac(device, 0, 0x1a)) {
nvkm_debug(subdev, "adaptor not initialised\n"); nvkm_debug(subdev, "adaptor not initialised\n");
init->base.post = true; base->post = true;
} }
} }
} }