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

Commit 294f96ae authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2018-07-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 4.19:

Core Changes:
- add support for DisplayPort CEC-Tunneling-over-AUX (Hans Verkuil)
- more doc updates (Daniel Vetter)
- fourcc: Add is_yuv field to drm_format_info (Ayan Kumar Halder)
- dma-buf: correctly place BUG_ON (Michel Dänzer)

Driver Changes:
- more vkms support(Rodrigo Siqueira)
- many fixes and small improments to all drivers

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180718200826.GA20165@juma
parents 090cbdd0 979c11ef

Documentation/gpu/drm-kms-helpers.rst

+22 −4
Original line number Diff line number Diff line
@@ -109,6 +109,15 @@ Framebuffer CMA Helper Functions Reference 


.. _drm_bridges:



Framebuffer GEM Helper Reference

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



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

   :doc: overview



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

   :export:



Bridges

=======
@@ -169,6 +178,15 @@ Display Port Helper Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_dp_helper.c

   :export:



Display Port CEC Helper Functions Reference

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



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

   :doc: dp cec helpers



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

   :export:



Display Port Dual Mode Adaptor Helper Functions Reference

=========================================================
@@ -282,13 +300,13 @@ Auxiliary Modeset Helpers 
.. kernel-doc:: drivers/gpu/drm/drm_modeset_helper.c

   :export:



Framebuffer GEM Helper Reference

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

OF/DT Helpers

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



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

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

   :doc: overview



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

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

   :export:



Legacy Plane Helper Reference

Documentation/gpu/drm-kms.rst

+7 −6
Original line number Diff line number Diff line
@@ -56,11 +56,12 @@ Overview 


The basic object structure KMS presents to userspace is fairly simple.

Framebuffers (represented by :c:type:`struct drm_framebuffer <drm_framebuffer>`,

see `Frame Buffer Abstraction`_) feed into planes. One or more (or even no)

planes feed their pixel data into a CRTC (represented by :c:type:`struct

drm_crtc <drm_crtc>`, see `CRTC Abstraction`_) for blending. The precise

blending step is explained in more detail in `Plane Composition Properties`_ and

related chapters.

see `Frame Buffer Abstraction`_) feed into planes. Planes are represented by

:c:type:`struct drm_plane <drm_plane>`, see `Plane Abstraction`_ for more

details. One or more (or even no) planes feed their pixel data into a CRTC

(represented by :c:type:`struct drm_crtc <drm_crtc>`, see `CRTC Abstraction`_)

for blending. The precise blending step is explained in more detail in `Plane

Composition Properties`_ and related chapters.



For the output routing the first step is encoders (represented by

:c:type:`struct drm_encoder <drm_encoder>`, see `Encoder Abstraction`_). Those
@@ -466,7 +467,7 @@ Output discovery and initialization example 
        drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,

                 DRM_MODE_ENCODER_DAC);



        drm_mode_connector_attach_encoder(&intel_output->base,

        drm_connector_attach_encoder(&intel_output->base,

                          &intel_output->enc);



        /* Set up the DDC bus. */

drivers/dma-buf/reservation.c

+3 −3
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ reservation_object_add_shared_inplace(struct reservation_object *obj, 
	if (signaled) {

		RCU_INIT_POINTER(fobj->shared[signaled_idx], fence);

	} else {

		BUG_ON(fobj->shared_count >= fobj->shared_max);

		RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);

		fobj->shared_count++;

	}
@@ -230,10 +231,9 @@ void reservation_object_add_shared_fence(struct reservation_object *obj, 
	old = reservation_object_get_list(obj);

	obj->staged = NULL;



	if (!fobj) {

		BUG_ON(old->shared_count >= old->shared_max);

	if (!fobj)

		reservation_object_add_shared_inplace(obj, old, fence);

	} else

	else

		reservation_object_add_shared_replace(obj, old, fobj, fence);

}

EXPORT_SYMBOL(reservation_object_add_shared_fence);

drivers/gpu/drm/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -122,6 +122,16 @@ config DRM_LOAD_EDID_FIRMWARE 
	  default case is N. Details and instructions how to build your own

	  EDID data are given in Documentation/EDID/HOWTO.txt.



config DRM_DP_CEC

	bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"

	select CEC_CORE

	help

	  Choose this option if you want to enable HDMI CEC support for

	  DisplayPort/USB-C to HDMI adapters.



	  Note: not all adapters support this feature, and even for those

	  that do support this they often do not hook up the CEC pin.



config DRM_TTM

	tristate

	depends on DRM && MMU

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o 
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o

drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o

drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o



obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o

obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/