Commit 5c37daf5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-intel into drm-next 

More 4.11 stuff, holidays edition (i.e. not much):

- docs and cleanups for shared dpll code (Ander)
- some kerneldoc work (Chris)
- fbc by default on gen9+ too, yeah! (Paulo)
- fixes, polish and other small things all over gem code (Chris)
- and a few small things on top

Plus a backmerge, because Dave was enjoying time off too.

* tag 'drm-intel-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-intel: (275 commits)
  drm/i915: Update DRIVER_DATE to 20170109
  drm/i915: Drain freed objects for mmap space exhaustion
  drm/i915: Purge loose pages if we run out of DMA remap space
  drm/i915: Fix phys pwrite for struct_mutex-less operation
  drm/i915: Simplify testing for am-I-the-kernel-context?
  drm/i915: Use range_overflows()
  drm/i915: Use fixed-sized types for stolen
  drm/i915: Use phys_addr_t for the address of stolen memory
  drm/i915: Consolidate checks for memcpy-from-wc support
  drm/i915: Only skip requests once a context is banned
  drm/i915: Move a few more utility macros to i915_utils.h
  drm/i915: Clear ret before unbinding in i915_gem_evict_something()
  drm/i915/guc: Exclude the upper end of the Global GTT for the GuC
  drm/i915: Move a few utility macros into a separate header
  drm/i915/execlists: Reorder execlists register enabling
  drm/i915: Assert that we do create the deferred context
  drm/i915: Assert all timeline requests are gone before fini
  drm/i915: Revoke fenced GTT mmapings across GPU reset
  drm/i915: enable FBC on gen9+ too
  drm/i915: actually drive the BDW reserved IDs
  ...
parents 3806a271 5d799acd

Documentation/gpu/i915.rst

+103 −0
Original line number Diff line number Diff line
@@ -213,6 +213,18 @@ Video BIOS Table (VBT) 
.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h

   :internal:



Display PLLs

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



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

   :doc: Display PLLs



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

   :internal:



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

   :internal:



Memory Management and Command Submission

========================================
@@ -356,4 +368,95 @@ switch_mm 
.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h

   :doc: switch_mm tracepoint



Perf

====



Overview

--------

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

   :doc: i915 Perf Overview



Comparison with Core Perf

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

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

   :doc: i915 Perf History and Comparison with Core Perf



i915 Driver Entry Points

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



This section covers the entrypoints exported outside of i915_perf.c to

integrate with drm/i915 and to handle the `DRM_I915_PERF_OPEN` ioctl.



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

   :functions: i915_perf_init

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

   :functions: i915_perf_fini

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

   :functions: i915_perf_register

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

   :functions: i915_perf_unregister

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

   :functions: i915_perf_open_ioctl

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

   :functions: i915_perf_release



i915 Perf Stream

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



This section covers the stream-semantics-agnostic structures and functions

for representing an i915 perf stream FD and associated file operations.



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

   :functions: i915_perf_stream

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

   :functions: i915_perf_stream_ops



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

   :functions: read_properties_unlocked

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

   :functions: i915_perf_open_ioctl_locked

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

   :functions: i915_perf_destroy_locked

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

   :functions: i915_perf_read

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

   :functions: i915_perf_ioctl

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

   :functions: i915_perf_enable_locked

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

   :functions: i915_perf_disable_locked

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

   :functions: i915_perf_poll

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

   :functions: i915_perf_poll_locked



i915 Perf Observation Architecture Stream

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



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

   :functions: i915_oa_ops



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

   :functions: i915_oa_stream_init

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

   :functions: i915_oa_read

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

   :functions: i915_oa_stream_enable

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

   :functions: i915_oa_stream_disable

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

   :functions: i915_oa_wait_unlocked

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

   :functions: i915_oa_poll_wait



All i915 Perf Internals

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



This section simply includes all currently documented i915 perf internals, in

no particular order, but may include some more minor utilities or platform

specific details than found in the more high-level sections.



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

   :internal:



.. WARNING: DOCPROC directive not supported: !Cdrivers/gpu/drm/i915/i915_irq.c

drivers/char/agp/intel-gtt.c

+4 −2
Original line number Diff line number Diff line
@@ -1420,8 +1420,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, 
}

EXPORT_SYMBOL(intel_gmch_probe);



void intel_gtt_get(u64 *gtt_total, size_t *stolen_size,

		   phys_addr_t *mappable_base, u64 *mappable_end)

void intel_gtt_get(u64 *gtt_total,

		   u32 *stolen_size,

		   phys_addr_t *mappable_base,

		   u64 *mappable_end)

{

	*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;

	*stolen_size = intel_private.stolen_size;

drivers/gpu/drm/i915/Kconfig.debug

+15 −0
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ config DRM_I915_DEBUG 
        bool "Enable additional driver debugging"

        depends on DRM_I915

        select PREEMPT_COUNT

        select I2C_CHARDEV

        select DRM_DP_AUX_CHARDEV

        select X86_MSR # used by igt/pm_rpm

        select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)

        select DRM_DEBUG_MM if DRM=y

	select DRM_I915_SW_FENCE_DEBUG_OBJECTS

        default n

        help

          Choose this option to turn on extra driver debugging that may affect
@@ -43,3 +46,15 @@ config DRM_I915_DEBUG_GEM 


          If in doubt, say "N".



config DRM_I915_SW_FENCE_DEBUG_OBJECTS

        bool "Enable additional driver debugging for fence objects"

        depends on DRM_I915

        select DEBUG_OBJECTS

        default n

        help

          Choose this option to turn on extra driver debugging that may affect

          performance but will catch some internal issues.



          Recommended for driver developers only.



          If in doubt, say "N".

drivers/gpu/drm/i915/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ i915-y := i915_drv.o \ 
	  intel_runtime_pm.o



i915-$(CONFIG_COMPAT)   += i915_ioc32.o

i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o

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



# GEM code

i915-y += i915_cmd_parser.o \
@@ -55,7 +55,8 @@ i915-y += i915_cmd_parser.o \ 
	  intel_uncore.o



# general-purpose microcontroller (GuC) support

i915-y += intel_guc_loader.o \

i915-y += intel_uc.o \

	  intel_guc_loader.o \

	  i915_guc_submission.o



# autogenerated null render state
@@ -117,6 +118,10 @@ i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o 
# virtual gpu code

i915-y += i915_vgpu.o



# perf code

i915-y += i915_perf.o \

	  i915_oa_hsw.o



ifeq ($(CONFIG_DRM_I915_GVT),y)

i915-y += intel_gvt.o

include $(src)/gvt/Makefile

drivers/gpu/drm/i915/gvt/aperture_gm.c

+5 −2
Original line number Diff line number Diff line
@@ -73,12 +73,15 @@ static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm) 
	mutex_lock(&dev_priv->drm.struct_mutex);

search_again:

	ret = drm_mm_insert_node_in_range_generic(&dev_priv->ggtt.base.mm,

						  node, size, 4096, 0,

						  node, size, 4096,

						  I915_COLOR_UNEVICTABLE,

						  start, end, search_flag,

						  alloc_flag);

	if (ret) {

		ret = i915_gem_evict_something(&dev_priv->ggtt.base,

					       size, 4096, 0, start, end, 0);

					       size, 4096,

					       I915_COLOR_UNEVICTABLE,

					       start, end, 0);

		if (ret == 0 && ++retried < 3)

			goto search_again;

CRA Git | Maintained and supported by SUSTech CRA and CCSE