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

Commit ab0169bb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'bdw-stage1-2013-11-08-v2' of... 

Merge tag 'bdw-stage1-2013-11-08-v2' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

So here's the Broadwell pull request. From a kernel driver pov there's
two areas with big changes in Broadwell:
- Completely new enumerated interrupt bits. On the plus side it now looks
  fairly unform and sane.
- Completely new pagetable layout.

To ensure minimal impact on existing platforms we've refactored both the
irq and low-level gtt handling code a lot in anticipation of the bdw push.
So now bdw enabling in these areas just plugs in a bunch of vfuncs.

Otherwise it's all fairly harmless adjusting of switch cases and
if-ladders to shovel bdw into the right blocks. So minimized impact on
existing platforms. I've also merged the bdw-stage1 branch into our
-nightly integration branch for the past week to make sure we don't break
anything.

Note that there's still quite a flurry or patches floating around, but
I've figured I'll push this out. I plan to keep the bdw fixes separate
from my usual -fixes stream so that you can reject them easily in case it
still looks like too much churn. Also, bdw is for now hidden behind the
preliminary hw enabling module option. So there's no real pressure to get
follow-up patches all into 3.13.

* tag 'bdw-stage1-2013-11-08-v2' of git://people.freedesktop.org/~danvet/drm-intel: (75 commits)
  drm/i915: Mask the vblank interrupt on bdw by default
  drm/i915: Wire up cpu fifo underrun reporting support for bdw
  drm/i915: Optimize gen8_enable|disable_vblank functions
  drm/i915: Wire up pipe CRC support for bdw
  drm/i915: Wire up PCH interrupts for bdw
  drm/i915: Wire up port A aux channel
  drm/i915: Fix up the bdw pipe interrupt enable lists
  drm/i915: Optimize pipe irq handling on bdw
  drm/i915/bdw: Take render error interrupt out of the mask
  drm/i915/bdw: Add BDW PCH check first
  drm/i915: Use hsw_crt_get_config on BDW
  drm/i915/bdw: Change dp aux timeout to 600us on DDIA
  drm/i915/bdw: Enable trickle feed on Broadwell
  drm/i915/bdw: WaSingleSubspanDispatchOnAALinesAndPoints
  drm/i915/bdw: conservative SBE VUE cache mode
  drm/i915/bdw: Limit SDE poly depth FIFO to 2
  drm/i915/bdw: Sampler power bypass disable
  ddrm/i915/bdw: Disable centroid pixel perf optimization
  drm/i915/bdw: BWGTLB clock gate disable
  drm/i915/bdw: Implement edp PSR workarounds
  ...
parents 8d0a2215 13b3a0a7

arch/x86/kernel/early-quirks.c

+12 −0
Original line number Diff line number Diff line
@@ -313,6 +313,16 @@ static size_t __init gen6_stolen_size(int num, int slot, int func) 
	return gmch_ctrl << 25; /* 32 MB units */

}



static inline size_t gen8_stolen_size(int num, int slot, int func)

{

	u16 gmch_ctrl;



	gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);

	gmch_ctrl >>= BDW_GMCH_GMS_SHIFT;

	gmch_ctrl &= BDW_GMCH_GMS_MASK;

	return gmch_ctrl << 25; /* 32 MB units */

}



typedef size_t (*stolen_size_fn)(int num, int slot, int func);



static struct pci_device_id intel_stolen_ids[] __initdata = {
@@ -336,6 +346,8 @@ static struct pci_device_id intel_stolen_ids[] __initdata = { 
	INTEL_IVB_D_IDS(gen6_stolen_size),

	INTEL_HSW_D_IDS(gen6_stolen_size),

	INTEL_HSW_M_IDS(gen6_stolen_size),

	INTEL_BDW_M_IDS(gen8_stolen_size),

	INTEL_BDW_D_IDS(gen8_stolen_size)

};



static void __init intel_graphics_stolen(int num, int slot, int func)

drivers/gpu/drm/i915/i915_debugfs.c

+97 −12
Original line number Diff line number Diff line
@@ -586,7 +586,53 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
	if (ret)

		return ret;



	if (IS_VALLEYVIEW(dev)) {

	if (INTEL_INFO(dev)->gen >= 8) {

		int i;

		seq_printf(m, "Master Interrupt Control:\t%08x\n",

			   I915_READ(GEN8_MASTER_IRQ));



		for (i = 0; i < 4; i++) {

			seq_printf(m, "GT Interrupt IMR %d:\t%08x\n",

				   i, I915_READ(GEN8_GT_IMR(i)));

			seq_printf(m, "GT Interrupt IIR %d:\t%08x\n",

				   i, I915_READ(GEN8_GT_IIR(i)));

			seq_printf(m, "GT Interrupt IER %d:\t%08x\n",

				   i, I915_READ(GEN8_GT_IER(i)));

		}



		for_each_pipe(i) {

			seq_printf(m, "Pipe %c IMR:\t%08x\n",

				   pipe_name(i),

				   I915_READ(GEN8_DE_PIPE_IMR(i)));

			seq_printf(m, "Pipe %c IIR:\t%08x\n",

				   pipe_name(i),

				   I915_READ(GEN8_DE_PIPE_IIR(i)));

			seq_printf(m, "Pipe %c IER:\t%08x\n",

				   pipe_name(i),

				   I915_READ(GEN8_DE_PIPE_IER(i)));

		}



		seq_printf(m, "Display Engine port interrupt mask:\t%08x\n",

			   I915_READ(GEN8_DE_PORT_IMR));

		seq_printf(m, "Display Engine port interrupt identity:\t%08x\n",

			   I915_READ(GEN8_DE_PORT_IIR));

		seq_printf(m, "Display Engine port interrupt enable:\t%08x\n",

			   I915_READ(GEN8_DE_PORT_IER));



		seq_printf(m, "Display Engine misc interrupt mask:\t%08x\n",

			   I915_READ(GEN8_DE_MISC_IMR));

		seq_printf(m, "Display Engine misc interrupt identity:\t%08x\n",

			   I915_READ(GEN8_DE_MISC_IIR));

		seq_printf(m, "Display Engine misc interrupt enable:\t%08x\n",

			   I915_READ(GEN8_DE_MISC_IER));



		seq_printf(m, "PCU interrupt mask:\t%08x\n",

			   I915_READ(GEN8_PCU_IMR));

		seq_printf(m, "PCU interrupt identity:\t%08x\n",

			   I915_READ(GEN8_PCU_IIR));

		seq_printf(m, "PCU interrupt enable:\t%08x\n",

			   I915_READ(GEN8_PCU_IER));

	} else if (IS_VALLEYVIEW(dev)) {

		seq_printf(m, "Display IER:\t%08x\n",

			   I915_READ(VLV_IER));

		seq_printf(m, "Display IIR:\t%08x\n",
@@ -658,7 +704,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
	seq_printf(m, "Interrupts received: %d\n",

		   atomic_read(&dev_priv->irq_received));

	for_each_ring(ring, dev_priv, i) {

		if (IS_GEN6(dev) || IS_GEN7(dev)) {

		if (INTEL_INFO(dev)->gen >= 6) {

			seq_printf(m,

				   "Graphics Interrupt mask (%s):	%08x\n",

				   ring->name, I915_READ_IMR(ring));
@@ -1577,7 +1623,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) 
			   I915_READ16(C0DRB3));

		seq_printf(m, "C1DRB3 = 0x%04x\n",

			   I915_READ16(C1DRB3));

	} else if (IS_GEN6(dev) || IS_GEN7(dev)) {

	} else if (INTEL_INFO(dev)->gen >= 6) {

		seq_printf(m, "MAD_DIMM_C0 = 0x%08x\n",

			   I915_READ(MAD_DIMM_C0));

		seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -1586,6 +1632,10 @@ static int i915_swizzle_info(struct seq_file *m, void *data) 
			   I915_READ(MAD_DIMM_C2));

		seq_printf(m, "TILECTL = 0x%08x\n",

			   I915_READ(TILECTL));

		if (IS_GEN8(dev))

			seq_printf(m, "GAMTARBMODE = 0x%08x\n",

				   I915_READ(GAMTARBMODE));

		else

			seq_printf(m, "ARB_MODE = 0x%08x\n",

				   I915_READ(ARB_MODE));

		seq_printf(m, "DISP_ARB_CTL = 0x%08x\n",
@@ -1596,18 +1646,37 @@ static int i915_swizzle_info(struct seq_file *m, void *data) 
	return 0;

}



static int i915_ppgtt_info(struct seq_file *m, void *data)

static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring;

	int i, ret;

	struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;

	int unused, i;



	if (!ppgtt)

		return;



	seq_printf(m, "Page directories: %d\n", ppgtt->num_pd_pages);

	seq_printf(m, "Page tables: %d\n", ppgtt->num_pt_pages);

	for_each_ring(ring, dev_priv, unused) {

		seq_printf(m, "%s\n", ring->name);

		for (i = 0; i < 4; i++) {

			u32 offset = 0x270 + i * 8;

			u64 pdp = I915_READ(ring->mmio_base + offset + 4);

			pdp <<= 32;

			pdp |= I915_READ(ring->mmio_base + offset);

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

				seq_printf(m, "\tPDP%d 0x%016llx\n", i, pdp);

		}

	}

}



static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring;

	int i;



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;

	if (INTEL_INFO(dev)->gen == 6)

		seq_printf(m, "GFX_MODE: 0x%08x\n", I915_READ(GFX_MODE));
@@ -1626,6 +1695,22 @@ static int i915_ppgtt_info(struct seq_file *m, void *data) 
		seq_printf(m, "pd gtt offset: 0x%08x\n", ppgtt->pd_offset);

	}

	seq_printf(m, "ECOCHK: 0x%08x\n", I915_READ(GAM_ECOCHK));

}



static int i915_ppgtt_info(struct seq_file *m, void *data)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;



	int ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	if (INTEL_INFO(dev)->gen >= 8)

		gen8_ppgtt_info(m, dev);

	else if (INTEL_INFO(dev)->gen >= 6)

		gen6_ppgtt_info(m, dev);



	mutex_unlock(&dev->struct_mutex);



	return 0;

drivers/gpu/drm/i915/i915_drv.c

+33 −1
Original line number Diff line number Diff line
@@ -336,6 +336,24 @@ static const struct intel_device_info intel_haswell_m_info = { 
	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

};



static const struct intel_device_info intel_broadwell_d_info = {

	.is_preliminary = 1,

	.gen = 8, .num_pipes = 3,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.has_llc = 1,

	.has_ddi = 1,

};



static const struct intel_device_info intel_broadwell_m_info = {

	.is_preliminary = 1,

	.gen = 8, .is_mobile = 1, .num_pipes = 3,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.has_llc = 1,

	.has_ddi = 1,

};



/*

 * Make sure any device matches here are from most specific to most

 * general.  For example, since the Quanta match is based on the subsystem
@@ -367,7 +385,9 @@ static const struct intel_device_info intel_haswell_m_info = { 
	INTEL_HSW_D_IDS(&intel_haswell_d_info), \

	INTEL_HSW_M_IDS(&intel_haswell_m_info), \

	INTEL_VLV_M_IDS(&intel_valleyview_m_info),	\

	INTEL_VLV_D_IDS(&intel_valleyview_d_info)

	INTEL_VLV_D_IDS(&intel_valleyview_d_info),	\

	INTEL_BDW_M_IDS(&intel_broadwell_m_info),	\

	INTEL_BDW_D_IDS(&intel_broadwell_d_info)



static const struct pci_device_id pciidlist[] = {		/* aka */

	INTEL_PCI_IDS,
@@ -428,6 +448,12 @@ void intel_detect_pch(struct drm_device *dev) 
				DRM_DEBUG_KMS("Found LynxPoint PCH\n");

				WARN_ON(!IS_HASWELL(dev));

				WARN_ON(IS_ULT(dev));

			} else if (IS_BROADWELL(dev)) {

				dev_priv->pch_type = PCH_LPT;

				dev_priv->pch_id =

					INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;

				DRM_DEBUG_KMS("This is Broadwell, assuming "

					      "LynxPoint LP PCH\n");

			} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {

				dev_priv->pch_type = PCH_LPT;

				DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
@@ -452,6 +478,12 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) 
	if (INTEL_INFO(dev)->gen < 6)

		return 0;



	/* Until we get further testing... */

	if (IS_GEN8(dev)) {

		WARN_ON(!i915_preliminary_hw_support);

		return 0;

	}



	if (i915_semaphores >= 0)

		return i915_semaphores;

drivers/gpu/drm/i915/i915_drv.h

+28 −8
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ enum intel_display_power_domain { 
#define HSW_ALWAYS_ON_POWER_DOMAINS (		\

	BIT(POWER_DOMAIN_PIPE_A) |		\

	BIT(POWER_DOMAIN_TRANSCODER_EDP))

#define BDW_ALWAYS_ON_POWER_DOMAINS (		\

	BIT(POWER_DOMAIN_PIPE_A) |		\

	BIT(POWER_DOMAIN_TRANSCODER_EDP) |	\

	BIT(POWER_DOMAIN_PIPE_A_PANEL_FITTER))



enum hpd_pin {

	HPD_NONE = 0,
@@ -575,10 +579,21 @@ struct i915_gtt { 
struct i915_hw_ppgtt {

	struct i915_address_space base;

	unsigned num_pd_entries;

	union {

		struct page **pt_pages;

		struct page *gen8_pt_pages;

	};

	struct page *pd_pages;

	int num_pd_pages;

	int num_pt_pages;

	union {

		uint32_t pd_offset;

		dma_addr_t pd_dma_addr[4];

	};

	union {

		dma_addr_t *pt_dma_addr;



		dma_addr_t *gen8_pt_dma_addr[4];

	};

	int (*enable)(struct drm_device *dev);

};
@@ -1322,7 +1337,10 @@ typedef struct drm_i915_private { 
	struct mutex dpio_lock;



	/** Cached value of IMR to avoid reads in updating the bitfield */

	union {

		u32 irq_mask;

		u32 de_irq_mask[I915_MAX_PIPES];

	};

	u32 gt_irq_mask;

	u32 pm_irq_mask;
@@ -1733,6 +1751,7 @@ struct drm_i915_file_private { 
				 (dev)->pdev->device == 0x010A)

#define IS_VALLEYVIEW(dev)	(INTEL_INFO(dev)->is_valleyview)

#define IS_HASWELL(dev)	(INTEL_INFO(dev)->is_haswell)

#define IS_BROADWELL(dev)	(INTEL_INFO(dev)->gen == 8)

#define IS_MOBILE(dev)		(INTEL_INFO(dev)->is_mobile)

#define IS_HSW_EARLY_SDV(dev)	(IS_HASWELL(dev) && \

				 ((dev)->pdev->device & 0xFF00) == 0x0C00)
@@ -1754,6 +1773,7 @@ struct drm_i915_file_private { 
#define IS_GEN5(dev)	(INTEL_INFO(dev)->gen == 5)

#define IS_GEN6(dev)	(INTEL_INFO(dev)->gen == 6)

#define IS_GEN7(dev)	(INTEL_INFO(dev)->gen == 7)

#define IS_GEN8(dev)	(INTEL_INFO(dev)->gen == 8)



#define RENDER_RING		(1<<RCS)

#define BSD_RING		(1<<VCS)
@@ -1790,12 +1810,12 @@ struct drm_i915_file_private { 
#define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr)

#define I915_HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc)



#define HAS_IPS(dev)		(IS_ULT(dev))

#define HAS_IPS(dev)		(IS_ULT(dev) || IS_BROADWELL(dev))



#define HAS_DDI(dev)		(INTEL_INFO(dev)->has_ddi)

#define HAS_POWER_WELL(dev)	(IS_HASWELL(dev))

#define HAS_POWER_WELL(dev)	(IS_HASWELL(dev) || IS_BROADWELL(dev))

#define HAS_FPGA_DBG_UNCLAIMED(dev)	(INTEL_INFO(dev)->has_fpga_dbg)

#define HAS_PSR(dev)		(IS_HASWELL(dev))

#define HAS_PSR(dev)		(IS_HASWELL(dev) || IS_BROADWELL(dev))



#define INTEL_PCH_DEVICE_ID_MASK		0xff00

#define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00

drivers/gpu/drm/i915/i915_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -2954,6 +2954,7 @@ static void i915_gem_write_fence(struct drm_device *dev, int reg, 
	     obj->stride, obj->tiling_mode);



	switch (INTEL_INFO(dev)->gen) {

	case 8:

	case 7:

	case 6:

	case 5:
@@ -4361,6 +4362,8 @@ void i915_gem_init_swizzling(struct drm_device *dev) 
		I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_SNB));

	else if (IS_GEN7(dev))

		I915_WRITE(ARB_MODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_IVB));

	else if (IS_GEN8(dev))

		I915_WRITE(GAMTARBMODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_BDW));

	else

		BUG();

}