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

Merge tag 'drm-intel-next-2019-07-30' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



- More changes on simplifying locking mechanisms (Chris)
- Selftests fixes and improvements (Chris)
- More work around engine tracking for better handling (Chris, Tvrtko)
- HDCP debug and info improvements (Ram, Ashuman)
- Add DSI properties (Vandita)
- Rework on sdvo support for better debuggability before fixing bugs (Ville)
- Display PLLs fixes and improvements, specially targeting Ice Lake (Imre, Matt, Ville)
- Perf fixes and improvements (Lionel)
- Enumerate scratch buffers (Lionel)
- Add infra to hold off preemption on a request (Lionel)
- Ice Lake color space fixes (Uma)
- Type-C fixes and improvements (Lucas)
- Fix and improvements around workarounds (Chris, John, Tvrtko)
- GuC related fixes and improvements (Chris, Daniele, Michal, Tvrtko)
- Fix on VLV/CHV display power domain (Ville)
- Improvements around Watermark (Ville)
- Favor intel_ types on intel_atomic functions (Ville)
- Don’t pass stack garbage to pcode (Ville)
- Improve display tracepoints (Steven)
- Don’t overestimate 4:2:0 link symbol clock (Ville)
- Add support for 4th pipe and transcoder (Lucas)
- Introduce initial support for Tiger Lake platform (Daniele, Lucas, Mahesh, Jose, Imre, Mika, Vandita, Rodrigo, Michel)
- PPGTT allocation simplification (Chris)
- Standardize function names and suffixes to make clean, symmetric and let checkpatch happy (Janusz)
- Skip SINK_COUNT read on CH7511 (Ville)
- Fix on kernel documentation (Chris, Michal)
- Add modular FIA (Anusha, Lucas)
- Fix EHL display (Matt, Vivek)
- Enable hotplug retry (Imre, Jose)
- Disable preemption under GVT (Chris)
- OA; Reconfigure context on the fly (Chris)
- Fixes and improvements around engine reset. (Chris)
- Small clean up on display pipe fault mask (Ville)
- Make sure cdclk is high enough for DP audio on VLV/CHV (Ville)
- Drop some wmb() and improve pwrite flush (Chris)
- Fix critical PSR regression (DK)
- Remove unused variables (YueHaibing)
- Use dev_get_drvdata for simplification (Chunhong)
- Use upstream version of header tests (Jani)

drm-intel-next-2019-07-08:
- Signal fence completion from i915_request_wait (Chris)
- Fixes and improvements around rings pin/unpin (Chris)
- Display uncore prep patches (Daniele)
- Execlists preemption improvements (Chris)
- Selftests fixes and improvements (Chris)
- More Elkhartlake enabling work (Vandita, Jose, Matt, Vivek)
- Defer address space cleanup to an RCU worker (Chris)
- Implicit dev_priv removal and GT compartmentalization and other related follow-ups (Tvrtko, Chris)
- Prevent dereference of engine before NULL check in error capture (Chris)
- GuC related fixes (Daniele, Robert)
- Many changes on active tracking, timelines and locking mechanisms (Chris)
- Disable SAMPLER_STATE prefetching on Gen11 (HW W/a) (Kenneth)
- I915_perf fixes (Lionel)
- Add Ice Lake PCI ID (Mika)
- eDP backlight fix (Lee)
- Fix various gen2 tracepoints (Ville)
- Some irq vfunc clean-up and improvements (Ville)
- Move OA files to separated folder (Michal)
- Display self contained headers clean-up (Jani)
- Preparation for 4th pile (Lucas)
- Move atomic commit, watermark and other places to use more intel_crtc_state (Maarten)
- Many Ice Lake Type C and Thunderbolt fixes (Imre)
- Fix some Ice Lake hw w/a whitelist regs (Lionel)
- Fix memleak in runtime wakeref tracking (Mika)
- Remove unused Private PPAT manager (Michal)
- Don't check PPGTT presence on PPGTT-only platforms (Michal)
- Fix ICL DSI suspend/resume (Chris)
- Fix ICL Bandwidth issues (Ville)
- Add N & CTS values for 10/12 bit deep color (Aditya)
- Moving more GT related stuff under gt folder (Chris)
- Forcewake related fixes (Chris)
- Show support for accurate sw PMU busyness tracking (Chris)
- Handle gtt double alloc failures (Chris)
- Upgrade to new GuC version (Michal)
- Improve w/a debug dumps and pull engine w/a initialization into a common (Chris)
- Look for instdone on all engines at hangcheck (Tvrtko)
- Engine lookup simplification  (Chris)
- Many plane color formats fixes and improvements (Ville)
- Fix some compilation issues (YueHaibing)
- GTT page directory clean up and improvements (Mika)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190801201314.GA23635@intel.com
parents e21a712a e0e712fe

Documentation/gpu/i915.rst

+10 −10
Original line number Diff line number Diff line
@@ -430,31 +430,31 @@ WOPCM Layout 
GuC

===



Firmware Layout

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



.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h

   :doc: Firmware Layout



GuC-specific firmware loader

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



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

.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c

   :internal:



GuC-based command submission

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



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

.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

   :doc: GuC-based command submission



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

.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

   :internal:



GuC Firmware Layout

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



.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fwif.h

   :doc: GuC Firmware Layout



GuC Address Space

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



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

.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc.c

   :doc: GuC Address Space



Tracing

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { 
	INTEL_CNL_IDS(&gen9_early_ops),

	INTEL_ICL_11_IDS(&gen11_early_ops),

	INTEL_EHL_IDS(&gen11_early_ops),

	INTEL_TGL_12_IDS(&gen11_early_ops),

};



struct resource intel_graphics_stolen_res __ro_after_init = DEFINE_RES_MEM(0, 0);

drivers/gpu/drm/i915/Kconfig.debug

+15 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config DRM_I915_WERROR 
        # We use the dependency on !COMPILE_TEST to not be enabled in

        # allmodconfig or allyesconfig configurations

        depends on !COMPILE_TEST

	select HEADER_TEST

        default n

        help

          Add -Werror to the build flags for (and only for) i915.ko.
@@ -94,6 +95,20 @@ config DRM_I915_TRACE_GEM 


	  If in doubt, say "N".



config DRM_I915_TRACE_GTT

	bool "Insert extra ftrace output from the GTT internals"

	depends on DRM_I915_DEBUG_GEM

	select TRACING

	default n

	help

	  Enable additional and verbose debugging output that will spam

	  ordinary tests, but may be vital for post-mortem debugging when

	  used with /proc/sys/kernel/ftrace_dump_on_oops



	  Recommended for driver developers only.



	  If in doubt, say "N".



config DRM_I915_SW_FENCE_DEBUG_OBJECTS

        bool "Enable additional driver debugging for fence objects"

        depends on DRM_I915

drivers/gpu/drm/i915/Makefile

+43 −38
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ subdir-ccflags-y += \ 
	$(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)



# Extra header tests

include $(src)/Makefile.header-test

header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h



subdir-ccflags-y += -I$(src)

subdir-ccflags-y += -I$(srctree)/$(src)



# Please keep these build lists sorted!
@@ -73,14 +73,23 @@ gt-y += \ 
	gt/intel_context.o \

	gt/intel_engine_cs.o \

	gt/intel_engine_pm.o \

	gt/intel_gt.o \

	gt/intel_gt_pm.o \

	gt/intel_hangcheck.o \

	gt/intel_lrc.o \

	gt/intel_renderstate.o \

	gt/intel_reset.o \

	gt/intel_ringbuffer.o \

	gt/intel_mocs.o \

	gt/intel_sseu.o \

	gt/intel_timeline.o \

	gt/intel_workarounds.o

# autogenerated null render state

gt-y += \

	gt/gen6_renderstate.o \

	gt/gen7_renderstate.o \

	gt/gen8_renderstate.o \

	gt/gen9_renderstate.o

gt-$(CONFIG_DRM_I915_SELFTEST) += \

	gt/mock_engine.o

i915-y += $(gt-y)
@@ -120,33 +129,26 @@ i915-y += \ 
	  i915_gem_fence_reg.o \

	  i915_gem_gtt.o \

	  i915_gem.o \

	  i915_gem_render_state.o \

	  i915_globals.o \

	  i915_query.o \

	  i915_request.o \

	  i915_scheduler.o \

	  i915_timeline.o \

	  i915_trace_points.o \

	  i915_vma.o \

	  intel_wopcm.o



# general-purpose microcontroller (GuC) support

i915-y += intel_uc.o \

	  intel_uc_fw.o \

	  intel_guc.o \

	  intel_guc_ads.o \

	  intel_guc_ct.o \

	  intel_guc_fw.o \

	  intel_guc_log.o \

	  intel_guc_submission.o \

	  intel_huc.o \

	  intel_huc_fw.o



# autogenerated null render state

i915-y += intel_renderstate_gen6.o \

	  intel_renderstate_gen7.o \

	  intel_renderstate_gen8.o \

	  intel_renderstate_gen9.o

obj-y += gt/uc/

i915-y += gt/uc/intel_uc.o \

	  gt/uc/intel_uc_fw.o \

	  gt/uc/intel_guc.o \

	  gt/uc/intel_guc_ads.o \

	  gt/uc/intel_guc_ct.o \

	  gt/uc/intel_guc_fw.o \

	  gt/uc/intel_guc_log.o \

	  gt/uc/intel_guc_submission.o \

	  gt/uc/intel_huc.o \

	  gt/uc/intel_huc_fw.o



# modesetting core code

obj-y += display/
@@ -173,7 +175,8 @@ i915-y += \ 
	display/intel_overlay.o \

	display/intel_psr.o \

	display/intel_quirks.o \

	display/intel_sprite.o

	display/intel_sprite.o \

	display/intel_tc.o

i915-$(CONFIG_ACPI) += \

	display/intel_acpi.o \

	display/intel_opregion.o
@@ -210,6 +213,25 @@ i915-y += \ 
	display/vlv_dsi.o \

	display/vlv_dsi_pll.o



# perf code

obj-y += oa/

i915-y += \

	oa/i915_oa_hsw.o \

	oa/i915_oa_bdw.o \

	oa/i915_oa_chv.o \

	oa/i915_oa_sklgt2.o \

	oa/i915_oa_sklgt3.o \

	oa/i915_oa_sklgt4.o \

	oa/i915_oa_bxt.o \

	oa/i915_oa_kblgt2.o \

	oa/i915_oa_kblgt3.o \

	oa/i915_oa_glk.o \

	oa/i915_oa_cflgt2.o \

	oa/i915_oa_cflgt3.o \

	oa/i915_oa_cnl.o \

	oa/i915_oa_icl.o

i915-y += i915_perf.o



# Post-mortem debug and GPU hang state capture

i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o

i915-$(CONFIG_DRM_I915_SELFTEST) += \
@@ -224,23 +246,6 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ 
# virtual gpu code

i915-y += i915_vgpu.o



# perf code

i915-y += i915_perf.o \

	  i915_oa_hsw.o \

	  i915_oa_bdw.o \

	  i915_oa_chv.o \

	  i915_oa_sklgt2.o \

	  i915_oa_sklgt3.o \

	  i915_oa_sklgt4.o \

	  i915_oa_bxt.o \

	  i915_oa_kblgt2.o \

	  i915_oa_kblgt3.o \

	  i915_oa_glk.o \

	  i915_oa_cflgt2.o \

	  i915_oa_cflgt3.o \

	  i915_oa_cnl.o \

	  i915_oa_icl.o



ifeq ($(CONFIG_DRM_I915_GVT),y)

i915-y += intel_gvt.o

include $(src)/gvt/Makefile

drivers/gpu/drm/i915/Makefile.header-test

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

# Copyright © 2019 Intel Corporation



# Test the headers are compilable as standalone units

header-test-$(CONFIG_DRM_I915_WERROR) := \

	i915_active_types.h \

	i915_debugfs.h \

	i915_drv.h \

	i915_irq.h \

	i915_params.h \

	i915_priolist_types.h \

	i915_reg.h \

	i915_scheduler_types.h \

	i915_timeline_types.h \

	i915_utils.h \

	intel_csr.h \

	intel_drv.h \

	intel_pm.h \

	intel_runtime_pm.h \

	intel_sideband.h \

	intel_uncore.h \

	intel_wakeref.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE