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

Commit 65439b68 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-06-01' of git://anongit.freedesktop.org/drm-intel into drm-next 

Frist -misc pull for 4.8, with pretty much just random all over plus a few
more lockless gem BO patches acked/reviewed by driver maintainers.

I'm starting a bit earlier this time around because there's a few invasive
patch series to land (nonblocking atomic prep work, fence prep work,
rst/sphinx kerneldoc finally happening) and I need a baseline with all the
branches merged.

* tag 'topic/drm-misc-2016-06-01' of git://anongit.freedesktop.org/drm-intel: (21 commits)
  drm/vc4: Use lockless gem BO free callback
  drm/vc4: Use drm_gem_object_unreference_unlocked
  drm: Initialize a linear gamma table by default
  drm/vgem: Use lockless gem BO free callback
  drm/qxl: Don't set a gamma table size
  drm/msm: Nuke dummy gamma_set/get functions
  drm/cirrus: Drop redundnant gamma size check
  drm/fb-helper: Remove dead code in setcolreg
  drm/mediatek: Use lockless gem BO free callback
  drm/hisilicon: Use lockless gem BO free callback
  drm/hlcd: Use lockless gem BO free callback
  vga_switcheroo: Support deferred probing of audio clients
  vga_switcheroo: Add helper for deferred probing
  virtio-gpu: fix output lookup
  drm/doc: Unify KMS Locking docs
  drm/atomic-helper: Do not call ->mode_fixup for CRTC which will be disabled
  Fix annoyingly awkward typo in drm_edid_load.c
  drm/doc: Drop vblank_disable_allow wording
  drm: use seqlock for vblank time/count
  drm/mm: avoid possible null pointer dereference
  ...
parents 1a695a90 b82caafc

Documentation/DocBook/gpu.tmpl

+1 −24
Original line number Diff line number Diff line
@@ -1092,22 +1092,6 @@ int max_width, max_height;</synopsis> 
        operation.

      </para>

    </sect2>

    <sect2>

      <title>Locking</title>

      <para>

        Beside some lookup structures with their own locking (which is hidden

	behind the interface functions) most of the modeset state is protected

	by the <code>dev-&lt;mode_config.lock</code> mutex and additionally

	per-crtc locks to allow cursor updates, pageflips and similar operations

	to occur concurrently with background tasks like output detection.

	Operations which cross domains like a full modeset always grab all

	locks. Drivers there need to protect resources shared between crtcs with

	additional locking. They also need to be careful to always grab the

	relevant crtc locks if a modset functions touches crtc state, e.g. for

	load detection (which does only grab the <code>mode_config.lock</code>

	to allow concurrent screen updates on live crtcs).

      </para>

    </sect2>

  </sect1>



  <!-- Internals: kms initialization and cleanup -->
@@ -2845,14 +2829,7 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
    <para>

      Drivers must initialize the vertical blanking handling core with a call to

      <function>drm_vblank_init</function> in their

      <methodname>load</methodname> operation. The function will set the struct

      <structname>drm_device</structname>

      <structfield>vblank_disable_allowed</structfield> field to 0. This will

      keep vertical blanking interrupts enabled permanently until the first mode

      set operation, where <structfield>vblank_disable_allowed</structfield> is

      set to 1. The reason behind this is not clear. Drivers can set the field

      to 1 after <function>calling drm_vblank_init</function> to make vertical

      blanking interrupts dynamically managed from the beginning.

      <methodname>load</methodname> operation.

    </para>

    <para>

      Vertical blanking interrupts can be enabled by the DRM core or by drivers

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -3854,6 +3854,9 @@ T: git git://people.freedesktop.org/~airlied/linux 
S:	Maintained

F:	drivers/gpu/drm/

F:	drivers/gpu/vga/

F:	Documentation/devicetree/bindings/display/

F:	Documentation/devicetree/bindings/gpu/

F:	Documentation/devicetree/bindings/video/

F:	Documentation/DocBook/gpu.*

F:	include/drm/

F:	include/uapi/drm/

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static struct drm_driver hdlcd_driver = { 
	.get_vblank_counter = drm_vblank_no_hw_counter,

	.enable_vblank = hdlcd_enable_vblank,

	.disable_vblank = hdlcd_disable_vblank,

	.gem_free_object = drm_gem_cma_free_object,

	.gem_free_object_unlocked = drm_gem_cma_free_object,

	.gem_vm_ops = &drm_gem_cma_vm_ops,

	.dumb_create = drm_gem_cma_dumb_create,

	.dumb_map_offset = drm_gem_cma_dumb_map_offset,

drivers/gpu/drm/cirrus/cirrus_mode.c

+0 −3
Original line number Diff line number Diff line
@@ -331,9 +331,6 @@ static void cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, 
	struct cirrus_crtc *cirrus_crtc = to_cirrus_crtc(crtc);

	int i;



	if (size != CIRRUS_LUT_SIZE)

		return;



	for (i = 0; i < CIRRUS_LUT_SIZE; i++) {

		cirrus_crtc->lut_r[i] = red[i];

		cirrus_crtc->lut_g[i] = green[i];

drivers/gpu/drm/drm_atomic_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -414,6 +414,9 @@ mode_fixup(struct drm_atomic_state *state) 
	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		const struct drm_crtc_helper_funcs *funcs;



		if (!crtc_state->enable)

			continue;



		if (!crtc_state->mode_changed &&

		    !crtc_state->connectors_changed)

			continue;