Commit 9aa0d2dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.14-rc5' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Couple of the arm people seem to wake up so this has imx and msm
  fixes, along with a bunch of i915 stable bounds fixes and an amdgpu
  regression fix.

  All seems pretty okay for now"

* tag 'drm-fixes-for-v4.14-rc5' of git://people.freedesktop.org/~airlied/linux:
  drm/msm: fix _NO_IMPLICIT fencing case
  drm/msm: fix error path cleanup
  drm/msm/mdp5: Remove extra pm_runtime_put call in mdp5_crtc_cursor_set()
  drm/msm/dsi: Use correct pm_runtime_put variant during host_init
  drm/msm: fix return value check in _msm_gem_kernel_new()
  drm/msm: use proper memory barriers for updating tail/head
  drm/msm/mdp5: add missing max size for 8x74 v1
  drm/amdgpu: fix placement flags in amdgpu_ttm_bind
  drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel
  gpu: ipu-v3: pre: implement workaround for ERR009624
  gpu: ipu-v3: prg: wait for double buffers to be filled on channel startup
  gpu: ipu-v3: Allow channel burst locking on i.MX6 only
  drm/i915: Read timings from the correct transcoder in intel_crtc_mode_get()
  drm/i915: Order two completing nop_submit_request
  drm/i915: Silence compiler warning for hsw_power_well_enable()
  drm/i915: Use crtc_state_is_legacy_gamma in intel_color_check
  drm/i915/edp: Increase the T12 delay quirk to 1300ms
  drm/i915/edp: Get the Panel Power Off timestamp after panel is off
  sync_file: Return consistent status in SYNC_IOC_FILE_INFO
  drm/atomic: Unref duplicated drm_atomic_state in drm_atomic_helper_resume()
parents 06d97c58 a480f308

drivers/dma-buf/sync_file.c

+12 −5
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ err_put_fd: 
	return err;

}



static void sync_fill_fence_info(struct dma_fence *fence,

static int sync_fill_fence_info(struct dma_fence *fence,

				 struct sync_fence_info *info)

{

	strlcpy(info->obj_name, fence->ops->get_timeline_name(fence),
@@ -399,6 +399,8 @@ static void sync_fill_fence_info(struct dma_fence *fence, 
		test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT, &fence->flags) ?

		ktime_to_ns(fence->timestamp) :

		ktime_set(0, 0);



	return info->status;

}



static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
@@ -424,8 +426,12 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, 
	 * sync_fence_info and return the actual number of fences on

	 * info->num_fences.

	 */

	if (!info.num_fences)

	if (!info.num_fences) {

		info.status = dma_fence_is_signaled(sync_file->fence);

		goto no_fences;

	} else {

		info.status = 1;

	}



	if (info.num_fences < num_fences)

		return -EINVAL;
@@ -435,8 +441,10 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, 
	if (!fence_info)

		return -ENOMEM;



	for (i = 0; i < num_fences; i++)

		sync_fill_fence_info(fences[i], &fence_info[i]);

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

		int status = sync_fill_fence_info(fences[i], &fence_info[i]);

		info.status = info.status <= 0 ? info.status : status;

	}



	if (copy_to_user(u64_to_user_ptr(info.sync_fence_info), fence_info,

			 size)) {
@@ -446,7 +454,6 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, 


no_fences:

	sync_file_get_name(sync_file, info.name, sizeof(info.name));

	info.status = dma_fence_is_signaled(sync_file->fence);

	info.num_fences = num_fences;



	if (copy_to_user((void __user *)arg, &info, sizeof(info)))

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) 
	placement.busy_placement = &placements;

	placements.fpfn = 0;

	placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT;

	placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;

	placements.flags = bo->mem.placement | TTM_PL_FLAG_TT;



	r = ttm_bo_mem_space(bo, &placement, &tmp, true, false);

	if (unlikely(r))

drivers/gpu/drm/drm_atomic_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -2960,6 +2960,7 @@ out: 
		drm_modeset_backoff(&ctx);

	}



	drm_atomic_state_put(state);

	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);

drivers/gpu/drm/i915/i915_gem.c

+6 −1
Original line number Diff line number Diff line
@@ -3013,10 +3013,15 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv) 


static void nop_submit_request(struct drm_i915_gem_request *request)

{

	unsigned long flags;



	GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error));

	dma_fence_set_error(&request->fence, -EIO);

	i915_gem_request_submit(request);



	spin_lock_irqsave(&request->engine->timeline->lock, flags);

	__i915_gem_request_submit(request);

	intel_engine_init_global_seqno(request->engine, request->global_seqno);

	spin_unlock_irqrestore(&request->engine->timeline->lock, flags);

}



static void engine_set_wedged(struct intel_engine_cs *engine)

drivers/gpu/drm/i915/intel_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ static void parse_ddi_ports(struct drm_i915_private *dev_priv, 
{

	enum port port;



	if (!HAS_DDI(dev_priv))

	if (!HAS_DDI(dev_priv) && !IS_CHERRYVIEW(dev_priv))

		return;



	if (!dev_priv->vbt.child_dev_num)

CRA Git | Maintained and supported by SUSTech CRA and CCSE