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

Commit 363aab29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/nv50: fix regression on IGPs
  drm/radeon/kms: re-emit full context state for evergreen blits
  drm/radeon/kms: release CMASK access in preclose_kms
  drm/radeon/kms: fix r6xx+ scanout on BE systems
  drm/radeon/kms: clean up some magic numbers
  drm/radeon/kms: only enable HDMI mode if radeon audio is enabled
  radeon/kms: fix dp displayport mode validation
  drm/nvc0/grctx: correct an off-by-one
  drm/nv50: Fix race with PFIFO during PGRAPH context destruction.
  drm/nouveau: Workaround incorrect DCB entry on a GeForce3 Ti 200.
  drm/nvc0: implement irq handler for whatever's at 0x14xxxx
  drm/nvc0: fix incorrect TPC register setup
  drm/nouveau: probe for adt7473 before f75375
  drm/nouveau: remove dead function definition
parents bffb276f b9020c9e

drivers/gpu/drm/nouveau/nouveau_bios.c

+15 −0
Original line number Diff line number Diff line
@@ -6310,6 +6310,9 @@ void merge_like_dcb_entries(struct drm_device *dev, struct dcb_table *dcb) 
static bool

apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct dcb_table *dcb = &dev_priv->vbios.dcb;



	/* Dell Precision M6300

	 *   DCB entry 2: 02025312 00000010

	 *   DCB entry 3: 02026312 00000020
@@ -6327,6 +6330,18 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf) 
			return false;

	}



	/* GeForce3 Ti 200

	 *

	 * DCB reports an LVDS output that should be TMDS:

	 *   DCB entry 1: f2005014 ffffffff

	 */

	if (nv_match_device(dev, 0x0201, 0x1462, 0x8851)) {

		if (*conn == 0xf2005014 && *conf == 0xffffffff) {

			fabricate_dcb_output(dcb, OUTPUT_TMDS, 1, 1, 1);

			return false;

		}

	}



	return true;

}

drivers/gpu/drm/nouveau/nouveau_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -848,9 +848,6 @@ extern void nv10_mem_put_tile_region(struct drm_device *dev, 
				     struct nouveau_fence *fence);

extern const struct ttm_mem_type_manager_func nouveau_vram_manager;



/* nvc0_vram.c */

extern const struct ttm_mem_type_manager_func nvc0_vram_manager;



/* nouveau_notifier.c */

extern int  nouveau_notifier_init_channel(struct nouveau_channel *);

extern void nouveau_notifier_takedown_channel(struct nouveau_channel *);

drivers/gpu/drm/nouveau/nouveau_temp.c

+1 −1
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ nouveau_temp_probe_i2c(struct drm_device *dev) 
	struct i2c_board_info info[] = {

		{ I2C_BOARD_INFO("w83l785ts", 0x2d) },

		{ I2C_BOARD_INFO("w83781d", 0x2d) },

		{ I2C_BOARD_INFO("f75375", 0x2e) },

		{ I2C_BOARD_INFO("adt7473", 0x2e) },

		{ I2C_BOARD_INFO("f75375", 0x2e) },

		{ I2C_BOARD_INFO("lm99", 0x4c) },

		{ }

	};

drivers/gpu/drm/nouveau/nv50_graph.c

+3 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ nv50_graph_destroy_context(struct nouveau_channel *chan) 
	struct drm_device *dev = chan->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;

	struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;

	int i, hdr = (dev_priv->chipset == 0x50) ? 0x200 : 0x20;

	unsigned long flags;
@@ -265,6 +266,7 @@ nv50_graph_destroy_context(struct nouveau_channel *chan) 
		return;



	spin_lock_irqsave(&dev_priv->context_switch_lock, flags);

	pfifo->reassign(dev, false);

	pgraph->fifo_access(dev, false);



	if (pgraph->channel(dev) == chan)
@@ -275,6 +277,7 @@ nv50_graph_destroy_context(struct nouveau_channel *chan) 
	dev_priv->engine.instmem.flush(dev);



	pgraph->fifo_access(dev, true);

	pfifo->reassign(dev, true);

	spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);



	nouveau_gpuobj_ref(NULL, &chan->ramin_grctx);

drivers/gpu/drm/nouveau/nv50_vm.c

+0 −5
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde, 
	}



	if (phys & 1) {

		if (dev_priv->vram_sys_base) {

			phys += dev_priv->vram_sys_base;

			phys |= 0x30;

		}



		if (coverage <= 32 * 1024 * 1024)

			phys |= 0x60;

		else if (coverage <= 64 * 1024 * 1024)