Commit 37be944a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (290 commits)
  Revert "drm/ttm: add a way to bo_wait for either the last read or last write"
  Revert "drm/radeon/kms: add a new gem_wait ioctl with read/write flags"
  vmwgfx: Don't pass unused arguments to do_dirty functions
  vmwgfx: Emulate depth 32 framebuffers
  drm/radeon: Lower the severity of the radeon lockup messages.
  drm/i915/dp: Fix eDP on PCH DP on CPT/PPT
  drm/i915/dp: Introduce is_cpu_edp()
  drm/i915: use correct SPD type value
  drm/i915: fix ILK+ infoframe support
  drm/i915: add DP test request handling
  drm/i915: read full receiver capability field during DP hot plug
  drm/i915/dp: Remove eDP special cases from bandwidth checks
  drm/i915/dp: Fix the math in intel_dp_link_required
  drm/i915/panel: Always record the backlight level again (but cleverly)
  i915: Move i915_read/write out of line
  drm/i915: remove transcoder PLL mashing from mode_set per specs
  drm/i915: if transcoder disable fails, say which
  drm/i915: set watermarks for third pipe on IVB
  drm/i915: export a CPT mode set verification function
  drm/i915: fix transcoder PLL select masking
  ...
parents ca836a25 1717c0e2

drivers/char/agp/intel-gtt.c

+28 −0
Original line number Diff line number Diff line
@@ -923,6 +923,9 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem, 
{

	int ret = -EINVAL;



	if (intel_private.base.do_idle_maps)

		return -ENODEV;



	if (intel_private.clear_fake_agp) {

		int start = intel_private.base.stolen_size / PAGE_SIZE;

		int end = intel_private.base.gtt_mappable_entries;
@@ -985,6 +988,9 @@ static int intel_fake_agp_remove_entries(struct agp_memory *mem, 
	if (mem->page_count == 0)

		return 0;



	if (intel_private.base.do_idle_maps)

		return -ENODEV;



	intel_gtt_clear_range(pg_start, mem->page_count);



	if (intel_private.base.needs_dmar) {
@@ -1177,6 +1183,25 @@ static void gen6_cleanup(void) 
{

}



/* Certain Gen5 chipsets require require idling the GPU before

 * unmapping anything from the GTT when VT-d is enabled.

 */

extern int intel_iommu_gfx_mapped;

static inline int needs_idle_maps(void)

{

	const unsigned short gpu_devid = intel_private.pcidev->device;



	/* Query intel_iommu to see if we need the workaround. Presumably that

	 * was loaded first.

	 */

	if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB ||

	     gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&

	     intel_iommu_gfx_mapped)

		return 1;



	return 0;

}



static int i9xx_setup(void)

{

	u32 reg_addr;
@@ -1211,6 +1236,9 @@ static int i9xx_setup(void) 
		intel_private.gtt_bus_addr = reg_addr + gtt_offset;

	}



	if (needs_idle_maps());

		intel_private.base.do_idle_maps = 1;



	intel_i9xx_setup_flush();



	return 0;

drivers/gpu/drm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -158,3 +158,7 @@ config DRM_SAVAGE 
	help

	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister

	  chipset. If M is selected the module will be called savage.



source "drivers/gpu/drm/exynos/Kconfig"



source "drivers/gpu/drm/vmwgfx/Kconfig"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ obj-$(CONFIG_DRM_SAVAGE)+= savage/ 
obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/

obj-$(CONFIG_DRM_VIA)	+=via/

obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/

obj-$(CONFIG_DRM_EXYNOS) +=exynos/

obj-y			+= i2c/

drivers/gpu/drm/drm_crtc_helper.c

+2 −0
Original line number Diff line number Diff line
@@ -372,11 +372,13 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
		encoder_funcs = encoder->helper_private;

		if (!(ret = encoder_funcs->mode_fixup(encoder, mode,

						      adjusted_mode))) {

			DRM_DEBUG_KMS("Encoder fixup failed\n");

			goto done;

		}

	}



	if (!(ret = crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) {

		DRM_DEBUG_KMS("CRTC fixup failed\n");

		goto done;

	}

	DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);

drivers/gpu/drm/drm_debugfs.c

+1 −4
Original line number Diff line number Diff line
@@ -107,11 +107,8 @@ int drm_debugfs_create_files(struct drm_info_list *files, int count, 
		ent = debugfs_create_file(files[i].name, S_IFREG | S_IRUGO,

					  root, tmp, &drm_debugfs_fops);

		if (!ent) {

			char name[64];

			strncpy(name, root->d_name.name,

						min(root->d_name.len, 64U));

			DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/%s\n",

				  name, files[i].name);

				  root->d_name.name, files[i].name);

			kfree(tmp);

			ret = -1;

			goto fail;

CRA Git | Maintained and supported by SUSTech CRA and CCSE