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

Commit 963976cf authored by Dave Airlie's avatar Dave Airlie
Browse files

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

UAPI Changes:

- Query uAPI interface (used for GPU topology information currently)
	* Mesa: https://patchwork.freedesktop.org/series/38795/

Driver Changes:

- Increase PSR2 size for CNL (DK)
- Avoid retraining LSPCON link unnecessarily (Ville)
- Decrease request signaling latency (Chris)
- GuC error capture fix (Daniele)

* tag 'drm-intel-next-2018-03-08' of git://anongit.freedesktop.org/drm/drm-intel: (127 commits)
  drm/i915: Update DRIVER_DATE to 20180308
  drm/i915: add schedule out notification of preempted but completed request
  drm/i915: expose rcs topology through query uAPI
  drm/i915: add query uAPI
  drm/i915: add rcs topology to error state
  drm/i915/debugfs: add rcs topology entry
  drm/i915/debugfs: reuse max slice/subslices already stored in sseu
  drm/i915: store all subslice masks
  drm/i915/guc: work around gcc-4.4.4 union initializer issue
  drm/i915/cnl: Add Wa_2201832410
  drm/i915/icl: Gen11 forcewake support
  drm/i915/icl: Add Indirect Context Offset for Gen11
  drm/i915/icl: Enhanced execution list support
  drm/i915/icl: new context descriptor support
  drm/i915/icl: Correctly initialize the Gen11 engines
  drm/i915: Assert that the request is indeed complete when signaled from irq
  drm/i915: Handle changing enable_fbc parameter at runtime better.
  drm/i915: Track whether the DP link is trained or not
  drm/i915: Nuke intel_dp->channel_eq_status
  drm/i915: Move SST DP link retraining into the ->post_hotplug() hook
  ...
parents 6fa7324a cf07a60f

Documentation/gpu/todo.rst

+7 −0
Original line number Diff line number Diff line
@@ -450,5 +450,12 @@ See drivers/gpu/drm/amd/display/TODO for tasks. 


Contact: Harry Wentland, Alex Deucher



i915

----



- Our early/late pm callbacks could be removed in favour of using

  device_link_add to model the dependency between i915 and snd_had. See

  https://dri.freedesktop.org/docs/drm/driver-api/device_link.html



Outside DRM

===========

drivers/gpu/drm/drm_vblank.c

+14 −8
Original line number Diff line number Diff line
@@ -1247,12 +1247,15 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc) 
EXPORT_SYMBOL(drm_crtc_vblank_on);



/**

 * drm_vblank_restore - estimated vblanks using timestamps and update it.

 * drm_vblank_restore - estimate missed vblanks and update vblank count.

 * @dev: DRM device

 * @pipe: CRTC index

 *

 * Power manamement features can cause frame counter resets between vblank

 * disable and enable. Drivers can then use this function in their

 * &drm_crtc_funcs.enable_vblank implementation to estimate the vblanks since

 * the last &drm_crtc_funcs.disable_vblank.

 * disable and enable. Drivers can use this function in their

 * &drm_crtc_funcs.enable_vblank implementation to estimate missed vblanks since

 * the last &drm_crtc_funcs.disable_vblank using timestamps and update the

 * vblank counter.

 *

 * This function is the legacy version of drm_crtc_vblank_restore().

 */
@@ -1293,11 +1296,14 @@ void drm_vblank_restore(struct drm_device *dev, unsigned int pipe) 
EXPORT_SYMBOL(drm_vblank_restore);



/**

 * drm_crtc_vblank_restore - estimate vblanks using timestamps and update it.

 * drm_crtc_vblank_restore - estimate missed vblanks and update vblank count.

 * @crtc: CRTC in question

 *

 * Power manamement features can cause frame counter resets between vblank

 * disable and enable. Drivers can then use this function in their

 * &drm_crtc_funcs.enable_vblank implementation to estimate the vblanks since

 * the last &drm_crtc_funcs.disable_vblank.

 * disable and enable. Drivers can use this function in their

 * &drm_crtc_funcs.enable_vblank implementation to estimate missed vblanks since

 * the last &drm_crtc_funcs.disable_vblank using timestamps and update the

 * vblank counter.

 */

void drm_crtc_vblank_restore(struct drm_crtc *crtc)

{

drivers/gpu/drm/i915/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -63,13 +63,14 @@ i915-y += i915_cmd_parser.o \ 
	  i915_gem.o \

	  i915_gem_object.o \

	  i915_gem_render_state.o \

	  i915_gem_request.o \

	  i915_gem_shrinker.o \

	  i915_gem_stolen.o \

	  i915_gem_tiling.o \

	  i915_gem_timeline.o \

	  i915_gem_userptr.o \

	  i915_gemfs.o \

	  i915_query.o \

	  i915_request.o \

	  i915_trace_points.o \

	  i915_vma.o \

	  intel_breadcrumbs.o \
@@ -89,7 +90,8 @@ i915-y += intel_uc.o \ 
	  intel_guc_fw.o \

	  intel_guc_log.o \

	  intel_guc_submission.o \

	  intel_huc.o

	  intel_huc.o \

	  intel_huc_fw.o



# autogenerated null render state

i915-y += intel_renderstate_gen6.o \

drivers/gpu/drm/i915/gvt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ GVT_DIR := gvt 
GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \

	interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \

	execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \

	fb_decoder.o dmabuf.o

	fb_decoder.o dmabuf.o page_track.o



ccflags-y				+= -I$(src) -I$(src)/$(GVT_DIR)

i915-y					+= $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))

drivers/gpu/drm/i915/gvt/dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) 


	obj = vgpu_create_gem(dev, dmabuf_obj->info);

	if (obj == NULL) {

		gvt_vgpu_err("create gvt gem obj failed:%d\n", vgpu->id);

		gvt_vgpu_err("create gvt gem obj failed\n");

		ret = -ENOMEM;

		goto out;

	}