Commit c1b164a5 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next 



Requested for getting some i915 fixes back into drm-misc-next by danvet.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parents 873863b6 c2556238

Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ output bus. 


Required properties:

- compatible: "mediatek,<chip>-dpi"

  the supported chips are mt2701 , mt8173 and mt8183.

- reg: Physical base address and length of the controller's registers

- interrupts: The interrupt signal from the function block.

- clocks: device clocks

Documentation/gpu/i915.rst

+4 −4
Original line number Diff line number Diff line
@@ -207,10 +207,10 @@ DPIO 
CSR firmware support for DMC

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



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

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_csr.c

   :doc: csr support for dmc



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

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_csr.c

   :internal:



Video BIOS Table (VBT)
@@ -332,7 +332,7 @@ This process is dubbed relocation. 
GEM BO Management Implementation Details

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



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

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

   :doc: Virtual Memory Address



Buffer Object Eviction
@@ -382,7 +382,7 @@ Logical Rings, Logical Ring Contexts and Execlists 
Global GTT views

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



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

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

   :doc: Global GTT views



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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5629,7 +5629,7 @@ F: include/uapi/drm/lima_drm.h 
T:	git git://anongit.freedesktop.org/drm/drm-misc









DRM DRIVERS FOR MEDIATEK









M:	CK Hu <ck.hu@mediatek.com>









M:	Chun-Kuang Hu <chunkuang.hu@kernel.org>









M:	Philipp Zabel <p.zabel@pengutronix.de>









L:	dri-devel@lists.freedesktop.org









S:	Supported
































drivers/gpu/drm/amd/acp/Kconfig



+1
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: MIT









menu "ACP (Audio CoProcessor) Configuration"









	depends on DRM_AMDGPU



















config DRM_AMD_ACP









	bool "Enable AMD Audio CoProcessor IP support"
































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



+2
−0






























Original line number
Diff line number
Diff line







@@ -994,6 +994,8 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg,







			uint32_t acc_flags);









void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v,









		    uint32_t acc_flags);









void amdgpu_mm_wreg_mmio_rlc(struct amdgpu_device *adev, uint32_t reg, uint32_t v,









		    uint32_t acc_flags);









void amdgpu_mm_wreg8(struct amdgpu_device *adev, uint32_t offset, uint8_t value);









uint8_t amdgpu_mm_rreg8(struct amdgpu_device *adev, uint32_t offset);