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

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

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next 

* 'intel/drm-intel-next' of ../drm-next: (63 commits)
  drm/i915: Move gpu_write_list to per-ring
  drm/i915: Invalidate the to-ring, flush the old-ring when updating domains
  drm/i915/ringbuffer: Write the value passed in to the tail register
  agp/intel: Restore valid PTE bit for Sandybridge after bdd30729
  drm/i915: Fix flushing regression from 9af90d19
  drm/i915/sdvo: Remove unused encoding member
  i915: enable AVI infoframe for intel_hdmi.c [v4]
  drm/i915: Fix current fb blocking for page flip
  drm/i915: IS_IRONLAKE is synonymous with gen == 5
  drm/i915: Enable SandyBridge blitter ring
  drm/i915/ringbuffer: Remove broken intel_fill_struct()
  drm/i915/ringbuffer: Fix emit batch buffer regression from 8187a2b7
  drm/i915: Copy the updated reloc->presumed_offset back to the user
  drm/i915: Track objects in global active list (as well as per-ring)
  drm/i915: Simplify most HAS_BSD() checks
  drm/i915: cache the last object lookup during pin_and_relocate()
  drm/i915: Do interrupible mutex lock first to avoid locking for unreference
  drivers: gpu: drm: i915: Fix a typo.
  agp/intel: Also add B43.1 to list of supported devices
  drm/i915: rearrange mutex acquisition for pread
  ...
parents e1efc9b6 64193406

drivers/char/agp/intel-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -895,6 +895,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_G45_HB),

	ID(PCI_DEVICE_ID_INTEL_G41_HB),

	ID(PCI_DEVICE_ID_INTEL_B43_HB),

	ID(PCI_DEVICE_ID_INTEL_B43_1_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB),

	ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),

drivers/char/agp/intel-gtt.c

+3 −3
Original line number Diff line number Diff line
@@ -1211,13 +1211,13 @@ static void gen6_write_entry(dma_addr_t addr, unsigned int entry, 
	u32 pte_flags;



	if (type_mask == AGP_USER_UNCACHED_MEMORY)

		pte_flags = GEN6_PTE_UNCACHED;

		pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;

	else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) {

		pte_flags = GEN6_PTE_LLC;

		pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;

		if (gfdt)

			pte_flags |= GEN6_PTE_GFDT;

	} else { /* set 'normal'/'cached' to LLC by default */

		pte_flags = GEN6_PTE_LLC_MLC;

		pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;

		if (gfdt)

			pte_flags |= GEN6_PTE_GFDT;

	}

drivers/gpu/drm/drm_edid.c

+78 −14
Original line number Diff line number Diff line
@@ -1267,34 +1267,51 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, 
}



#define HDMI_IDENTIFIER 0x000C03

#define AUDIO_BLOCK	0x01

#define VENDOR_BLOCK    0x03

#define EDID_BASIC_AUDIO	(1 << 6)



/**

 * drm_detect_hdmi_monitor - detect whether monitor is hdmi.

 * @edid: monitor EDID information

 *

 * Parse the CEA extension according to CEA-861-B.

 * Return true if HDMI, false if not or unknown.

 * Search EDID for CEA extension block.

 */

bool drm_detect_hdmi_monitor(struct edid *edid)

static u8 *drm_find_cea_extension(struct edid *edid)

{

	char *edid_ext = NULL;

	int i, hdmi_id;

	int start_offset, end_offset;

	bool is_hdmi = false;

	u8 *edid_ext = NULL;

	int i;



	/* No EDID or EDID extensions */

	if (edid == NULL || edid->extensions == 0)

		goto end;

		return NULL;



	/* Find CEA extension */

	for (i = 0; i < edid->extensions; i++) {

		edid_ext = (char *)edid + EDID_LENGTH * (i + 1);

		/* This block is CEA extension */

		if (edid_ext[0] == 0x02)

		edid_ext = (u8 *)edid + EDID_LENGTH * (i + 1);

		if (edid_ext[0] == CEA_EXT)

			break;

	}



	if (i == edid->extensions)

		return NULL;



	return edid_ext;

}



/**

 * drm_detect_hdmi_monitor - detect whether monitor is hdmi.

 * @edid: monitor EDID information

 *

 * Parse the CEA extension according to CEA-861-B.

 * Return true if HDMI, false if not or unknown.

 */

bool drm_detect_hdmi_monitor(struct edid *edid)

{

	u8 *edid_ext;

	int i, hdmi_id;

	int start_offset, end_offset;

	bool is_hdmi = false;



	edid_ext = drm_find_cea_extension(edid);

	if (!edid_ext)

		goto end;



	/* Data block offset in CEA extension block */
@@ -1324,6 +1341,53 @@ bool drm_detect_hdmi_monitor(struct edid *edid) 
}

EXPORT_SYMBOL(drm_detect_hdmi_monitor);



/**

 * drm_detect_monitor_audio - check monitor audio capability

 *

 * Monitor should have CEA extension block.

 * If monitor has 'basic audio', but no CEA audio blocks, it's 'basic

 * audio' only. If there is any audio extension block and supported

 * audio format, assume at least 'basic audio' support, even if 'basic

 * audio' is not defined in EDID.

 *

 */

bool drm_detect_monitor_audio(struct edid *edid)

{

	u8 *edid_ext;

	int i, j;

	bool has_audio = false;

	int start_offset, end_offset;



	edid_ext = drm_find_cea_extension(edid);

	if (!edid_ext)

		goto end;



	has_audio = ((edid_ext[3] & EDID_BASIC_AUDIO) != 0);



	if (has_audio) {

		DRM_DEBUG_KMS("Monitor has basic audio support\n");

		goto end;

	}



	/* Data block offset in CEA extension block */

	start_offset = 4;

	end_offset = edid_ext[2];



	for (i = start_offset; i < end_offset;

			i += ((edid_ext[i] & 0x1f) + 1)) {

		if ((edid_ext[i] >> 5) == AUDIO_BLOCK) {

			has_audio = true;

			for (j = 1; j < (edid_ext[i] & 0x1f); j += 3)

				DRM_DEBUG_KMS("CEA audio format %d\n",

					      (edid_ext[i + j] >> 3) & 0xf);

			goto end;

		}

	}

end:

	return has_audio;

}

EXPORT_SYMBOL(drm_detect_monitor_audio);



/**

 * drm_add_edid_modes - add modes from EDID data, if available

 * @connector: connector we're probing

drivers/gpu/drm/i915/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ 


i915-$(CONFIG_COMPAT)   += i915_ioc32.o



i915-$(CONFIG_ACPI)	+= intel_acpi.o



obj-$(CONFIG_DRM_I915)  += i915.o



CFLAGS_i915_trace_points.o := -I$(src)

drivers/gpu/drm/i915/i915_debugfs.c

+12 −16
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ 
#if defined(CONFIG_DEBUG_FS)



enum {

	RENDER_LIST,

	BSD_LIST,

	ACTIVE_LIST,

	FLUSHING_LIST,

	INACTIVE_LIST,

	PINNED_LIST,
@@ -72,7 +71,6 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	B(is_pineview);

	B(is_broadwater);

	B(is_crestline);

	B(is_ironlake);

	B(has_fbc);

	B(has_rc6);

	B(has_pipe_cxsr);
@@ -81,6 +79,8 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	B(has_overlay);

	B(overlay_needs_physical);

	B(supports_tv);

	B(has_bsd_ring);

	B(has_blt_ring);

#undef B



	return 0;
@@ -125,6 +125,8 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
		seq_printf(m, " (fence: %d)", obj->fence_reg);

	if (obj->gtt_space != NULL)

		seq_printf(m, " (gtt_offset: %08x)", obj->gtt_offset);

	if (obj->ring != NULL)

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

}



static int i915_gem_object_list_info(struct seq_file *m, void *data)
@@ -143,13 +145,9 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) 
		return ret;



	switch (list) {

	case RENDER_LIST:

		seq_printf(m, "Render:\n");

		head = &dev_priv->render_ring.active_list;

		break;

	case BSD_LIST:

		seq_printf(m, "BSD:\n");

		head = &dev_priv->bsd_ring.active_list;

	case ACTIVE_LIST:

		seq_printf(m, "Active:\n");

		head = &dev_priv->mm.active_list;

		break;

	case INACTIVE_LIST:

		seq_printf(m, "Inactive:\n");
@@ -173,7 +171,7 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) 
	}



	total_obj_size = total_gtt_size = count = 0;

	list_for_each_entry(obj_priv, head, list) {

	list_for_each_entry(obj_priv, head, mm_list) {

		seq_printf(m, "   ");

		describe_obj(m, obj_priv);

		seq_printf(m, "\n");
@@ -460,8 +458,7 @@ static int i915_batchbuffer_info(struct seq_file *m, void *data) 
	if (ret)

		return ret;



	list_for_each_entry(obj_priv, &dev_priv->render_ring.active_list,

			list) {

	list_for_each_entry(obj_priv, &dev_priv->mm.active_list, mm_list) {

		obj = &obj_priv->base;

		if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) {

		    seq_printf(m, "--- gtt_offset = 0x%08x\n",
@@ -797,7 +794,7 @@ static int i915_sr_status(struct seq_file *m, void *unused) 
	drm_i915_private_t *dev_priv = dev->dev_private;

	bool sr_enabled = false;



	if (IS_IRONLAKE(dev))

	if (IS_GEN5(dev))

		sr_enabled = I915_READ(WM1_LP_ILK) & WM1_LP_SR_EN;

	else if (IS_CRESTLINE(dev) || IS_I945G(dev) || IS_I945GM(dev))

		sr_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;
@@ -1020,8 +1017,7 @@ static int i915_wedged_create(struct dentry *root, struct drm_minor *minor) 
static struct drm_info_list i915_debugfs_list[] = {

	{"i915_capabilities", i915_capabilities, 0, 0},

	{"i915_gem_objects", i915_gem_object_info, 0},

	{"i915_gem_render_active", i915_gem_object_list_info, 0, (void *) RENDER_LIST},

	{"i915_gem_bsd_active", i915_gem_object_list_info, 0, (void *) BSD_LIST},

	{"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST},

	{"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST},

	{"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST},

	{"i915_gem_pinned", i915_gem_object_list_info, 0, (void *) PINNED_LIST},