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

Commit d3e7a0da authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next 

- refactor i915/snd-hda interaction to use the component framework (Imre)
- psr cleanups and small fixes (Rodrigo)
- a few perf w/a from Ken Graunke
- switch to atomic plane helpers (Matt Roper)
- wc mmap support (Chris Wilson & Akash Goel)
- smaller things all over

* tag 'drm-intel-next-2015-01-17' of git://anongit.freedesktop.org/drm-intel: (40 commits)
  drm/i915: Update DRIVER_DATE to 20150117
  i915: reuse %ph to dump small buffers
  drm/i915: Ensure the HiZ RAW Stall Optimization is on for Cherryview.
  drm/i915: Enable the HiZ RAW Stall Optimization on Broadwell.
  drm/i915: PSR link standby at debugfs
  drm/i915: group link_standby setup and let this info visible everywhere.
  drm/i915: Add missing vbt check.
  drm/i915: PSR HSW/BDW: Fix inverted logic at sink main_link_active bit.
  drm/i915: PSR VLV/CHV: Remove condition checks that only applies to Haswell.
  drm/i915: VLV/CHV PSR needs to exit PSR on every flush.
  drm/i915: Fix kerneldoc for i915 atomic plane code
  drm/i915: Don't pretend SDVO hotplug works on 915
  drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV
  drm/i915: Remove I915_HAS_HOTPLUG() check from i915_hpd_irq_setup()
  drm/i915: Make hpd arrays big enough to avoid out of bounds access
  Revert "drm/i915/chv: Use timeout mode for RC6 on chv"
  drm/i915: Improve HiZ throughput on Cherryview.
  drm/i915: Reset CSB read pointer in ring init
  drm/i915: Drop unused position fields (v2)
  drm/i915: Move to atomic plane helpers (v9)
  ...
parents e4514003 0a0c0018

Documentation/DocBook/drm.tmpl

+16 −0
Original line number Diff line number Diff line
@@ -4017,6 +4017,11 @@ int num_ioctls;</synopsis> 
	  framebuffer compression and panel self refresh.

        </para>

      </sect2>

      <sect2>

        <title>Atomic Plane Helpers</title>

!Pdrivers/gpu/drm/i915/intel_atomic_plane.c atomic plane helpers

!Idrivers/gpu/drm/i915/intel_atomic_plane.c

      </sect2>

      <sect2>

        <title>Output Probing</title>

        <para>
@@ -4159,6 +4164,17 @@ int num_ioctls;</synopsis> 
!Pdrivers/gpu/drm/i915/i915_gem_gtt.c Global GTT views

!Idrivers/gpu/drm/i915/i915_gem_gtt.c

      </sect2>

      <sect2>

        <title>Buffer Object Eviction</title>

	<para>

	  This section documents the interface function for evicting buffer

	  objects to make space available in the virtual gpu address spaces.

	  Note that this is mostly orthogonal to shrinking buffer objects

	  caches, which has the goal to make main memory (shared with the gpu

	  through the unified memory architecture) available.

	</para>

!Idrivers/gpu/drm/i915/i915_gem_evict.c

      </sect2>

    </sect1>



    <sect1>

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ i915-y += dvo_ch7017.o \ 
	  dvo_ns2501.o \

	  dvo_sil164.o \

	  dvo_tfp410.o \

	  intel_atomic_plane.o \

	  intel_crt.o \

	  intel_ddi.o \

	  intel_dp.o \

drivers/gpu/drm/i915/i915_debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -2248,6 +2248,9 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) 
		}

	seq_puts(m, "\n");



	seq_printf(m, "Link standby: %s\n",

		   yesno((bool)dev_priv->psr.link_standby));



	/* CHV PSR has no kind of performance counter */

	if (HAS_PSR(dev) && HAS_DDI(dev)) {

		psrperf = I915_READ(EDP_PSR_PERF_CNT(dev)) &

drivers/gpu/drm/i915/i915_dma.c

+9 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ static int i915_getparam(struct drm_device *dev, void *data, 
	case I915_PARAM_HAS_COHERENT_PHYS_GTT:

		value = 1;

		break;

	case I915_PARAM_MMAP_VERSION:

		value = 1;

		break;

	default:

		DRM_DEBUG("Unknown parameter %d\n", param->param);

		return -EINVAL;
@@ -830,6 +833,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	intel_runtime_pm_enable(dev_priv);



	i915_audio_component_init(dev_priv);



	return 0;



out_power_well:
@@ -870,6 +875,8 @@ int i915_driver_unload(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;



	i915_audio_component_cleanup(dev_priv);



	ret = i915_gem_suspend(dev);

	if (ret) {

		DRM_ERROR("failed to idle hardware: %d\n", ret);
@@ -1063,6 +1070,8 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_get_reset_stats_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_SETPARAM, i915_gem_context_setparam_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

};



int i915_max_ioctl = ARRAY_SIZE(i915_ioctls);

drivers/gpu/drm/i915/i915_drv.c

+3 −6
Original line number Diff line number Diff line
@@ -942,8 +942,7 @@ static int i915_pm_suspend(struct device *dev) 


static int i915_pm_suspend_late(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct drm_device *drm_dev = dev_to_i915(dev)->dev;



	/*

	 * We have a suspedn ordering issue with the snd-hda driver also
@@ -962,8 +961,7 @@ static int i915_pm_suspend_late(struct device *dev) 


static int i915_pm_resume_early(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct drm_device *drm_dev = dev_to_i915(dev)->dev;



	if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;
@@ -973,8 +971,7 @@ static int i915_pm_resume_early(struct device *dev) 


static int i915_pm_resume(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct drm_device *drm_dev = dev_to_i915(dev)->dev;



	if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;