Commit 9235dd44 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next 



New features for 4.21:
amdgpu:
- Support for SDMA paging queue on vega
- Put compute EOP buffers into vram for better performance
- Share more code with amdkfd
- Support for scanout with DCC on gfx9
- Initial kerneldoc for DC
- Updated SMU firmware support for gfx8 chips
- Rework CSA handling for eventual support for preemption
- XGMI PSP support
- Clean up RLC handling
- Enable GPU reset by default on VI, SOC15 dGPUs
- Ring and IB test cleanups

amdkfd:
- Share more code with amdgpu

ttm:
- Move global init out of the drivers

scheduler:
- Track if schedulers are ready for work
- Timeout/fault handling changes to facilitate GPU recovery

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181114165113.3751-1-alexander.deucher@amd.com
parents d7563c55 36b486bc

Documentation/gpu/amdgpu-dc.rst

0 → 100644
+68 −0
Original line number Diff line number Diff line 
===================================

drm/amd/display - Display Core (DC)

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



*placeholder - general description of supported platforms, what dc is, etc.*



Because it is partially shared with other operating systems, the Display Core

Driver is divided in two pieces.



1. **Display Core (DC)** contains the OS-agnostic components. Things like

   hardware programming and resource management are handled here.

2. **Display Manager (DM)** contains the OS-dependent components. Hooks to the

   amdgpu base driver and DRM are implemented here.



It doesn't help that the entire package is frequently referred to as DC. But

with the context in mind, it should be clear.



When CONFIG_DRM_AMD_DC is enabled, DC will be initialized by default for

supported ASICs. To force disable, set `amdgpu.dc=0` on kernel command line.

Likewise, to force enable on unsupported ASICs, set `amdgpu.dc=1`.



To determine if DC is loaded, search dmesg for the following entry:



``Display Core initialized with <version number here>``



AMDgpu Display Manager

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



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :doc: overview



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

   :internal:



Lifecycle

---------



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :doc: DM Lifecycle



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :functions: dm_hw_init dm_hw_fini



Interrupts

----------



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c

   :doc: overview



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c

   :internal:



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :functions: register_hpd_handlers dm_crtc_high_irq dm_pflip_high_irq



Atomic Implementation

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



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :doc: atomic



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :functions: amdgpu_dm_atomic_check amdgpu_dm_atomic_commit_tail



Display Core

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



**WIP**

Documentation/gpu/drivers.rst

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ GPU Driver Documentation 
.. toctree::



   amdgpu

   amdgpu-dc

   i915

   meson

   pl111

Documentation/gpu/drm-mm.rst

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ object TTM to provide a pool for buffer object allocation by clients and 
the kernel itself. The type of this object should be

TTM_GLOBAL_TTM_BO, and its size should be sizeof(struct

ttm_bo_global). Again, driver-specific init and release functions may

be provided, likely eventually calling ttm_bo_global_init() and

ttm_bo_global_release(), respectively. Also, like the previous

be provided, likely eventually calling ttm_bo_global_ref_init() and

ttm_bo_global_ref_release(), respectively. Also, like the previous

object, ttm_global_item_ref() is used to create an initial reference

count for the TTM, which will call your initialization function.

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \

		drm_info.o drm_encoder_slave.o \

		drm_trace_points.o drm_global.o drm_prime.o \

		drm_trace_points.o drm_prime.o \

		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_modeset_lock.o drm_atomic.o drm_bridge.o \

		drm_framebuffer.o drm_connector.o drm_blend.o \

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \

	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \

	amdgpu_gmc.o amdgpu_xgmi.o

	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \
@@ -105,6 +105,7 @@ amdgpu-y += \ 
# add GFX block

amdgpu-y += \

	amdgpu_gfx.o \

	amdgpu_rlc.o \

	gfx_v8_0.o \

	gfx_v9_0.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE