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

Commit ba331d5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-nouveau-destage' of git://people.freedesktop.org/~airlied/linux 

Pull nouveau destaging + Kelper modesetting support from Dave Airlie:
 "This pull request is unexpected and not something I had mentioned
  previously.

  So NVIDIA announced new Kepler GPUs this morning, and Ben has killed
  himself getting modesetting support for them together to have on
  launch day.  Most of the code to support the new chips has already
  gone in, however this pull contains a few more pieces along with the
  final enables so the driver binds to the new Kepler cards.  Its quite
  amazing that nouveau can support a GPU on its launch day even if its
  just unaccelerated modesetting, and I'd like to have support in the
  next kernel.

  In order to sweeten the deal, Ben has also requested nouveau destage
  and become ABI stable, the only change is the version number bump
  which he prepared userspace for quite a long time ago.  The driver
  hasn't broken ABI since that one big break that caused a lot of fuss.

  It's also quite a small set of code, and not likely to break anything."

* 'drm-nouveau-destage' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau/dp: support version 4.0 of DP table
  drm/nve0/disp: nvidia randomly decided to move the dithering method
  drm/nve0: initial modesetting support for kepler chipsets
  drm/nouveau: add bios connector type for dms59
  drm/nouveau: move out of staging drivers
  drm/nouveau: bump version to 1.0.0
  drm/nvd0/disp: ignore clock set if no pclk
  drm/nouveau: oops, increase channel dispc_vma to 4
  drm/nouveau: inform userspace of new kernel subchannel requirements
  drm/nouveau: remove m2mf creation on userspace channels
  drm/nvc0-/disp: reimplement flip completion method as fifo method
  drm/nouveau: move fence sequence check to start of loop
  drm/nouveau: remove subchannel names from places where it doesn't matter
  drm/nouveau/ttm: always do buffer moves on kernel channel
parents 09fa3022 1898f442

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ config DRM_RADEON 


source "drivers/gpu/drm/radeon/Kconfig"



source "drivers/gpu/drm/nouveau/Kconfig"



config DRM_I810

	tristate "Intel I810"

	# !PREEMPT because of missing ioctl locking

drivers/gpu/drm/nouveau/nouveau_bios.c

+2 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,8 @@ init_dp_condition(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) 
		break;

	case 1:

	case 2:

		if (!(entry[5] & cond))

		if ((table[0]  < 0x40 && !(entry[5] & cond)) ||

		    (table[0] == 0x40 && !(entry[4] & cond)))

			iexec->execute = false;

		break;

	case 5:

drivers/gpu/drm/nouveau/nouveau_bios.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ enum dcb_connector_type { 
	DCB_CONNECTOR_TV_3 = 0x13,

	DCB_CONNECTOR_DVI_I = 0x30,

	DCB_CONNECTOR_DVI_D = 0x31,

	DCB_CONNECTOR_DMS59_0 = 0x38,

	DCB_CONNECTOR_DMS59_1 = 0x39,

	DCB_CONNECTOR_LVDS = 0x40,

	DCB_CONNECTOR_LVDS_SPWG = 0x41,

	DCB_CONNECTOR_DP = 0x46,

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −8
Original line number Diff line number Diff line
@@ -693,16 +693,12 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr, 
		     struct ttm_mem_reg *new_mem)

{

	struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);

	struct nouveau_channel *chan = chan = dev_priv->channel;

	struct nouveau_bo *nvbo = nouveau_bo(bo);

	struct ttm_mem_reg *old_mem = &bo->mem;

	struct nouveau_channel *chan;

	int ret;



	chan = nvbo->channel;

	if (!chan) {

		chan = dev_priv->channel;

	mutex_lock_nested(&chan->mutex, NOUVEAU_KCHANNEL_MUTEX);

	}



	/* create temporary vmas for the transfer and attach them to the

	 * old nouveau_mem node, these will get cleaned up after ttm has
@@ -734,7 +730,6 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr, 
	}



out:

	if (chan == dev_priv->channel)

	mutex_unlock(&chan->mutex);

	return ret;

}

drivers/gpu/drm/nouveau/nouveau_channel.c

+18 −16
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
	struct nouveau_fpriv *fpriv = nouveau_fpriv(file_priv);

	struct nouveau_channel *chan;

	unsigned long flags;

	int ret;

	int ret, i;



	/* allocate and lock channel structure */

	chan = kzalloc(sizeof(*chan), GFP_KERNEL);
@@ -184,7 +184,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
		return ret;

	}



	nouveau_dma_pre_init(chan);

	nouveau_dma_init(chan);

	chan->user_put = 0x40;

	chan->user_get = 0x44;

	if (dev_priv->card_type >= NV_50)
@@ -202,8 +202,17 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 


	pfifo->reassign(dev, true);



	ret = nouveau_dma_init(chan);

	if (!ret)

	/* Insert NOPs for NOUVEAU_DMA_SKIPS */

	ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS);

	if (ret) {

		nouveau_channel_put(&chan);

		return ret;

	}



	for (i = 0; i < NOUVEAU_DMA_SKIPS; i++)

		OUT_RING  (chan, 0x00000000);

	FIRE_RING(chan);



	ret = nouveau_fence_channel_init(chan);

	if (ret) {

		nouveau_channel_put(&chan);
@@ -427,18 +436,11 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data, 
	}



	if (dev_priv->card_type < NV_C0) {

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

		if (dev_priv->card_type < NV_50)

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

		else

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

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

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

		init->nr_subchan = 2;

	} else {

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

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

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

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

		init->nr_subchan = 1;

	} else {

		init->nr_subchan = 0;

	}



	/* Named memory object area */