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

Commit 0007fa24 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: Fix bandwidth calculation for DisplayPort
  drm/nouveau: by default use low bpp framebuffer on low memory cards
  drm/nv10: Change the BO size threshold determining the memory placement range.
  drm/nvc0: enable acceleration for nvc1 by default
  drm/nvc0/gr: fixup the mmio list register writes for 0xc1
  drm/nvc1: hacky workaround to fix accel issues
  drm/nvc0/gr: fix some bugs in grctx generation
  drm/nvc0: enable acceleration on 0xc8 by default
  drm/nvc0/vram: skip disabled PBFB subunits
  drm/nv40/pm: fix issues on igp chipsets, which don't have memory
  drm/nouveau: testing the wrong variable
  drm/nvc0/vram: storage type 0xc3 is not compressed
  drm/nv50: fix stability issue on NV86.
  drm/nouveau: initialize chan->fence.lock before use
  drm/nv50/vram: fix incorrect detection of bank count on newer chipsets
  drm/nv50/gr: typo fix, how about we not reset fifo during graph init?
  drm/nv50/bios: fixup mpll programming from the init table parser
  drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()
  drm: make sure drm_vblank_init() has been called before touching vbl_lock
parents a6778e9e 5c79507b

drivers/gpu/drm/drm_irq.c

+9 −6
Original line number Diff line number Diff line
@@ -407,13 +407,16 @@ int drm_irq_uninstall(struct drm_device *dev) 
	/*

	 * Wake up any waiters so they don't hang.

	 */

	if (dev->num_crtcs) {

		spin_lock_irqsave(&dev->vbl_lock, irqflags);

		for (i = 0; i < dev->num_crtcs; i++) {

			DRM_WAKEUP(&dev->vbl_queue[i]);

			dev->vblank_enabled[i] = 0;

		dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);

			dev->last_vblank[i] =

				dev->driver->get_vblank_counter(dev, i);

		}

		spin_unlock_irqrestore(&dev->vbl_lock, irqflags);

	}



	if (!irq_enabled)

		return -EINVAL;

drivers/gpu/drm/nouveau/nouveau_bios.c

+13 −9
Original line number Diff line number Diff line
@@ -640,10 +640,9 @@ static int 
nv50_pll_set(struct drm_device *dev, uint32_t reg, uint32_t clk)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	uint32_t reg0 = nv_rd32(dev, reg + 0);

	uint32_t reg1 = nv_rd32(dev, reg + 4);

	struct nouveau_pll_vals pll;

	struct pll_lims pll_limits;

	u32 ctrl, mask, coef;

	int ret;



	ret = get_pll_limits(dev, reg, &pll_limits);
@@ -654,15 +653,20 @@ nv50_pll_set(struct drm_device *dev, uint32_t reg, uint32_t clk) 
	if (!clk)

		return -ERANGE;



	reg0 = (reg0 & 0xfff8ffff) | (pll.log2P << 16);

	reg1 = (reg1 & 0xffff0000) | (pll.N1 << 8) | pll.M1;



	if (dev_priv->vbios.execute) {

		still_alive();

		nv_wr32(dev, reg + 4, reg1);

		nv_wr32(dev, reg + 0, reg0);

	coef = pll.N1 << 8 | pll.M1;

	ctrl = pll.log2P << 16;

	mask = 0x00070000;

	if (reg == 0x004008) {

		mask |= 0x01f80000;

		ctrl |= (pll_limits.log2p_bias << 19);

		ctrl |= (pll.log2P << 22);

	}



	if (!dev_priv->vbios.execute)

		return 0;



	nv_mask(dev, reg + 0, mask, ctrl);

	nv_wr32(dev, reg + 4, coef);

	return 0;

}

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ set_placement_range(struct nouveau_bo *nvbo, uint32_t type) 


	if (dev_priv->card_type == NV_10 &&

	    nvbo->tile_mode && (type & TTM_PL_FLAG_VRAM) &&

	    nvbo->bo.mem.num_pages < vram_pages / 2) {

	    nvbo->bo.mem.num_pages < vram_pages / 4) {

		/*

		 * Make sure that the color and depth buffers are handled

		 * by independent memory controller units. Up to a 9x

drivers/gpu/drm/nouveau/nouveau_channel.c

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
	INIT_LIST_HEAD(&chan->nvsw.vbl_wait);

	INIT_LIST_HEAD(&chan->nvsw.flip);

	INIT_LIST_HEAD(&chan->fence.pending);

	spin_lock_init(&chan->fence.lock);



	/* setup channel's memory and vm */

	ret = nouveau_gpuobj_channel_init(chan, vram_handle, gart_handle);

drivers/gpu/drm/nouveau/nouveau_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ nouveau_connector_mode_valid(struct drm_connector *connector, 
	case OUTPUT_DP:

		max_clock  = nv_encoder->dp.link_nr;

		max_clock *= nv_encoder->dp.link_bw;

		clock = clock * nouveau_connector_bpp(connector) / 8;

		clock = clock * nouveau_connector_bpp(connector) / 10;

		break;

	default:

		BUG_ON(1);