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

Commit b2dbdf2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Nothing too earth shattering here, it just seems like lots of little
  things all over the place.

  msm has probably the larger amount of changes, but they all seem fine,
  otherwise, some rockchip, i915, etnaviv and exynos fixes, along with
  one nouveau regression fix for some older GPUs"

* tag 'drm-fixes-for-v4.13-rc5' of git://people.freedesktop.org/~airlied/linux: (35 commits)
  drm/nouveau/disp/nv04: avoid creation of output paths
  drm: make DRM_STM default n
  drm/exynos: forbid creating framebuffers from too small GEM buffers
  drm/etnaviv: Fix off-by-one error in reloc checking
  drm/i915: fix backlight invert for non-zero minimum brightness
  drm/i915/shrinker: Wrap need_resched() inside preempt-disable
  drm/i915/perf: fix flex eu registers programming
  drm/i915: Fix out-of-bounds array access in bdw_load_gamma_lut
  drm/i915/gvt: Change the max length of mmio_reg_rw from 4 to 8
  drm/i915/gvt: Initialize MMIO Block with HW state
  drm/rockchip: vop: report error when check resource error
  drm/rockchip: vop: round_up pitches to word align
  drm/rockchip: vop: fix NV12 video display error
  drm/rockchip: vop: fix iommu page fault when resume
  drm/i915/gvt: clean workload queue if error happened
  drm/i915/gvt: change resetting to resetting_eng
  drm/msm: gpu: don't abuse dma_alloc for non-DMA allocations
  drm/msm: gpu: call qcom_mdt interfaces only for ARCH_QCOM
  drm/msm/adreno: Prevent unclocked access when retrieving timestamps
  drm/msm: Remove __user from __u64 data types
  ...
parents 27df704d 46828dc7

drivers/dma-buf/sync_file.c

+3 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int sync_file_release(struct inode *inode, struct file *file) 
{

	struct sync_file *sync_file = file->private_data;



	if (test_bit(POLL_ENABLED, &sync_file->fence->flags))

	if (test_bit(POLL_ENABLED, &sync_file->flags))

		dma_fence_remove_callback(sync_file->fence, &sync_file->cb);

	dma_fence_put(sync_file->fence);

	kfree(sync_file);
@@ -318,7 +318,8 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait) 


	poll_wait(file, &sync_file->wq, wait);



	if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {

	if (list_empty(&sync_file->cb.node) &&

	    !test_and_set_bit(POLL_ENABLED, &sync_file->flags)) {

		if (dma_fence_add_callback(sync_file->fence, &sync_file->cb,

					   fence_check_cb_func) < 0)

			wake_up_all(&sync_file->wq);

drivers/gpu/drm/bridge/tc358767.c

+1 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) 


	/* port@2 is the output port */

	ret = drm_of_find_panel_or_bridge(dev->of_node, 2, 0, &tc->panel, NULL);

	if (ret)

	if (ret && ret != -ENODEV)

		return ret;



	/* Shut down GPIO is optional */

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+2 −2
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ static int submit_reloc(struct etnaviv_gem_submit *submit, void *stream, 
		if (ret)

			return ret;



		if (r->reloc_offset >= bo->obj->base.size - sizeof(*ptr)) {

			DRM_ERROR("relocation %u outside object", i);

		if (r->reloc_offset > bo->obj->base.size - sizeof(*ptr)) {

			DRM_ERROR("relocation %u outside object\n", i);

			return -EINVAL;

		}

drivers/gpu/drm/exynos/exynos_drm_fb.c

+13 −1
Original line number Diff line number Diff line
@@ -145,13 +145,19 @@ static struct drm_framebuffer * 
exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,

		      const struct drm_mode_fb_cmd2 *mode_cmd)

{

	const struct drm_format_info *info = drm_get_format_info(dev, mode_cmd);

	struct exynos_drm_gem *exynos_gem[MAX_FB_BUFFER];

	struct drm_gem_object *obj;

	struct drm_framebuffer *fb;

	int i;

	int ret;



	for (i = 0; i < drm_format_num_planes(mode_cmd->pixel_format); i++) {

	for (i = 0; i < info->num_planes; i++) {

		unsigned int height = (i == 0) ? mode_cmd->height :

				     DIV_ROUND_UP(mode_cmd->height, info->vsub);

		unsigned long size = height * mode_cmd->pitches[i] +

				     mode_cmd->offsets[i];



		obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]);

		if (!obj) {

			DRM_ERROR("failed to lookup gem object\n");
@@ -160,6 +166,12 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
		}



		exynos_gem[i] = to_exynos_gem(obj);



		if (size > exynos_gem[i]->size) {

			i++;

			ret = -EINVAL;

			goto err;

		}

	}



	fb = exynos_drm_framebuffer_init(dev, mode_cmd, exynos_gem, i);

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

+22 −5
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define same_context(a, b) (((a)->context_id == (b)->context_id) && \

		((a)->lrca == (b)->lrca))



static void clean_workloads(struct intel_vgpu *vgpu, unsigned long engine_mask);



static int context_switch_events[] = {

	[RCS] = RCS_AS_CONTEXT_SWITCH,

	[BCS] = BCS_AS_CONTEXT_SWITCH,
@@ -499,10 +501,10 @@ static void release_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) 
static int complete_execlist_workload(struct intel_vgpu_workload *workload)

{

	struct intel_vgpu *vgpu = workload->vgpu;

	struct intel_vgpu_execlist *execlist =

		&vgpu->execlist[workload->ring_id];

	int ring_id = workload->ring_id;

	struct intel_vgpu_execlist *execlist = &vgpu->execlist[ring_id];

	struct intel_vgpu_workload *next_workload;

	struct list_head *next = workload_q_head(vgpu, workload->ring_id)->next;

	struct list_head *next = workload_q_head(vgpu, ring_id)->next;

	bool lite_restore = false;

	int ret;
@@ -512,10 +514,25 @@ static int complete_execlist_workload(struct intel_vgpu_workload *workload) 
	release_shadow_batch_buffer(workload);

	release_shadow_wa_ctx(&workload->wa_ctx);



	if (workload->status || vgpu->resetting)

	if (workload->status || (vgpu->resetting_eng & ENGINE_MASK(ring_id))) {

		/* if workload->status is not successful means HW GPU

		 * has occurred GPU hang or something wrong with i915/GVT,

		 * and GVT won't inject context switch interrupt to guest.

		 * So this error is a vGPU hang actually to the guest.

		 * According to this we should emunlate a vGPU hang. If

		 * there are pending workloads which are already submitted

		 * from guest, we should clean them up like HW GPU does.

		 *

		 * if it is in middle of engine resetting, the pending

		 * workloads won't be submitted to HW GPU and will be

		 * cleaned up during the resetting process later, so doing

		 * the workload clean up here doesn't have any impact.

		 **/

		clean_workloads(vgpu, ENGINE_MASK(ring_id));

		goto out;

	}



	if (!list_empty(workload_q_head(vgpu, workload->ring_id))) {

	if (!list_empty(workload_q_head(vgpu, ring_id))) {

		struct execlist_ctx_descriptor_format *this_desc, *next_desc;



		next_workload = container_of(next,