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

Commit 952b159f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-4.8-rc3-2' of git://people.freedesktop.org/~airlied/linux 

Pull more drm fixes from Dave Airlie:
 "Daniel pointed out I'd missed some i915 fixes, and I also found a
  single etnaviv fix I missed.

  So here they are"

* tag 'drm-fixes-for-4.8-rc3-2' of git://people.freedesktop.org/~airlied/linux:
  drm/etnaviv: take GPU lock later in the submit process
  drm/i915: Fix modeset handling during gpu reset, v5.
  drm/i915: fix aliasing_ppgtt leak
  drm/i915: fix WaInsertDummyPushConstPs
  drm/i915: Fix iboost setting for SKL Y/U DP DDI buffer translation entry 2
  drm/i915/gen9: Give one extra block per line for SKL plane WM calculations
  drm/i915: Acquire audio powerwell for HD-Audio registers
  drm/i915: Add missing rpm wakelock to GGTT pread
  drm/i915/fbc: FBC causes display flicker when VT-d is enabled on Skylake
  drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
  drm/i915: Program iboost settings for HDMI/DVI on SKL
  drm/i915: Fix iboost setting for DDI with 4 lanes on SKL
  drm/i915: Handle ENOSPC after failing to insert a mappable node
  drm/i915: Flush GT idle status upon reset
parents d8298d26 2c24ba21

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+5 −5
Original line number Diff line number Diff line
@@ -1333,8 +1333,6 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
	if (ret < 0)

		return ret;



	mutex_lock(&gpu->lock);



	/*

	 * TODO

	 *
@@ -1348,16 +1346,18 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
	if (unlikely(event == ~0U)) {

		DRM_ERROR("no free event\n");

		ret = -EBUSY;

		goto out_unlock;

		goto out_pm_put;

	}



	fence = etnaviv_gpu_fence_alloc(gpu);

	if (!fence) {

		event_free(gpu, event);

		ret = -ENOMEM;

		goto out_unlock;

		goto out_pm_put;

	}



	mutex_lock(&gpu->lock);



	gpu->event[event].fence = fence;

	submit->fence = fence->seqno;

	gpu->active_fence = submit->fence;
@@ -1395,9 +1395,9 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
	hangcheck_timer_reset(gpu);

	ret = 0;



out_unlock:

	mutex_unlock(&gpu->lock);



out_pm_put:

	etnaviv_gpu_pm_put(gpu);



	return ret;

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1854,6 +1854,7 @@ struct drm_i915_private { 
	enum modeset_restore modeset_restore;

	struct mutex modeset_restore_lock;

	struct drm_atomic_state *modeset_restore_state;

	struct drm_modeset_acquire_ctx reset_ctx;



	struct list_head vm_list; /* Global list of all address spaces */

	struct i915_ggtt ggtt; /* VM representing the global address space */

drivers/gpu/drm/i915/i915_gem.c

+8 −2
Original line number Diff line number Diff line
@@ -879,9 +879,12 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
	ret = i915_gem_shmem_pread(dev, obj, args, file);



	/* pread for non shmem backed objects */

	if (ret == -EFAULT || ret == -ENODEV)

	if (ret == -EFAULT || ret == -ENODEV) {

		intel_runtime_pm_get(to_i915(dev));

		ret = i915_gem_gtt_pread(dev, obj, args->size,

					args->offset, args->data_ptr);

		intel_runtime_pm_put(to_i915(dev));

	}



out:

	drm_gem_object_unreference(&obj->base);
@@ -1306,7 +1309,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
		 * textures). Fallback to the shmem path in that case. */

	}



	if (ret == -EFAULT) {

	if (ret == -EFAULT || ret == -ENOSPC) {

		if (obj->phys_handle)

			ret = i915_gem_phys_pwrite(obj, args, file);

		else if (i915_gem_object_has_struct_page(obj))
@@ -3169,6 +3172,8 @@ static void i915_gem_reset_engine_cleanup(struct intel_engine_cs *engine) 
	}



	intel_ring_init_seqno(engine, engine->last_submitted_seqno);



	engine->i915->gt.active_engines &= ~intel_engine_flag(engine);

}



void i915_gem_reset(struct drm_device *dev)
@@ -3186,6 +3191,7 @@ void i915_gem_reset(struct drm_device *dev) 


	for_each_engine(engine, dev_priv)

		i915_gem_reset_engine_cleanup(engine);

	mod_delayed_work(dev_priv->wq, &dev_priv->gt.idle_work, 0);



	i915_gem_context_reset(dev);

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −0
Original line number Diff line number Diff line
@@ -2873,6 +2873,7 @@ void i915_ggtt_cleanup_hw(struct drm_device *dev) 
		struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;



		ppgtt->base.cleanup(&ppgtt->base);

		kfree(ppgtt);

	}



	i915_gem_cleanup_stolen(dev);

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,7 @@ enum skl_disp_power_wells { 
#define BALANCE_LEG_MASK(port)		(7<<(8+3*(port)))

/* Balance leg disable bits */

#define BALANCE_LEG_DISABLE_SHIFT	23

#define BALANCE_LEG_DISABLE(port)	(1 << (23 + (port)))



/*

 * Fence registers