Commit 2536f7dc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-fixes' of... 

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: init vblank requests list
  drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
  drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
  drm/nouveau: move current gpuobj code out of nouveau_object.c
  drm/nouveau/gem: fix object reference leak in a failure path
  drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
  drm/nv84: decode PCRYPT errors
  drm/nouveau: dcb table quirk for fdo#50830
  nouveau: Fix alignment requirements on src and dst addresses
parents fcedac67 71585545

drivers/gpu/drm/nouveau/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


ccflags-y := -Iinclude/drm

nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \

             nouveau_object.o nouveau_irq.o nouveau_notifier.o \

             nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \

             nouveau_sgdma.o nouveau_dma.o nouveau_util.o \

             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \

             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
@@ -12,6 +12,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nouveau_hdmi.o nouveau_dp.o nouveau_ramht.o \

	     nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \

	     nouveau_mm.o nouveau_vm.o nouveau_mxm.o nouveau_gpio.o \

	     nouveau_abi16.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv20_fb.o nv30_fb.o nv40_fb.o \

drivers/gpu/drm/nouveau/nouveau_abi16.c

0 → 100644
+245 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

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

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

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#include "drmP.h"



#include "nouveau_drv.h"

#include "nouveau_dma.h"

#include "nouveau_abi16.h"

#include "nouveau_ramht.h"

#include "nouveau_software.h"



int

nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_nouveau_getparam *getparam = data;



	switch (getparam->param) {

	case NOUVEAU_GETPARAM_CHIPSET_ID:

		getparam->value = dev_priv->chipset;

		break;

	case NOUVEAU_GETPARAM_PCI_VENDOR:

		getparam->value = dev->pci_vendor;

		break;

	case NOUVEAU_GETPARAM_PCI_DEVICE:

		getparam->value = dev->pci_device;

		break;

	case NOUVEAU_GETPARAM_BUS_TYPE:

		if (drm_pci_device_is_agp(dev))

			getparam->value = 0;

		else

		if (!pci_is_pcie(dev->pdev))

			getparam->value = 1;

		else

			getparam->value = 2;

		break;

	case NOUVEAU_GETPARAM_FB_SIZE:

		getparam->value = dev_priv->fb_available_size;

		break;

	case NOUVEAU_GETPARAM_AGP_SIZE:

		getparam->value = dev_priv->gart_info.aper_size;

		break;

	case NOUVEAU_GETPARAM_VM_VRAM_BASE:

		getparam->value = 0; /* deprecated */

		break;

	case NOUVEAU_GETPARAM_PTIMER_TIME:

		getparam->value = dev_priv->engine.timer.read(dev);

		break;

	case NOUVEAU_GETPARAM_HAS_BO_USAGE:

		getparam->value = 1;

		break;

	case NOUVEAU_GETPARAM_HAS_PAGEFLIP:

		getparam->value = 1;

		break;

	case NOUVEAU_GETPARAM_GRAPH_UNITS:

		/* NV40 and NV50 versions are quite different, but register

		 * address is the same. User is supposed to know the card

		 * family anyway... */

		if (dev_priv->chipset >= 0x40) {

			getparam->value = nv_rd32(dev, NV40_PMC_GRAPH_UNITS);

			break;

		}

		/* FALLTHRU */

	default:

		NV_DEBUG(dev, "unknown parameter %lld\n", getparam->param);

		return -EINVAL;

	}



	return 0;

}



int

nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS)

{

	return -EINVAL;

}



int

nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_nouveau_channel_alloc *init = data;

	struct nouveau_channel *chan;

	int ret;



	if (!dev_priv->eng[NVOBJ_ENGINE_GR])

		return -ENODEV;



	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)

		return -EINVAL;



	ret = nouveau_channel_alloc(dev, &chan, file_priv,

				    init->fb_ctxdma_handle,

				    init->tt_ctxdma_handle);

	if (ret)

		return ret;

	init->channel  = chan->id;



	if (nouveau_vram_pushbuf == 0) {

		if (chan->dma.ib_max)

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |

						NOUVEAU_GEM_DOMAIN_GART;

		else if (chan->pushbuf_bo->bo.mem.mem_type == TTM_PL_VRAM)

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;

		else

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;

	} else {

		init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;

	}



	if (dev_priv->card_type < NV_C0) {

		init->subchan[0].handle = 0x00000000;

		init->subchan[0].grclass = 0x0000;

		init->subchan[1].handle = NvSw;

		init->subchan[1].grclass = NV_SW;

		init->nr_subchan = 2;

	}



	/* Named memory object area */

	ret = drm_gem_handle_create(file_priv, chan->notifier_bo->gem,

				    &init->notifier_handle);



	if (ret == 0)

		atomic_inc(&chan->users); /* userspace reference */

	nouveau_channel_put(&chan);

	return ret;

}



int

nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_channel_free *req = data;

	struct nouveau_channel *chan;



	chan = nouveau_channel_get(file_priv, req->channel);

	if (IS_ERR(chan))

		return PTR_ERR(chan);



	list_del(&chan->list);

	atomic_dec(&chan->users);

	nouveau_channel_put(&chan);

	return 0;

}



int

nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_grobj_alloc *init = data;

	struct nouveau_channel *chan;

	int ret;



	if (init->handle == ~0)

		return -EINVAL;



	/* compatibility with userspace that assumes 506e for all chipsets */

	if (init->class == 0x506e) {

		init->class = nouveau_software_class(dev);

		if (init->class == 0x906e)

			return 0;

	} else

	if (init->class == 0x906e) {

		NV_ERROR(dev, "906e not supported yet\n");

		return -EINVAL;

	}



	chan = nouveau_channel_get(file_priv, init->channel);

	if (IS_ERR(chan))

		return PTR_ERR(chan);



	if (nouveau_ramht_find(chan, init->handle)) {

		ret = -EEXIST;

		goto out;

	}



	ret = nouveau_gpuobj_gr_new(chan, init->handle, init->class);

	if (ret) {

		NV_ERROR(dev, "Error creating object: %d (%d/0x%08x)\n",

			 ret, init->channel, init->handle);

	}



out:

	nouveau_channel_put(&chan);

	return ret;

}



int

nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_nouveau_notifierobj_alloc *na = data;

	struct nouveau_channel *chan;

	int ret;



	/* completely unnecessary for these chipsets... */

	if (unlikely(dev_priv->card_type >= NV_C0))

		return -EINVAL;



	chan = nouveau_channel_get(file_priv, na->channel);

	if (IS_ERR(chan))

		return PTR_ERR(chan);



	ret = nouveau_notifier_alloc(chan, na->handle, na->size, 0, 0x1000,

				     &na->offset);

	nouveau_channel_put(&chan);

	return ret;

}



int

nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS)

{

	struct drm_nouveau_gpuobj_free *objfree = data;

	struct nouveau_channel *chan;

	int ret;



	chan = nouveau_channel_get(file_priv, objfree->channel);

	if (IS_ERR(chan))

		return PTR_ERR(chan);



	/* Synchronize with the user channel */

	nouveau_channel_idle(chan);



	ret = nouveau_ramht_remove(chan, objfree->handle);

	nouveau_channel_put(&chan);

	return ret;

}

drivers/gpu/drm/nouveau/nouveau_abi16.h

0 → 100644
+83 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_ABI16_H__

#define __NOUVEAU_ABI16_H__



#define ABI16_IOCTL_ARGS                                                       \

	struct drm_device *dev, void *data, struct drm_file *file_priv

int nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS);

int nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS);

int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS);

int nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS);

int nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS);

int nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS);

int nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS);



struct drm_nouveau_channel_alloc {

	uint32_t     fb_ctxdma_handle;

	uint32_t     tt_ctxdma_handle;



	int          channel;

	uint32_t     pushbuf_domains;



	/* Notifier memory */

	uint32_t     notifier_handle;



	/* DRM-enforced subchannel assignments */

	struct {

		uint32_t handle;

		uint32_t grclass;

	} subchan[8];

	uint32_t nr_subchan;

};



struct drm_nouveau_channel_free {

	int channel;

};



struct drm_nouveau_grobj_alloc {

	int      channel;

	uint32_t handle;

	int      class;

};



struct drm_nouveau_notifierobj_alloc {

	uint32_t channel;

	uint32_t handle;

	uint32_t size;

	uint32_t offset;

};



struct drm_nouveau_gpuobj_free {

	int      channel;

	uint32_t handle;

};



#define NOUVEAU_GETPARAM_PCI_VENDOR      3

#define NOUVEAU_GETPARAM_PCI_DEVICE      4

#define NOUVEAU_GETPARAM_BUS_TYPE        5

#define NOUVEAU_GETPARAM_FB_SIZE         8

#define NOUVEAU_GETPARAM_AGP_SIZE        9

#define NOUVEAU_GETPARAM_CHIPSET_ID      11

#define NOUVEAU_GETPARAM_VM_VRAM_BASE    12

#define NOUVEAU_GETPARAM_GRAPH_UNITS     13

#define NOUVEAU_GETPARAM_PTIMER_TIME     14

#define NOUVEAU_GETPARAM_HAS_BO_USAGE    15

#define NOUVEAU_GETPARAM_HAS_PAGEFLIP    16

struct drm_nouveau_getparam {

	uint64_t param;

	uint64_t value;

};



struct drm_nouveau_setparam {

	uint64_t param;

	uint64_t value;

};



#define DRM_IOCTL_NOUVEAU_GETPARAM           DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GETPARAM, struct drm_nouveau_getparam)

#define DRM_IOCTL_NOUVEAU_SETPARAM           DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_SETPARAM, struct drm_nouveau_setparam)

#define DRM_IOCTL_NOUVEAU_CHANNEL_ALLOC      DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_ALLOC, struct drm_nouveau_channel_alloc)

#define DRM_IOCTL_NOUVEAU_CHANNEL_FREE       DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_FREE, struct drm_nouveau_channel_free)

#define DRM_IOCTL_NOUVEAU_GROBJ_ALLOC        DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GROBJ_ALLOC, struct drm_nouveau_grobj_alloc)

#define DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC  DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_NOTIFIEROBJ_ALLOC, struct drm_nouveau_notifierobj_alloc)

#define DRM_IOCTL_NOUVEAU_GPUOBJ_FREE        DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GPUOBJ_FREE, struct drm_nouveau_gpuobj_free)



#endif

drivers/gpu/drm/nouveau/nouveau_bios.c

+12 −0
Original line number Diff line number Diff line
@@ -6091,6 +6091,18 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf) 
		}

	}



	/* fdo#50830: connector indices for VGA and DVI-I are backwards */

	if (nv_match_device(dev, 0x0421, 0x3842, 0xc793)) {

		if (idx == 0 && *conn == 0x02000300)

			*conn = 0x02011300;

		else

		if (idx == 1 && *conn == 0x04011310)

			*conn = 0x04000310;

		else

		if (idx == 2 && *conn == 0x02011312)

			*conn = 0x02000312;

	}



	return true;

}

drivers/gpu/drm/nouveau/nouveau_channel.c

+0 −95
Original line number Diff line number Diff line
@@ -395,98 +395,3 @@ nouveau_channel_cleanup(struct drm_device *dev, struct drm_file *file_priv) 
		nouveau_channel_put(&chan);

	}

}
 




/***********************************

 * ioctls wrapping the functions

 ***********************************/



static int

nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct drm_nouveau_channel_alloc *init = data;

	struct nouveau_channel *chan;

	int ret;



	if (!dev_priv->eng[NVOBJ_ENGINE_GR])

		return -ENODEV;



	if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)

		return -EINVAL;



	ret = nouveau_channel_alloc(dev, &chan, file_priv,

				    init->fb_ctxdma_handle,

				    init->tt_ctxdma_handle);

	if (ret)

		return ret;

	init->channel  = chan->id;



	if (nouveau_vram_pushbuf == 0) {

		if (chan->dma.ib_max)

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |

						NOUVEAU_GEM_DOMAIN_GART;

		else if (chan->pushbuf_bo->bo.mem.mem_type == TTM_PL_VRAM)

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;

		else

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;

	} else {

		init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;

	}



	if (dev_priv->card_type < NV_C0) {

		init->subchan[0].handle = 0x00000000;

		init->subchan[0].grclass = 0x0000;

		init->subchan[1].handle = NvSw;

		init->subchan[1].grclass = NV_SW;

		init->nr_subchan = 2;

	}



	/* Named memory object area */

	ret = drm_gem_handle_create(file_priv, chan->notifier_bo->gem,

				    &init->notifier_handle);



	if (ret == 0)

		atomic_inc(&chan->users); /* userspace reference */

	nouveau_channel_put(&chan);

	return ret;

}



static int

nouveau_ioctl_fifo_free(struct drm_device *dev, void *data,

			struct drm_file *file_priv)

{

	struct drm_nouveau_channel_free *req = data;

	struct nouveau_channel *chan;



	chan = nouveau_channel_get(file_priv, req->channel);

	if (IS_ERR(chan))

		return PTR_ERR(chan);



	list_del(&chan->list);

	atomic_dec(&chan->users);

	nouveau_channel_put(&chan);

	return 0;

}



/***********************************

 * finally, the ioctl table

 ***********************************/



struct drm_ioctl_desc nouveau_ioctls[] = {

	DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_ioctl_getparam, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_ioctl_setparam, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_ioctl_fifo_alloc, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_ioctl_fifo_free, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_ioctl_grobj_alloc, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_NOTIFIEROBJ_ALLOC, nouveau_ioctl_notifier_alloc, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GPUOBJ_FREE, nouveau_ioctl_gpuobj_free, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_NEW, nouveau_gem_ioctl_new, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_PUSHBUF, nouveau_gem_ioctl_pushbuf, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_CPU_PREP, nouveau_gem_ioctl_cpu_prep, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_CPU_FINI, nouveau_gem_ioctl_cpu_fini, DRM_UNLOCKED|DRM_AUTH),

	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_INFO, nouveau_gem_ioctl_info, DRM_UNLOCKED|DRM_AUTH),

};



int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);

CRA Git | Maintained and supported by SUSTech CRA and CCSE