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

Commit 60958b8f authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/fb/gk20a: use regular gf100's functions 



gk20a's FB is not special compared to other Kepler chips, besides the
fact it does not have VRAM. Use the regular gf100 hooks instead of the
incomplete versions we rewrote.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Reviewed-By: default avatarKarol Herbst <karolherbst@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 635cb7da

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c

+5 −12
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.

 * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved.

 *

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * copy of this software and associated documentation files (the "Software"),
@@ -22,21 +22,14 @@ 
#include "priv.h"

#include "priv.h"

#include "gf100.h"

#include "gf100.h"





#include <core/memory.h>

/* GK20A's FB is similar to GF100's, but without the ability to allocate VRAM */



static void

gk20a_fb_init(struct nvkm_fb *fb)

{

	struct nvkm_device *device = fb->subdev.device;

	nvkm_wr32(device, 0x100cc8, nvkm_memory_addr(fb->mmu_wr) >> 8);

	nvkm_wr32(device, 0x100ccc, nvkm_memory_addr(fb->mmu_rd) >> 8);

}



static const struct nvkm_fb_func

static const struct nvkm_fb_func

gk20a_fb = {

gk20a_fb = {

	.dtor = gf100_fb_dtor,

	.oneinit = gf100_fb_oneinit,

	.oneinit = gf100_fb_oneinit,

	.init = gk20a_fb_init,

	.init = gf100_fb_init,

	.init_page = gf100_fb_init_page,

	.init_page = gf100_fb_init_page,

	.intr = gf100_fb_intr,

	.memtype_valid = gf100_fb_memtype_valid,

	.memtype_valid = gf100_fb_memtype_valid,

};

};