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

Commit 5481e27f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next 

- first slice of the gvt device model (Zhenyu et al)
- compression support for gpu error states (Chris)
- sunset clause on gpu errors resulting in dmesg noise telling users
  how to report them
- .rodata diet from Tvrtko
- switch over lots of macros to only take dev_priv (Tvrtko)
- underrun suppression for dp link training (Ville)
- lspcon (hmdi 2.0 on skl/bxt) support from Shashank Sharma, polish
  from Jani
- gen9 wm fixes from Paulo&Lyude
- updated ddi programming for kbl (Rodrigo)
- respect alternate aux/ddc pins (from vbt) for all ddi ports (Ville)

* tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel: (227 commits)
  drm/i915: Update DRIVER_DATE to 20161024
  drm/i915: Stop setting SNB min-freq-table 0 on powersave setup
  drm/i915/dp: add lane_count check in intel_dp_check_link_status
  drm/i915: Fix whitespace issues
  drm/i915: Clean up DDI DDC/AUX CH sanitation
  drm/i915: Respect alternate_ddc_pin for all DDI ports
  drm/i915: Respect alternate_aux_channel for all DDI ports
  drm/i915/gen9: Remove WaEnableYV12BugFixInHalfSliceChicken7
  drm/i915: KBL - Recommended buffer translation programming for DisplayPort
  drm/i915: Move down skl/kbl ddi iboost and n_edp_entires fixup
  drm/i915: Add a sunset clause to GPU hang logging
  drm/i915: Stop reporting error details in dmesg as well as the error-state
  drm/i915/gvt: do not ignore return value of create_scratch_page
  drm/i915/gvt: fix spare warnings on odd constant _Bool cast
  drm/i915/gvt: mark symbols static where possible
  drm/i915/gvt: fix sparse warnings on different address spaces
  drm/i915/gvt: properly access enabled intel_engine_cs
  drm/i915/gvt: Remove defunct vmap_batch()
  drm/i915/gvt: Use common mapping routines for shadow_bb object
  drm/i915/gvt: Use common mapping routines for indirect_ctx object
  ...
parents 61d0a04d 9558e74c

Documentation/gpu/i915.rst

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ Intel GVT-g Guest Support(vGPU) 
.. kernel-doc:: drivers/gpu/drm/i915/i915_vgpu.c

   :internal:



Intel GVT-g Host Support(vGPU device model)

-------------------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_gvt.c

   :doc: Intel GVT-g host support



.. kernel-doc:: drivers/gpu/drm/i915/intel_gvt.c

   :internal:



Display Hardware Handling

=========================

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -4064,6 +4064,16 @@ F: include/drm/i915* 
F:	include/uapi/drm/i915_drm.h

F:	Documentation/gpu/i915.rst



INTEL GVT-g DRIVERS (Intel GPU Virtualization)

M:      Zhenyu Wang <zhenyuw@linux.intel.com>

M:      Zhi Wang <zhi.a.wang@intel.com>

L:      igvt-g-dev@lists.01.org

L:      intel-gfx@lists.freedesktop.org

W:      https://01.org/igvt-g

T:      git https://github.com/01org/gvt-linux.git

S:      Supported

F:      drivers/gpu/drm/i915/gvt/



DRM DRIVERS FOR ATMEL HLCDC

M:	Boris Brezillon <boris.brezillon@free-electrons.com>

L:	dri-devel@lists.freedesktop.org

drivers/gpu/drm/drm_dp_dual_mode_helper.c

+103 −0
Original line number Diff line number Diff line
@@ -148,6 +148,14 @@ static bool is_type2_adaptor(uint8_t adaptor_id) 
			      DP_DUAL_MODE_REV_TYPE2);

}



static bool is_lspcon_adaptor(const char hdmi_id[DP_DUAL_MODE_HDMI_ID_LEN],

			      const uint8_t adaptor_id)

{

	return is_hdmi_adaptor(hdmi_id) &&

		(adaptor_id == (DP_DUAL_MODE_TYPE_TYPE2 |

		 DP_DUAL_MODE_TYPE_HAS_DPCD));

}



/**

 * drm_dp_dual_mode_detect - Identify the DP dual mode adaptor

 * @adapter: I2C adapter for the DDC bus
@@ -203,6 +211,8 @@ enum drm_dp_dual_mode_type drm_dp_dual_mode_detect(struct i2c_adapter *adapter) 
	ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_ADAPTOR_ID,

				    &adaptor_id, sizeof(adaptor_id));

	if (ret == 0) {

		if (is_lspcon_adaptor(hdmi_id, adaptor_id))

			return DRM_DP_DUAL_MODE_LSPCON;

		if (is_type2_adaptor(adaptor_id)) {

			if (is_hdmi_adaptor(hdmi_id))

				return DRM_DP_DUAL_MODE_TYPE2_HDMI;
@@ -364,3 +374,96 @@ const char *drm_dp_get_dual_mode_type_name(enum drm_dp_dual_mode_type type) 
	}

}

EXPORT_SYMBOL(drm_dp_get_dual_mode_type_name);



/**

 * drm_lspcon_get_mode: Get LSPCON's current mode of operation by

 * reading offset (0x80, 0x41)

 * @adapter: I2C-over-aux adapter

 * @mode: current lspcon mode of operation output variable

 *

 * Returns:

 * 0 on success, sets the current_mode value to appropriate mode

 * -error on failure

 */

int drm_lspcon_get_mode(struct i2c_adapter *adapter,

			enum drm_lspcon_mode *mode)

{

	u8 data;

	int ret = 0;



	if (!mode) {

		DRM_ERROR("NULL input\n");

		return -EINVAL;

	}



	/* Read Status: i2c over aux */

	ret = drm_dp_dual_mode_read(adapter, DP_DUAL_MODE_LSPCON_CURRENT_MODE,

				    &data, sizeof(data));

	if (ret < 0) {

		DRM_ERROR("LSPCON read(0x80, 0x41) failed\n");

		return -EFAULT;

	}



	if (data & DP_DUAL_MODE_LSPCON_MODE_PCON)

		*mode = DRM_LSPCON_MODE_PCON;

	else

		*mode = DRM_LSPCON_MODE_LS;

	return 0;

}

EXPORT_SYMBOL(drm_lspcon_get_mode);



/**

 * drm_lspcon_set_mode: Change LSPCON's mode of operation by

 * writing offset (0x80, 0x40)

 * @adapter: I2C-over-aux adapter

 * @mode: required mode of operation

 *

 * Returns:

 * 0 on success, -error on failure/timeout

 */

int drm_lspcon_set_mode(struct i2c_adapter *adapter,

			enum drm_lspcon_mode mode)

{

	u8 data = 0;

	int ret;

	int time_out = 200;

	enum drm_lspcon_mode current_mode;



	if (mode == DRM_LSPCON_MODE_PCON)

		data = DP_DUAL_MODE_LSPCON_MODE_PCON;



	/* Change mode */

	ret = drm_dp_dual_mode_write(adapter, DP_DUAL_MODE_LSPCON_MODE_CHANGE,

				     &data, sizeof(data));

	if (ret < 0) {

		DRM_ERROR("LSPCON mode change failed\n");

		return ret;

	}



	/*

	 * Confirm mode change by reading the status bit.

	 * Sometimes, it takes a while to change the mode,

	 * so wait and retry until time out or done.

	 */

	do {

		ret = drm_lspcon_get_mode(adapter, &current_mode);

		if (ret) {

			DRM_ERROR("can't confirm LSPCON mode change\n");

			return ret;

		} else {

			if (current_mode != mode) {

				msleep(10);

				time_out -= 10;

			} else {

				DRM_DEBUG_KMS("LSPCON mode changed to %s\n",

						mode == DRM_LSPCON_MODE_LS ?

						"LS" : "PCON");

				return 0;

			}

		}

	} while (time_out);



	DRM_ERROR("LSPCON mode change timed out\n");

	return -ETIMEDOUT;

}

EXPORT_SYMBOL(drm_lspcon_set_mode);

drivers/gpu/drm/i915/Kconfig

+25 −0
Original line number Diff line number Diff line
@@ -46,6 +46,31 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT 


	  If in doubt, say "N".



config DRM_I915_CAPTURE_ERROR

	bool "Enable capturing GPU state following a hang"

	depends on DRM_I915

	default y

	help

	  This option enables capturing the GPU state when a hang is detected.

	  This information is vital for triaging hangs and assists in debugging.

	  Please report any hang to

            https://bugs.freedesktop.org/enter_bug.cgi?product=DRI

	  for triaging.



	  If in doubt, say "Y".



config DRM_I915_COMPRESS_ERROR

	bool "Compress GPU error state"

	depends on DRM_I915_CAPTURE_ERROR

	select ZLIB_DEFLATE

	default y

	help

	  This option selects ZLIB_DEFLATE if it isn't already

	  selected and causes any error state captured upon a GPU hang

	  to be compressed using zlib.



	  If in doubt, say "Y".



config DRM_I915_USERPTR

	bool "Always enable userptr support"

	depends on DRM_I915

drivers/gpu/drm/i915/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ i915-y += i915_cmd_parser.o \ 
	  i915_gem_stolen.o \

	  i915_gem_tiling.o \

	  i915_gem_userptr.o \

	  i915_gpu_error.o \

	  i915_trace_points.o \

	  intel_breadcrumbs.o \

	  intel_engine_cs.o \
@@ -102,11 +101,15 @@ i915-y += dvo_ch7017.o \ 
	  intel_dvo.o \

	  intel_hdmi.o \

	  intel_i2c.o \

	  intel_lspcon.o \

	  intel_lvds.o \

	  intel_panel.o \

	  intel_sdvo.o \

	  intel_tv.o



# Post-mortem debug and GPU hang state capture

i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o



# virtual gpu code

i915-y += i915_vgpu.o