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

Commit 735f463a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2017-08-18' of git://anongit.freedesktop.org/git/drm-intel into drm-next 

Final pile of features for 4.14

- New ioctl to change NOA configurations, plus prep (Lionel)
- CCS (color compression) scanout support, based on the fancy new
  modifier additions (Ville&Ben)
- Document i915 register macro style (Jani)
- Many more gen10/cnl patches (Rodrigo, Pualo, ...)
- More gpu reset vs. modeset duct-tape to restore the old way.
- prep work for cnl: hpd_pin reorg (Rodrigo), support for more power
  wells (Imre), i2c pin reorg (Anusha)
- drm_syncobj support (Jason Ekstrand)
- forcewake vs gpu reset fix (Chris)
- execbuf speedup for the no-relocs fastpath, anv/vk low-overhead ftw (Chris)
- switch to idr/radixtree instead of the resizing ht for execbuf id->vma
  lookups (Chris)

gvt:
- MMIO save/restore optimization (Changbin)
- Split workload scan vs. dispatch for more parallel exec (Ping)
- vGPU full 48bit ppgtt support (Joonas, Tina)
- vGPU hw id expose for perf (Zhenyu)

Bunch of work all over to make the igt CI runs more complete/stable.
Watch https://intel-gfx-ci.01.org/tree/drm-tip/shards-all.html for
progress in getting this ready. Next week we're going into production
mode (i.e. will send results to intel-gfx) on hsw, more platforms to
come.

Also, a new maintainer tram, I'm stepping out. Huge thanks to Jani for
being an awesome co-maintainer the past few years, and all the best
for Jani, Joonas&Rodrigo as the new maintainers!

* tag 'drm-intel-next-2017-08-18' of git://anongit.freedesktop.org/git/drm-intel: (179 commits)
  drm/i915: Update DRIVER_DATE to 20170818
  drm/i915/bxt: use NULL for GPIO connection ID
  drm/i915: Mark the GT as busy before idling the previous request
  drm/i915: Trivial grammar fix s/opt of/opt out of/ in comment
  drm/i915: Replace execbuf vma ht with an idr
  drm/i915: Simplify eb_lookup_vmas()
  drm/i915: Convert execbuf to use struct-of-array packing for critical fields
  drm/i915: Check context status before looking up our obj/vma
  drm/i915: Don't use MI_STORE_DWORD_IMM on Sandybridge/vcs
  drm/i915: Stop touching forcewake following a gen6+ engine reset
  MAINTAINERS: drm/i915 has a new maintainer team
  drm/i915: Split pin mapping into per platform functions
  drm/i915/opregion: let user specify override VBT via firmware load
  drm/i915/cnl: Reuse skl_wm_get_hw_state on Cannonlake.
  drm/i915/gen10: implement gen 10 watermarks calculations
  drm/i915/cnl: Fix LSPCON support.
  drm/i915/vbt: ignore extraneous child devices for a port
  drm/i915/cnl: Setup PAT Index.
  drm/i915/edp: Allow alternate fixed mode for eDP if available.
  drm/i915: Add support for drm syncobjs
  ...
parents 3aadb888 a42894eb

Documentation/gpu/i915.rst

+17 −1
Original line number Diff line number Diff line
@@ -417,6 +417,10 @@ integrate with drm/i915 and to handle the `DRM_I915_PERF_OPEN` ioctl. 
   :functions: i915_perf_open_ioctl

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

   :functions: i915_perf_release

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

   :functions: i915_perf_add_config_ioctl

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

   :functions: i915_perf_remove_config_ioctl



i915 Perf Stream

----------------
@@ -477,4 +481,16 @@ specific details than found in the more high-level sections. 
.. kernel-doc:: drivers/gpu/drm/i915/i915_perf.c

   :internal:



.. WARNING: DOCPROC directive not supported: !Cdrivers/gpu/drm/i915/i915_irq.c
 
Style

=====



The drm/i915 driver codebase has some style rules in addition to (and, in some

cases, deviating from) the kernel coding style.



Register macro definition style

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



The style guide for ``i915_reg.h``.



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

   :doc: The i915 register macro definition style guide

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -6764,8 +6764,9 @@ S: Supported 
F:	drivers/scsi/isci/



INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Daniel Vetter <daniel.vetter@intel.com>

M:	Jani Nikula <jani.nikula@linux.intel.com>

M:	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

M:	Rodrigo Vivi <rodrigo.vivi@intel.com>

L:	intel-gfx@lists.freedesktop.org

W:	https://01.org/linuxgraphics/

B:	https://01.org/linuxgraphics/documentation/how-report-bugs

drivers/gpu/drm/drm_atomic_helper.c

+16 −2
Original line number Diff line number Diff line
@@ -2716,6 +2716,7 @@ int drm_atomic_helper_disable_all(struct drm_device *dev, 
	struct drm_plane *plane;

	struct drm_crtc_state *crtc_state;

	struct drm_crtc *crtc;

	unsigned plane_mask = 0;

	int ret, i;



	state = drm_atomic_state_alloc(dev);
@@ -2758,10 +2759,14 @@ int drm_atomic_helper_disable_all(struct drm_device *dev, 
			goto free;



		drm_atomic_set_fb_for_plane(plane_state, NULL);

		plane_mask |= BIT(drm_plane_index(plane));

		plane->old_fb = plane->fb;

	}



	ret = drm_atomic_commit(state);

free:

	if (plane_mask)

		drm_atomic_clean_old_fb(dev, plane_mask, ret);

	drm_atomic_state_put(state);

	return ret;

}
@@ -2892,11 +2897,16 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, 
	struct drm_connector_state *new_conn_state;

	struct drm_crtc *crtc;

	struct drm_crtc_state *new_crtc_state;

	unsigned plane_mask = 0;

	struct drm_device *dev = state->dev;

	int ret;



	state->acquire_ctx = ctx;



	for_each_new_plane_in_state(state, plane, new_plane_state, i)

	for_each_new_plane_in_state(state, plane, new_plane_state, i) {

		plane_mask |= BIT(drm_plane_index(plane));

		state->planes[i].old_state = plane->state;

	}



	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)

		state->crtcs[i].old_state = crtc->state;
@@ -2904,7 +2914,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, 
	for_each_new_connector_in_state(state, connector, new_conn_state, i)

		state->connectors[i].old_state = connector->state;



	return drm_atomic_commit(state);

	ret = drm_atomic_commit(state);

	if (plane_mask)

		drm_atomic_clean_old_fb(dev, plane_mask, ret);



	return ret;

}

EXPORT_SYMBOL(drm_atomic_helper_commit_duplicated_state);

drivers/gpu/drm/i915/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config DRM_I915_DEBUG 
        select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)

        select DRM_DEBUG_MM if DRM=y

	select DRM_DEBUG_MM_SELFTEST

	select SW_SYNC # signaling validation framework (igt/syncobj*)

	select DRM_I915_SW_FENCE_DEBUG_OBJECTS

	select DRM_I915_SELFTEST

        default n

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ i915-y += i915_cmd_parser.o \ 
	  i915_gem_gtt.o \

	  i915_gem_internal.o \

	  i915_gem.o \

	  i915_gem_object.o \

	  i915_gem_render_state.o \

	  i915_gem_request.o \

	  i915_gem_shrinker.o \