Commit 4825b61a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2020-02-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



- A backmerge of drm-next solving conflicts on i915/gt/intel_lrc.c
- Clean up shadow batch after I915_EXEC_SECURE
- Drop assertion that active->fence is unchanged

Here goes drm-intel-next-2020-02-25:
- A backmerge of drm-next solving conflicts on i915/gt/intel_lrc.c
- Clean up shadow batch after I915_EXEC_SECURE
- Drop assertion that active->fence is unchanged
drm-intel-next-2020-02-24-1:
- RC6 fixes - Chris
- Add extra slice common debug register - Lionel
- Align virtual engines uabi_class/instance with i915_drm.h - Tvrtko
- Avoid potential division by zero in computing CS timestamp - Chris
- Avoid using various globals - Michal Winiarski, Matt Auld
- Break up long lists of GEM object reclaim - Chris
- Check that the vma hasn't been closed before we insert it - Chris
- Consolidate SDVO HDMI force_dvi handling - Ville
- Conversion to new logging and warn macros and functions - Pankaj, Wambul, Chris
- DC3CO fixes - Jose
- Disable use of hwsp_cacheline for kernel_context - Chris
- Display IRQ pre/post uninstall refactor - Jani
- Display port sync refactor for robustness and fixes - Ville, Manasi
- Do not attempt to reprogram IA/ring frequencies for dgfx - Chris
- Drop alpha_support for good in favor of force_probe - Jani
- DSI ACPI related fixes and refactors - Vivek, Jani, Rajat
- Encoder refactor for flexibility to add more information, especiallly DSI related - Jani, Vandita
- Engine workarounds refactor for robustness around resue - Daniele
- FBC simplification and tracepoints
- Various fixes for build - Jani, Kees Cook, Chris, Zhang Xiaoxu
- Fix cmdparser - Chris
- Fix DRM_I915_GEM_MMAP_OFFFSET - Chris
- Fix i915_request flags - Chris
- Fix inconsistency between pfit enable and scaler freeing - Stanislav
- Fix inverted warn_on on display code - Chris
- Fix modeset locks in sanitize_watermarks - Ville
- Fix OA context id overlap with idle context id - Umesh
- Fix pipe and vblank enable for MST - Jani
- Fix VBT handling for timing parameters - Vandita
- Fixes o kernel doc - Chris, Ville
- Force full modeset whenever DSC is enabled at probe - Jani
- Various GEM locking simplification and fixes - Jani , Chris, Jose
  - Including some changes in preparation for making GEM execbuf parallel - Chris
- Gen11 pcode error codes - Matt Roper
- Gen8+ interrupt handler refactor - Chris
- Many fixes and improvements around GuC code - Daniele, Michal Wajdeczko
- i915 parameters improvements sfor flexible input and better debugability - Chris, Jani
- Ice Lake and Elkhart Lake Fixes and workarounds - Matt Roper, Jose, Vivek, Matt Atwood
- Improvements on execlists, requests and other areas, fixing hangs and also
  improving hang detection, recover and debugability - Chris
  - Also introducing offline GT error capture - Chris
- Introduce encoder->compute_config_late() to help MST - Ville
- Make dbuf configuration const - Jani
- Few misc clean ups - Ville, Chris
- Never allow userptr into the new mapping types - Janusz
- Poison rings after use and GTT scratch pages - Chris
- Protect signaler walk with RCU - Chris
- PSR fixes - Jose
- Pull sseu context updates under gt - Chris
- Read rawclk_freq earlier - Chris
- Refactor around VBT handling to allow geting information through the encoder - Jani
- Refactor l3cc/mocs availability - Chris
- Refactor to use intel_connector over drm_connector - Ville
- Remove i915_energy_uJ from debugfs - Tvrtko
- Remove lite restore defines - Mika Kuoppala
- Remove prefault_disable modparam - Chris
- Many selftests fixes and improvements - Chris
- Set intel_dp_set_m_n() for MST slaves - Jose
- Simplify hot plug pin handling and other fixes around pin and polled modes - Ville
- Skip CPU synchronization on dma-buf attachments - chris
- Skip global serialization of clear_range for bxt vtd - Chris
- Skip rmw for marked register - Chris
- Some other GEM Fixes - Chris
- Some small changes for satisfying static code analysis - Colin, Chris
- Suppress warnings for unused debugging locals
- Tiger Lake enabling, including re-enable -f RPS, workarounds and other display fixes and changes - Chris, Matt Roper, Mika Kuoppala, Anshuman, Jose, Radhakrishna, Rafael.
- Track hw reported context runtime - Tvrtko
- Update bug filling URL - Jani
- Use async bind for PIN_USER into bsw/bxt ggtt - Chris
- Use the kernel_context to measuer the breadcrumb size - Chris
- Userptr fixes and robustness for big pages - Matt Auld
- Various Display refactors and clean-ups, specially around logs and use of drm_i915_private - Jani, Ville
- Various display refactors and fixes, especially around cdclk, modeset, and encoder - Chris, Jani
- Various eDP/DP fixes around DPCD - Lyude
- Various fixes and refactors for better Display watermark handling - Ville, Stanislav
- Various other display refactors - Ville
- Various refactor for better handling of display plane states - Ville
- Wean off drm_pci_alloc/drm_pci_free - Chris
- Correctly terminate connector iteration- Ville
- Downgrade gen7 (ivb, byt, hsw) back to aliasing-ppgtt - Chris

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200225185853.GA3282832@intel.com
parents aaa9d265 53e3ca67

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8416,7 +8416,7 @@ M: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> 
M:	Rodrigo Vivi <rodrigo.vivi@intel.com>

L:	intel-gfx@lists.freedesktop.org

W:	https://01.org/linuxgraphics/

B:	https://01.org/linuxgraphics/documentation/how-report-bugs

B:	https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs

C:	irc://chat.freenode.net/intel-gfx

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://anongit.freedesktop.org/drm-intel

drivers/gpu/drm/i915/Kconfig

+2 −10
Original line number Diff line number Diff line
@@ -42,16 +42,9 @@ config DRM_I915 


	  If "M" is selected, the module will be called i915.



config DRM_I915_ALPHA_SUPPORT

	bool "Enable alpha quality support for new Intel hardware by default"

	depends on DRM_I915

	help

	  This option is deprecated. Use DRM_I915_FORCE_PROBE option instead.



config DRM_I915_FORCE_PROBE

	string "Force probe driver for selected new Intel hardware"

	depends on DRM_I915

	default "*" if DRM_I915_ALPHA_SUPPORT

	help

	  This is the default value for the i915.force_probe module

	  parameter. Using the module parameter overrides this option.
@@ -75,9 +68,8 @@ config DRM_I915_CAPTURE_ERROR 
	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.

	  Please report any hang for triaging according to:

	    https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs



	  If in doubt, say "Y".

drivers/gpu/drm/i915/Makefile

+11 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ i915-y += i915_drv.o \ 
	  i915_switcheroo.o \

	  i915_sysfs.o \

	  i915_utils.o \

	  intel_csr.o \

	  intel_device_info.o \

	  intel_memory_region.o \

	  intel_pch.o \
@@ -54,7 +53,8 @@ i915-y += i915_drv.o \ 
	  intel_runtime_pm.o \

	  intel_sideband.o \

	  intel_uncore.o \

	  intel_wakeref.o

	  intel_wakeref.o \

	  vlv_suspend.o



# core library code

i915-y += \
@@ -66,7 +66,11 @@ i915-y += \ 
	i915_user_extensions.o



i915-$(CONFIG_COMPAT)   += i915_ioc32.o

i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o display/intel_pipe_crc.o

i915-$(CONFIG_DEBUG_FS) += \

	i915_debugfs.o \

	i915_debugfs_params.o \

	display/intel_display_debugfs.o \

	display/intel_pipe_crc.o

i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o



# "Graphics Technology" (aka we talk to the gpu)
@@ -78,6 +82,7 @@ gt-y += \ 
	gt/gen8_ppgtt.o \

	gt/intel_breadcrumbs.o \

	gt/intel_context.o \

	gt/intel_context_sseu.o \

	gt/intel_engine_cs.o \

	gt/intel_engine_heartbeat.o \

	gt/intel_engine_pm.o \
@@ -179,6 +184,7 @@ i915-y += \ 
	display/intel_color.o \

	display/intel_combo_phy.o \

	display/intel_connector.o \

	display/intel_csr.o \

	display/intel_display.o \

	display/intel_display_power.o \

	display/intel_dpio_phy.o \
@@ -187,6 +193,7 @@ i915-y += \ 
	display/intel_fbc.o \

	display/intel_fifo_underrun.o \

	display/intel_frontbuffer.o \

	display/intel_global_state.o \

	display/intel_hdcp.o \

	display/intel_hotplug.o \

	display/intel_lpe_audio.o \
@@ -294,7 +301,7 @@ extra-$(CONFIG_DRM_I915_WERROR) += \ 
		$(shell cd $(srctree)/$(src) && find * -name '*.h')))



quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@)

      cmd_hdrtest = $(CC) $(c_flags) -S -o /dev/null -x c /dev/null -include $<; touch $@

      cmd_hdrtest = $(CC) $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; touch $@



$(obj)/%.hdrtest: $(src)/%.h FORCE

	$(call if_changed_dep,hdrtest)

drivers/gpu/drm/i915/display/icl_dsi.c

+217 −166

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_acpi.c

+89 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include "i915_drv.h"

#include "intel_acpi.h"

#include "intel_display_types.h"



#define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */

#define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */
@@ -156,3 +157,91 @@ void intel_register_dsm_handler(void) 
void intel_unregister_dsm_handler(void)

{

}



/*

 * ACPI Specification, Revision 5.0, Appendix B.3.2 _DOD (Enumerate All Devices

 * Attached to the Display Adapter).

 */

#define ACPI_DISPLAY_INDEX_SHIFT		0

#define ACPI_DISPLAY_INDEX_MASK			(0xf << 0)

#define ACPI_DISPLAY_PORT_ATTACHMENT_SHIFT	4

#define ACPI_DISPLAY_PORT_ATTACHMENT_MASK	(0xf << 4)

#define ACPI_DISPLAY_TYPE_SHIFT			8

#define ACPI_DISPLAY_TYPE_MASK			(0xf << 8)

#define ACPI_DISPLAY_TYPE_OTHER			(0 << 8)

#define ACPI_DISPLAY_TYPE_VGA			(1 << 8)

#define ACPI_DISPLAY_TYPE_TV			(2 << 8)

#define ACPI_DISPLAY_TYPE_EXTERNAL_DIGITAL	(3 << 8)

#define ACPI_DISPLAY_TYPE_INTERNAL_DIGITAL	(4 << 8)

#define ACPI_VENDOR_SPECIFIC_SHIFT		12

#define ACPI_VENDOR_SPECIFIC_MASK		(0xf << 12)

#define ACPI_BIOS_CAN_DETECT			(1 << 16)

#define ACPI_DEPENDS_ON_VGA			(1 << 17)

#define ACPI_PIPE_ID_SHIFT			18

#define ACPI_PIPE_ID_MASK			(7 << 18)

#define ACPI_DEVICE_ID_SCHEME			(1ULL << 31)



static u32 acpi_display_type(struct intel_connector *connector)

{

	u32 display_type;



	switch (connector->base.connector_type) {

	case DRM_MODE_CONNECTOR_VGA:

	case DRM_MODE_CONNECTOR_DVIA:

		display_type = ACPI_DISPLAY_TYPE_VGA;

		break;

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_Component:

	case DRM_MODE_CONNECTOR_9PinDIN:

	case DRM_MODE_CONNECTOR_TV:

		display_type = ACPI_DISPLAY_TYPE_TV;

		break;

	case DRM_MODE_CONNECTOR_DVII:

	case DRM_MODE_CONNECTOR_DVID:

	case DRM_MODE_CONNECTOR_DisplayPort:

	case DRM_MODE_CONNECTOR_HDMIA:

	case DRM_MODE_CONNECTOR_HDMIB:

		display_type = ACPI_DISPLAY_TYPE_EXTERNAL_DIGITAL;

		break;

	case DRM_MODE_CONNECTOR_LVDS:

	case DRM_MODE_CONNECTOR_eDP:

	case DRM_MODE_CONNECTOR_DSI:

		display_type = ACPI_DISPLAY_TYPE_INTERNAL_DIGITAL;

		break;

	case DRM_MODE_CONNECTOR_Unknown:

	case DRM_MODE_CONNECTOR_VIRTUAL:

		display_type = ACPI_DISPLAY_TYPE_OTHER;

		break;

	default:

		MISSING_CASE(connector->base.connector_type);

		display_type = ACPI_DISPLAY_TYPE_OTHER;

		break;

	}



	return display_type;

}



void intel_acpi_device_id_update(struct drm_i915_private *dev_priv)

{

	struct drm_device *drm_dev = &dev_priv->drm;

	struct intel_connector *connector;

	struct drm_connector_list_iter conn_iter;

	u8 display_index[16] = {};



	/* Populate the ACPI IDs for all connectors for a given drm_device */

	drm_connector_list_iter_begin(drm_dev, &conn_iter);

	for_each_intel_connector_iter(connector, &conn_iter) {

		u32 device_id, type;



		device_id = acpi_display_type(connector);



		/* Use display type specific display index. */

		type = (device_id & ACPI_DISPLAY_TYPE_MASK)

			>> ACPI_DISPLAY_TYPE_SHIFT;

		device_id |= display_index[type]++ << ACPI_DISPLAY_INDEX_SHIFT;



		connector->acpi_device_id = device_id;

	}

	drm_connector_list_iter_end(&conn_iter);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE