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

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

drm/nouveau/fb: cosmetic changes 



This is purely preparation for upcoming commits, there should be no
code changes here.

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct nvkm_fb_tile { 
};



struct nvkm_fb {

	struct nvkm_subdev base;

	struct nvkm_subdev subdev;



	bool (*memtype_valid)(struct nvkm_fb *, u32 memtype);

drivers/gpu/drm/nouveau/nouveau_bo.c

+10 −10
Original line number Diff line number Diff line
@@ -48,23 +48,23 @@ nv10_bo_update_tile_region(struct drm_device *dev, struct nouveau_drm_tile *reg, 
{

	struct nouveau_drm *drm = nouveau_drm(dev);

	int i = reg - drm->tile.reg;

	struct nvkm_fb *pfb = nvxx_fb(&drm->device);

	struct nvkm_fb_tile *tile = &pfb->tile.region[i];

	struct nvkm_fb *fb = nvxx_fb(&drm->device);

	struct nvkm_fb_tile *tile = &fb->tile.region[i];

	struct nvkm_engine *engine;



	nouveau_fence_unref(&reg->fence);



	if (tile->pitch)

		pfb->tile.fini(pfb, i, tile);

		fb->tile.fini(fb, i, tile);



	if (pitch)

		pfb->tile.init(pfb, i, addr, size, pitch, flags, tile);

		fb->tile.init(fb, i, addr, size, pitch, flags, tile);



	pfb->tile.prog(pfb, i, tile);

	fb->tile.prog(fb, i, tile);



	if ((engine = nvkm_engine(pfb, NVDEV_ENGINE_GR)))

	if ((engine = nvkm_engine(fb, NVDEV_ENGINE_GR)))

		engine->tile_prog(engine, i);

	if ((engine = nvkm_engine(pfb, NVDEV_ENGINE_MPEG)))

	if ((engine = nvkm_engine(fb, NVDEV_ENGINE_MPEG)))

		engine->tile_prog(engine, i);

}
@@ -105,18 +105,18 @@ nv10_bo_set_tiling(struct drm_device *dev, u32 addr, 
		   u32 size, u32 pitch, u32 flags)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nvkm_fb *pfb = nvxx_fb(&drm->device);

	struct nvkm_fb *fb = nvxx_fb(&drm->device);

	struct nouveau_drm_tile *tile, *found = NULL;

	int i;



	for (i = 0; i < pfb->tile.regions; i++) {

	for (i = 0; i < fb->tile.regions; i++) {

		tile = nv10_bo_get_tile_region(dev, i);



		if (pitch && !found) {

			found = tile;

			continue;



		} else if (tile && pfb->tile.region[i].pitch) {

		} else if (tile && fb->tile.region[i].pitch) {

			/* Kill an unused tile region. */

			nv10_bo_update_tile_region(dev, tile, 0, 0, 0, 0);

		}

drivers/gpu/drm/nouveau/nouveau_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -254,12 +254,12 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data, 
{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_cli *cli = nouveau_cli(file_priv);

	struct nvkm_fb *pfb = nvxx_fb(&drm->device);

	struct nvkm_fb *fb = nvxx_fb(&drm->device);

	struct drm_nouveau_gem_new *req = data;

	struct nouveau_bo *nvbo = NULL;

	int ret = 0;



	if (!pfb->memtype_valid(pfb, req->info.tile_flags)) {

	if (!fb->memtype_valid(fb, req->info.tile_flags)) {

		NV_PRINTK(error, cli, "bad page flags: 0x%08x\n", req->info.tile_flags);

		return -EINVAL;

	}

drivers/gpu/drm/nouveau/nouveau_ttm.c

+10 −10
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ static int 
nouveau_vram_manager_init(struct ttm_mem_type_manager *man, unsigned long psize)

{

	struct nouveau_drm *drm = nouveau_bdev(man->bdev);

	struct nvkm_fb *pfb = nvxx_fb(&drm->device);

	man->priv = pfb;

	struct nvkm_fb *fb = nvxx_fb(&drm->device);

	man->priv = fb;

	return 0;

}
@@ -64,9 +64,9 @@ nouveau_vram_manager_del(struct ttm_mem_type_manager *man, 
			 struct ttm_mem_reg *mem)

{

	struct nouveau_drm *drm = nouveau_bdev(man->bdev);

	struct nvkm_fb *pfb = nvxx_fb(&drm->device);

	struct nvkm_fb *fb = nvxx_fb(&drm->device);

	nvkm_mem_node_cleanup(mem->mm_node);

	pfb->ram->put(pfb, (struct nvkm_mem **)&mem->mm_node);

	fb->ram->put(fb, (struct nvkm_mem **)&mem->mm_node);

}



static int
@@ -76,7 +76,7 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, 
			 struct ttm_mem_reg *mem)

{

	struct nouveau_drm *drm = nouveau_bdev(man->bdev);

	struct nvkm_fb *pfb = nvxx_fb(&drm->device);

	struct nvkm_fb *fb = nvxx_fb(&drm->device);

	struct nouveau_bo *nvbo = nouveau_bo(bo);

	struct nvkm_mem *node;

	u32 size_nc = 0;
@@ -88,7 +88,7 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, 
	if (nvbo->tile_flags & NOUVEAU_GEM_TILE_NONCONTIG)

		size_nc = 1 << nvbo->page_shift;



	ret = pfb->ram->get(pfb, mem->num_pages << PAGE_SHIFT,

	ret = fb->ram->get(fb, mem->num_pages << PAGE_SHIFT,

			   mem->page_alignment << PAGE_SHIFT, size_nc,

			   (nvbo->tile_flags >> 8) & 0x3ff, &node);

	if (ret) {
@@ -106,12 +106,12 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, 
static void

nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)

{

	struct nvkm_fb *pfb = man->priv;

	struct nvkm_mm *mm = &pfb->vram;

	struct nvkm_fb *fb = man->priv;

	struct nvkm_mm *mm = &fb->vram;

	struct nvkm_mm_node *r;

	u32 total = 0, free = 0;



	mutex_lock(&nv_subdev(pfb)->mutex);

	mutex_lock(&nv_subdev(fb)->mutex);

	list_for_each_entry(r, &mm->nodes, nl_entry) {

		printk(KERN_DEBUG "%s %d: 0x%010llx 0x%010llx\n",

		       prefix, r->type, ((u64)r->offset << 12),
@@ -121,7 +121,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix) 
		if (!r->type)

			free += r->length;

	}

	mutex_unlock(&nv_subdev(pfb)->mutex);

	mutex_unlock(&nv_subdev(fb)->mutex);



	printk(KERN_DEBUG "%s  total: 0x%010llx free: 0x%010llx\n",

	       prefix, (u64)total << 12, (u64)free << 12);

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int 
nvkm_devobj_info(struct nvkm_object *object, void *data, u32 size)

{

	struct nvkm_device *device = nv_device(object);

	struct nvkm_fb *pfb = nvkm_fb(device);

	struct nvkm_fb *fb = nvkm_fb(device);

	struct nvkm_instmem *imem = nvkm_instmem(device);

	union {

		struct nv_device_info_v0 v0;
@@ -139,8 +139,8 @@ nvkm_devobj_info(struct nvkm_object *object, void *data, u32 size) 


	args->v0.chipset  = device->chipset;

	args->v0.revision = device->chiprev;

	if (pfb && pfb->ram)

		args->v0.ram_size = args->v0.ram_user = pfb->ram->size;

	if (fb && fb->ram)

		args->v0.ram_size = args->v0.ram_user = fb->ram->size;

	else

		args->v0.ram_size = args->v0.ram_user = 0;

	if (imem && args->v0.ram_size > 0)