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

Commit 565c17b5 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



First feature request for 4.19.  Highlights:
- Add initial amdgpu documentation
- Add initial GPU scheduler documention
- GPU scheduler fixes for dying processes
- Add support for the JPEG engine on VCN
- Switch CI to use powerplay by default
- EDC support for CZ
- More powerplay cleanups
- Misc DC fixes

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

Link: https://patchwork.freedesktop.org/patch/msgid/20180621161138.3008-1-alexander.deucher@amd.com
parents f4366e44 a21daa88

Documentation/gpu/amdgpu.rst

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

 drm/amdgpu AMDgpu driver

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



The drm/amdgpu driver supports all AMD Radeon GPUs based on the Graphics Core

Next (GCN) architecture.



Core Driver Infrastructure

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



This section covers core driver infrastructure.



.. _amdgpu_memory_domains:



Memory Domains

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



.. kernel-doc:: include/uapi/drm/amdgpu_drm.h

   :doc: memory domains



Buffer Objects

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



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

   :doc: amdgpu_object



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

   :internal:



PRIME Buffer Sharing

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



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c

   :doc: PRIME Buffer Sharing



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c

   :internal:



MMU Notifier

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



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

   :doc: MMU Notifier



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

   :internal:



AMDGPU Virtual Memory

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



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

   :doc: GPUVM



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

   :internal:



Interrupt Handling

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



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

   :doc: Interrupt Handling



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

   :internal:



GPU Power/Thermal Controls and Monitoring

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



This section covers hwmon and power/thermal controls.



HWMON Interfaces

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



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: hwmon



GPU sysfs Power State Interfaces

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



GPU power controls are exposed via sysfs files.



power_dpm_state

~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: power_dpm_state



power_dpm_force_performance_level

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: power_dpm_force_performance_level



pp_table

~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: pp_table



pp_od_clk_voltage

~~~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: pp_od_clk_voltage



pp_dpm_sclk pp_dpm_mclk pp_dpm_pcie

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: pp_dpm_sclk pp_dpm_mclk pp_dpm_pcie



pp_power_profile_mode

~~~~~~~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

   :doc: pp_power_profile_mode

Documentation/gpu/drivers.rst

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ GPU Driver Documentation 


.. toctree::



   amdgpu

   i915

   meson

   pl111

Documentation/gpu/drm-mm.rst

+20 −0
Original line number Diff line number Diff line
@@ -395,6 +395,8 @@ VMA Offset Manager 
.. kernel-doc:: drivers/gpu/drm/drm_vma_manager.c

   :export:



.. _prime_buffer_sharing:



PRIME Buffer Sharing

====================
@@ -496,3 +498,21 @@ DRM Sync Objects 


.. kernel-doc:: drivers/gpu/drm/drm_syncobj.c

   :export:



GPU Scheduler

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



Overview

--------



.. kernel-doc:: drivers/gpu/drm/scheduler/gpu_scheduler.c

   :doc: Overview



Scheduler Function References

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



.. kernel-doc:: include/drm/gpu_scheduler.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/scheduler/gpu_scheduler.c

   :export:

drivers/gpu/drm/amd/amdgpu/ObjectID.h

+8 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define GENERIC_OBJECT_ID_PX2_NON_DRIVABLE        0x02

#define GENERIC_OBJECT_ID_MXM_OPM                 0x03

#define GENERIC_OBJECT_ID_STEREO_PIN              0x04        //This object could show up from Misc Object table, it follows ATOM_OBJECT format, and contains one ATOM_OBJECT_GPIO_CNTL_RECORD for the stereo pin

#define GENERIC_OBJECT_ID_BRACKET_LAYOUT          0x05



/****************************************************/

/* Graphics Object ENUM ID Definition               */
@@ -714,6 +715,13 @@ 
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 GENERIC_OBJECT_ID_STEREO_PIN << OBJECT_ID_SHIFT)



#define GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID1    (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                 GENERIC_OBJECT_ID_BRACKET_LAYOUT << OBJECT_ID_SHIFT)



#define GENERICOBJECT_BRACKET_LAYOUT_ENUM_ID2    (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\

                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\

                                                 GENERIC_OBJECT_ID_BRACKET_LAYOUT << OBJECT_ID_SHIFT)

/****************************************************/

/* Object Cap definition - Shared with BIOS         */

/****************************************************/

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0
Original line number Diff line number Diff line
@@ -968,6 +968,8 @@ struct amdgpu_gfx { 
	struct amdgpu_irq_src		eop_irq;

	struct amdgpu_irq_src		priv_reg_irq;

	struct amdgpu_irq_src		priv_inst_irq;

	struct amdgpu_irq_src		cp_ecc_error_irq;

	struct amdgpu_irq_src		sq_irq;

	/* gfx status */

	uint32_t			gfx_current_status;

	/* ce ram size*/