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

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

Merge remote-tracking branch 'airlied/drm-next' into HEAD 



Backmerge drm-next so that I can keep merging patches. Specifically I
want:
- atomic stuff, yay!
- eld parsing patch from Jani.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 69f627f5 cc7096fb

Documentation/DocBook/drm.tmpl

+35 −2
Original line number Diff line number Diff line
@@ -994,6 +994,10 @@ int max_width, max_height;</synopsis> 
      <title>Display Modes Function Reference</title>

!Iinclude/drm/drm_modes.h

!Edrivers/gpu/drm/drm_modes.c

    </sect2>

    <sect2>

      <title>Atomic Mode Setting Function Reference</title>

!Edrivers/gpu/drm/drm_atomic.c

    </sect2>

    <sect2>

      <title>Frame Buffer Creation</title>
@@ -1825,6 +1829,10 @@ void intel_crt_init(struct drm_device *dev) 
    <sect2>

      <title>KMS API Functions</title>

!Edrivers/gpu/drm/drm_crtc.c

    </sect2>

    <sect2>

      <title>KMS Data Structures</title>

!Iinclude/drm/drm_crtc.h

    </sect2>

    <sect2>

      <title>KMS Locking</title>
@@ -2315,9 +2323,26 @@ void intel_crt_init(struct drm_device *dev) 
        </listitem>

      </itemizedlist>

    </sect2>

    <sect2>

      <title>Atomic Modeset Helper Functions Reference</title>

      <sect3>

	<title>Overview</title>

!Pdrivers/gpu/drm/drm_atomic_helper.c overview

      </sect3>

      <sect3>

	<title>Implementing Asynchronous Atomic Commit</title>

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

      </sect3>

      <sect3>

	<title>Atomic State Reset and Initialization</title>

!Pdrivers/gpu/drm/drm_atomic_helper.c atomic state reset and initialization

      </sect3>

!Edrivers/gpu/drm/drm_atomic_helper.c

    </sect2>

    <sect2>

      <title>Modeset Helper Functions Reference</title>

!Edrivers/gpu/drm/drm_crtc_helper.c

!Pdrivers/gpu/drm/drm_crtc_helper.c overview

    </sect2>

    <sect2>

      <title>Output Probing Helper Functions Reference</title>
@@ -2371,7 +2396,8 @@ void intel_crt_init(struct drm_device *dev) 
    </sect2>

    <sect2>

      <title id="drm-kms-planehelpers">Plane Helper Reference</title>

!Edrivers/gpu/drm/drm_plane_helper.c Plane Helpers

!Edrivers/gpu/drm/drm_plane_helper.c

!Pdrivers/gpu/drm/drm_plane_helper.c overview

    </sect2>

  </sect1>
@@ -2508,7 +2534,7 @@ void intel_crt_init(struct drm_device *dev) 
	</tr>

	<tr>

	<td rowspan="21" valign="top" >DRM</td>

	<td rowspan="2" valign="top" >Generic</td>

	<td rowspan="3" valign="top" >Generic</td>

	<td valign="top" >“EDID”</td>

	<td valign="top" >BLOB | IMMUTABLE</td>

	<td valign="top" >0</td>
@@ -2523,6 +2549,13 @@ void intel_crt_init(struct drm_device *dev) 
	<td valign="top" >Contains DPMS operation mode value.</td>

	</tr>

	<tr>

	<td valign="top" >“PATH”</td>

	<td valign="top" >BLOB | IMMUTABLE</td>

	<td valign="top" >0</td>

	<td valign="top" >Connector</td>

	<td valign="top" >Contains topology path to a connector.</td>

	</tr>

	<tr>

	<td rowspan="1" valign="top" >Plane</td>

	<td valign="top" >“type”</td>

	<td valign="top" >ENUM | IMMUTABLE</td>

drivers/gpu/drm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_info.o drm_debugfs.o drm_encoder_slave.o \

		drm_trace_points.o drm_global.o drm_prime.o \

		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_modeset_lock.o

		drm_modeset_lock.o drm_atomic.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
@@ -23,7 +23,7 @@ drm-$(CONFIG_DRM_PANEL) += drm_panel.o 
drm-$(CONFIG_OF) += drm_of.o



drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \

		drm_plane_helper.o drm_dp_mst_topology.o

		drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_KMS_FB_HELPER) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o

drivers/gpu/drm/README.drm

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
************************************************************

* For the very latest on DRI development, please see:      *

*     http://dri.freedesktop.org/                          *

************************************************************



The Direct Rendering Manager (drm) is a device-independent kernel-level

device driver that provides support for the XFree86 Direct Rendering

Infrastructure (DRI).



The DRM supports the Direct Rendering Infrastructure (DRI) in four major

ways:



    1. The DRM provides synchronized access to the graphics hardware via

       the use of an optimized two-tiered lock.



    2. The DRM enforces the DRI security policy for access to the graphics

       hardware by only allowing authenticated X11 clients access to

       restricted regions of memory.



    3. The DRM provides a generic DMA engine, complete with multiple

       queues and the ability to detect the need for an OpenGL context

       switch.



    4. The DRM is extensible via the use of small device-specific modules

       that rely extensively on the API exported by the DRM module.





Documentation on the DRI is available from:

    http://dri.freedesktop.org/wiki/Documentation

    http://sourceforge.net/project/showfiles.php?group_id=387

    http://dri.sourceforge.net/doc/



For specific information about kernel-level support, see:



    The Direct Rendering Manager, Kernel Support for the Direct Rendering

    Infrastructure

    http://dri.sourceforge.net/doc/drm_low_level.html



    Hardware Locking for the Direct Rendering Infrastructure

    http://dri.sourceforge.net/doc/hardware_locking_low_level.html



    A Security Analysis of the Direct Rendering Infrastructure

    http://dri.sourceforge.net/doc/security_low_level.html

drivers/gpu/drm/armada/armada_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/platform_device.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_plane_helper.h>

#include "armada_crtc.h"

#include "armada_drm.h"

#include "armada_fb.h"

drivers/gpu/drm/ast/ast_mode.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_plane_helper.h>

#include "ast_drv.h"



#include "ast_tables.h"