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

Commit 7ec30fca authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2016-11-01' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

batch of scattered i915 fixes.

* tag 'drm-intel-fixes-2016-11-01' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Fix SKL+ 90/270 degree rotated plane coordinate computation
  drm/i915: Remove two invalid warns
  drm/i915: Rotated view does not need a fence
  drm/i915/fbc: fix CFB size calculation for gen8+
  drm: i915: Wait for fences on new fb, not old
  drm/i915: Clean up DDI DDC/AUX CH sanitation
  drm/i915: Respect alternate_aux_channel for all DDI ports
  drm/i915/gen9: fix watermarks when using the pipe scaler
  drm/i915: Fix mismatched INIT power domain disabling during suspend
  drm/i915: fix a read size argument
  drm/i915: Use fence_write() from rpm resume
  drm/i915/gen9: fix DDB partitioning for multi-screen cases
  drm/i915: workaround sparse warning on variable length arrays
  drm/i915: keep declarations in i915_drv.h
parents e676717a c89d5454

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1447,8 +1447,6 @@ static int i915_drm_suspend(struct drm_device *dev) 


	dev_priv->suspend_count++;



	intel_display_set_init_power(dev_priv, false);



	intel_csr_ucode_suspend(dev_priv);



out:
@@ -1466,6 +1464,8 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) 


	disable_rpm_wakeref_asserts(dev_priv);



	intel_display_set_init_power(dev_priv, false);



	fw_csr = !IS_BROXTON(dev_priv) &&

		suspend_to_idle(dev_priv) && dev_priv->csr.dmc_payload;

	/*

drivers/gpu/drm/i915/i915_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -2883,6 +2883,11 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, 
extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

			      unsigned long arg);

#endif

extern const struct dev_pm_ops i915_pm_ops;



extern int i915_driver_load(struct pci_dev *pdev,

			    const struct pci_device_id *ent);

extern void i915_driver_unload(struct drm_device *dev);

extern int intel_gpu_reset(struct drm_i915_private *dev_priv, u32 engine_mask);

extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);

extern void i915_reset(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_gem.c

+6 −4
Original line number Diff line number Diff line
@@ -3550,8 +3550,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, 


	vma->display_alignment = max_t(u64, vma->display_alignment, alignment);



	WARN_ON(obj->pin_display > i915_vma_pin_count(vma));



	i915_gem_object_flush_cpu_write_domain(obj);



	old_write_domain = obj->base.write_domain;
@@ -3588,7 +3586,6 @@ i915_gem_object_unpin_from_display_plane(struct i915_vma *vma) 
		list_move_tail(&vma->vm_link, &vma->vm->inactive_list);



	i915_vma_unpin(vma);

	WARN_ON(vma->obj->pin_display > i915_vma_pin_count(vma));

}



/**
@@ -3745,7 +3742,12 @@ void __i915_vma_set_map_and_fenceable(struct i915_vma *vma) 
	mappable = (vma->node.start + fence_size <=

		    dev_priv->ggtt.mappable_end);



	if (mappable && fenceable)

	/*

	 * Explicitly disable for rotated VMA since the display does not

	 * need the fence and the VMA is not accessible to other users.

	 */

	if (mappable && fenceable &&

	    vma->ggtt_view.type != I915_GGTT_VIEW_ROTATED)

		vma->flags |= I915_VMA_CAN_FENCE;

	else

		vma->flags &= ~I915_VMA_CAN_FENCE;

drivers/gpu/drm/i915/i915_gem_fence.c

+19 −2
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ i915_vma_put_fence(struct i915_vma *vma) 
{

	struct drm_i915_fence_reg *fence = vma->fence;



	assert_rpm_wakelock_held(to_i915(vma->vm->dev));



	if (!fence)

		return 0;
@@ -341,6 +343,8 @@ i915_vma_get_fence(struct i915_vma *vma) 
	struct drm_i915_fence_reg *fence;

	struct i915_vma *set = i915_gem_object_is_tiled(vma->obj) ? vma : NULL;



	assert_rpm_wakelock_held(to_i915(vma->vm->dev));



	/* Just update our place in the LRU if our fence is getting reused. */

	if (vma->fence) {

		fence = vma->fence;
@@ -371,6 +375,12 @@ void i915_gem_restore_fences(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	int i;



	/* Note that this may be called outside of struct_mutex, by

	 * runtime suspend/resume. The barrier we require is enforced by

	 * rpm itself - all access to fences/GTT are only within an rpm

	 * wakeref, and to acquire that wakeref you must pass through here.

	 */



	for (i = 0; i < dev_priv->num_fence_regs; i++) {

		struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];

		struct i915_vma *vma = reg->vma;
@@ -379,10 +389,17 @@ void i915_gem_restore_fences(struct drm_device *dev) 
		 * Commit delayed tiling changes if we have an object still

		 * attached to the fence, otherwise just clear the fence.

		 */

		if (vma && !i915_gem_object_is_tiled(vma->obj))

		if (vma && !i915_gem_object_is_tiled(vma->obj)) {

			GEM_BUG_ON(!reg->dirty);

			GEM_BUG_ON(vma->obj->fault_mappable);



			list_move(&reg->link, &dev_priv->mm.fence_list);

			vma->fence = NULL;

			vma = NULL;

		}



		fence_update(reg, vma);

		fence_write(reg, vma);

		reg->vma = vma;

	}

}

drivers/gpu/drm/i915/i915_pci.c

+0 −7
Original line number Diff line number Diff line
@@ -431,9 +431,6 @@ static const struct pci_device_id pciidlist[] = { 
};

MODULE_DEVICE_TABLE(pci, pciidlist);



extern int i915_driver_load(struct pci_dev *pdev,

			    const struct pci_device_id *ent);



static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct intel_device_info *intel_info =
@@ -463,8 +460,6 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return i915_driver_load(pdev, ent);

}



extern void i915_driver_unload(struct drm_device *dev);



static void i915_pci_remove(struct pci_dev *pdev)

{

	struct drm_device *dev = pci_get_drvdata(pdev);
@@ -473,8 +468,6 @@ static void i915_pci_remove(struct pci_dev *pdev) 
	drm_dev_unref(dev);

}



extern const struct dev_pm_ops i915_pm_ops;



static struct pci_driver i915_pci_driver = {

	.name = DRIVER_NAME,

	.id_table = pciidlist,