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

Commit c1994121 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued 



Backmerge drm-next to get at the nonblocking atomic helpers, needed to
merge the i915 conversion.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 1c1a24d2 a0877f52

Documentation/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
output

Documentation/DocBook/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ PDF_METHOD = $(prefer-db2x) 
PS_METHOD	= $(prefer-db2x)





###

# The targets that may be used.

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs



targets += $(DOCBOOKS)

BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

xmldocs: $(BOOKS)
@@ -63,6 +59,9 @@ installmandocs: mandocs 
		sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \

		xargs install -m 644 -t /usr/local/man/man9/



# no-op for the DocBook toolchain

epubdocs:



###

#External programs used

KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref

Documentation/DocBook/device-drivers.tmpl

+34 −2
Original line number Diff line number Diff line
@@ -128,16 +128,48 @@ X!Edrivers/base/interface.c 
!Edrivers/base/platform.c

!Edrivers/base/bus.c

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

     <sect1>

       <title>Buffer Sharing and Synchronization</title>

       <para>

         The dma-buf subsystem provides the framework for sharing buffers

         for hardware (DMA) access across multiple device drivers and

         subsystems, and for synchronizing asynchronous hardware access.

       </para>

       <para>

         This is used, for example, by drm "prime" multi-GPU support, but

         is of course not limited to GPU use cases.

       </para>

       <para>

         The three main components of this are: (1) dma-buf, representing

         a sg_table and exposed to userspace as a file descriptor to allow

         passing between devices, (2) fence, which provides a mechanism

         to signal when one device as finished access, and (3) reservation,

         which manages the shared or exclusive fence(s) associated with

         the buffer.

       </para>

       <sect2><title>dma-buf</title>

!Edrivers/dma-buf/dma-buf.c

!Iinclude/linux/dma-buf.h

       </sect2>

       <sect2><title>reservation</title>

!Pdrivers/dma-buf/reservation.c Reservation Object Overview

!Edrivers/dma-buf/reservation.c

!Iinclude/linux/reservation.h

       </sect2>

       <sect2><title>fence</title>

!Edrivers/dma-buf/fence.c

!Edrivers/dma-buf/seqno-fence.c

!Iinclude/linux/fence.h

!Edrivers/dma-buf/seqno-fence.c

!Iinclude/linux/seqno-fence.h

!Edrivers/dma-buf/fence-array.c

!Iinclude/linux/fence-array.h

!Edrivers/dma-buf/reservation.c

!Iinclude/linux/reservation.h

!Edrivers/dma-buf/sync_file.c

!Iinclude/linux/sync_file.h

       </sect2>

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

     </sect1>

Documentation/DocBook/gpu.tmpl

+12 −1
Original line number Diff line number Diff line
@@ -1017,6 +1017,11 @@ int max_width, max_height;</synopsis> 
	<function>drm_framebuffer_unregister_private</function>.

      </para>

    </sect2>

    <sect2>

      <title>DRM Format Handling</title>

!Iinclude/drm/drm_fourcc.h

!Edrivers/gpu/drm/drm_fourcc.c

    </sect2>

    <sect2>

      <title>Dumb Buffer Objects</title>

      <para>
@@ -1570,7 +1575,7 @@ void intel_crt_init(struct drm_device *dev) 
      </sect3>

      <sect3>

	<title>Implementing Asynchronous Atomic Commit</title>

!Pdrivers/gpu/drm/drm_atomic_helper.c implementing async commit

!Pdrivers/gpu/drm/drm_atomic_helper.c implementing nonblocking commit

      </sect3>

      <sect3>

	<title>Atomic State Reset and Initialization</title>
@@ -1683,6 +1688,12 @@ void intel_crt_init(struct drm_device *dev) 
!Edrivers/gpu/drm/drm_panel.c

!Pdrivers/gpu/drm/drm_panel.c drm panel

    </sect2>

    <sect2>

      <title>Simple KMS Helper Reference</title>

!Iinclude/drm/drm_simple_kms_helper.h

!Edrivers/gpu/drm/drm_simple_kms_helper.c

!Pdrivers/gpu/drm/drm_simple_kms_helper.c overview

    </sect2>

  </sect1>



  <!-- Internals: kms properties -->

Documentation/Makefile.sphinx

0 → 100644
+63 −0
Original line number Diff line number Diff line 
# -*- makefile -*-

# Makefile for Sphinx documentation

#



# You can set these variables from the command line.

SPHINXBUILD   = sphinx-build

SPHINXOPTS    =

PAPER         =

BUILDDIR      = $(obj)/output



# User-friendly check for sphinx-build

HAVE_SPHINX := $(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi)



ifeq ($(HAVE_SPHINX),0)



.DEFAULT:

	$(warning The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed and in PATH, or set the SPHINXBUILD make variable to point to the full path of the '$(SPHINXBUILD)' executable.)

	@echo "  SKIP    Sphinx $@ target."



else # HAVE_SPHINX



# User-friendly check for rst2pdf

HAVE_RST2PDF := $(shell if python -c "import rst2pdf" >/dev/null 2>&1; then echo 1; else echo 0; fi)



# Internal variables.

PAPEROPT_a4     = -D latex_paper_size=a4

PAPEROPT_letter = -D latex_paper_size=letter

KERNELDOC       = $(srctree)/scripts/kernel-doc

KERNELDOC_CONF  = -D kerneldoc_srctree=$(srctree) -D kerneldoc_bin=$(KERNELDOC)

ALLSPHINXOPTS   = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(BUILDDIR)/.doctrees $(KERNELDOC_CONF) $(PAPEROPT_$(PAPER)) -c $(srctree)/$(src) $(SPHINXOPTS) $(srctree)/$(src)

# the i18n builder cannot share the environment and doctrees with the others

I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .



quiet_cmd_sphinx = SPHINX  $@

      cmd_sphinx = $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2



htmldocs:

	$(call cmd,sphinx,html)



pdfdocs:

ifeq ($(HAVE_RST2PDF),0)

	$(warning The Python 'rst2pdf' module was not found. Make sure you have the module installed to produce PDF output.)

	@echo "  SKIP    Sphinx $@ target."

else # HAVE_RST2PDF

	$(call cmd,sphinx,pdf)

endif # HAVE_RST2PDF



epubdocs:

	$(call cmd,sphinx,epub)



xmldocs:

	$(call cmd,sphinx,xml)



# no-ops for the Sphinx toolchain

sgmldocs:

psdocs:

mandocs:

installmandocs:



cleandocs:

	$(Q)rm -rf $(BUILDDIR)



endif # HAVE_SPHINX