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

drm/nouveau: fix some usages of the wrong print function 



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

drivers/gpu/drm/nouveau/dispnv04/overlay.c

+5 −5
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static const struct drm_plane_funcs nv10_plane_funcs = { 
static void

nv10_overlay_init(struct drm_device *device)

{

	struct nouveau_device *dev = nouveau_dev(device);

	struct nouveau_drm *drm = nouveau_drm(device);

	struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL);

	int num_formats = ARRAY_SIZE(formats);

	int ret;
@@ -264,7 +264,7 @@ nv10_overlay_init(struct drm_device *device) 
	if (!plane)

		return;



	switch (dev->chipset) {

	switch (nv_device(drm->device)->chipset) {

	case 0x10:

	case 0x11:

	case 0x15:
@@ -333,7 +333,7 @@ nv10_overlay_init(struct drm_device *device) 
	drm_plane_cleanup(&plane->base);

err:

	kfree(plane);

	nv_error(dev, "Failed to create plane\n");

	NV_ERROR(drm, "Failed to create plane\n");

}



static int
@@ -447,7 +447,7 @@ static const struct drm_plane_funcs nv04_plane_funcs = { 
static void

nv04_overlay_init(struct drm_device *device)

{

	struct nouveau_device *dev = nouveau_dev(device);

	struct nouveau_drm *drm = nouveau_drm(device);

	struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL);

	int ret;
@@ -483,7 +483,7 @@ nv04_overlay_init(struct drm_device *device) 
	drm_plane_cleanup(&plane->base);

err:

	kfree(plane);

	nv_error(dev, "Failed to create plane\n");

	NV_ERROR(drm, "Failed to create plane\n");

}



void

drivers/gpu/drm/nouveau/nouveau_abi16.c

+2 −1
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ nouveau_abi16_fini(struct nouveau_abi16 *abi16) 
int

nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)

{

	struct nouveau_cli *cli = nouveau_cli(file_priv);

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_device *device = nv_device(drm->device);

	struct nouveau_timer *ptimer = nouveau_timer(device);
@@ -224,7 +225,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
		getparam->value = graph->units ? graph->units(graph) : 0;

		break;

	default:

		nv_debug(device, "unknown parameter %lld\n", getparam->param);

		NV_PRINTK(debug, cli, "unknown parameter %lld\n", getparam->param);

		return -EINVAL;

	}

drivers/gpu/drm/nouveau/nouveau_agp.c

+4 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info) 
		    device->pdev->vendor == quirk->chip_vendor &&

		    device->pdev->device == quirk->chip_device) {

			agpmode = quirk->mode;

			nv_info(device, "Forcing agp mode to %dX. Use agpmode to override.\n",

			NV_INFO(drm, "Forcing agp mode to %dX. Use agpmode to override.\n",

				agpmode);

			break;

		}
@@ -150,7 +150,6 @@ void 
nouveau_agp_init(struct nouveau_drm *drm)

{

#if __OS_HAS_AGP

	struct nouveau_device *device = nv_device(drm->device);

	struct drm_device *dev = drm->dev;

	struct drm_agp_info info;

	struct drm_agp_mode mode;
@@ -162,13 +161,13 @@ nouveau_agp_init(struct nouveau_drm *drm) 


	ret = drm_agp_acquire(dev);

	if (ret) {

		nv_error(device, "unable to acquire AGP: %d\n", ret);

		NV_ERROR(drm, "unable to acquire AGP: %d\n", ret);

		return;

	}



	ret = drm_agp_info(dev, &info);

	if (ret) {

		nv_error(device, "unable to get AGP info: %d\n", ret);

		NV_ERROR(drm, "unable to get AGP info: %d\n", ret);

		return;

	}
@@ -177,7 +176,7 @@ nouveau_agp_init(struct nouveau_drm *drm) 


	ret = drm_agp_enable(dev, mode);

	if (ret) {

		nv_error(device, "unable to enable AGP: %d\n", ret);

		NV_ERROR(drm, "unable to enable AGP: %d\n", ret);

		return;

	}

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ nouveau_bo_new(struct drm_device *dev, int size, int align, 
	max_size = INT_MAX & ~((1 << lpg_shift) - 1);



	if (size <= 0 || size > max_size) {

		nv_warn(drm, "skipped size %x\n", (u32)size);

		NV_WARN(drm, "skipped size %x\n", (u32)size);

		return -EINVAL;

	}

drivers/gpu/drm/nouveau/nouveau_chan.c

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ nouveau_channel_idle(struct nouveau_channel *chan) 
	}



	if (ret)

		NV_ERROR(cli, "failed to idle channel 0x%08x [%s]\n",

		NV_PRINTK(error, cli, "failed to idle channel 0x%08x [%s]\n",

			 chan->handle, cli->base.name);

	return ret;

}
@@ -379,17 +379,17 @@ nouveau_channel_new(struct nouveau_drm *drm, struct nouveau_cli *cli, 


	ret = nouveau_channel_ind(drm, cli, parent, handle, arg0, pchan);

	if (ret) {

		NV_DEBUG(cli, "ib channel create, %d\n", ret);

		NV_PRINTK(debug, cli, "ib channel create, %d\n", ret);

		ret = nouveau_channel_dma(drm, cli, parent, handle, pchan);

		if (ret) {

			NV_DEBUG(cli, "dma channel create, %d\n", ret);

			NV_PRINTK(debug, cli, "dma channel create, %d\n", ret);

			return ret;

		}

	}



	ret = nouveau_channel_init(*pchan, arg0, arg1);

	if (ret) {

		NV_ERROR(cli, "channel failed to initialise, %d\n", ret);

		NV_PRINTK(error, cli, "channel failed to initialise, %d\n", ret);

		nouveau_channel_del(pchan);

		return ret;

	}