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

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

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

- prelim hw support dropped for skl after Damien fixed an ABI issue around
  planes
- legacy modesetting is done using atomic infrastructure now (Maarten)!
- more gen9 workarounds (Arun&Nick)
- MOCS programming (cache control for better performance) for skl/bxt
- vlv/chv dpll improvements (Ville)
- PSR fixes from Rodrigo
- fbc improvements from Paulo
- plumb requests into execlist submit functions (Mika)
- opregion code cleanup from Jani
- resource streamer support from Abdiel for mesa
- final fixes for 12bpc hdmi + enabling support from Ville
drm-intel-next-2015-07-03:
- dsi improvements (Gaurav)
- bxt ddi dpll hw state readout (Imre)
- chv dvfs support and overall wm improvements for both vlv and chv (Ville)
- ppgtt polish from Mika and Michel
- cdclk support for bxt (Bob Pauwe)
- make frontbuffer tracking more precise
- OLR removal (John Harrison)
- per-ctx WA batch buffer support (Arun Siluvery)
- remvoe KMS Kconfig option (Chris)
- more hpd handling refactoring from Jani
- use atomic states throughout modeset code and integrate with atomic plane
  update (Maarten)
drm-intel-next-2015-06-19:
- refactoring hpd irq handlers (Jani)
- polish skl dpll code a bit (Damien)
- dynamic cdclk adjustement (Ville & Mika)
- fix up 12bpc hdmi and enable it for real again (Ville)
- extend hsw cmd parser to be useful for atomic configuration (Franscico Jerez)
- even more atomic conversion and rolling state handling out across modeset code
  from Maarten & Ander
- fix DRRS idleness detection (Ramalingam)
- clean up dsp address alignment handling (Ville)
- some fbc cleanup patches from Paulo
- prevent hard-hangs when trying to reset the gpu on skl (Mika)

* tag 'drm-intel-next-2015-07-17' of git://anongit.freedesktop.org/drm-intel: (386 commits)
  drm/i915: Update DRIVER_DATE to 20150717
  drm/i915/skl: Drop the preliminary_hw_support flag
  drm/i915/skl: Don't expose the top most plane on gen9 display
  drm/i915: Fix divide by zero on watermark update
  drm/i915: Invert fastboot check
  drm/i915: Clarify logic for initial modeset
  drm/i915: Unconditionally check gmch pfit state
  drm/i915: always disable irqs in intel_pipe_update_start
  drm/i915: Remove use of runtime pm in atomic commit functions
  drm/i915: Call plane update functions directly from intel_atomic_commit.
  drm/i915: Use full atomic modeset.
  drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
  drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
  drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
  drm/i915: Enable WA batch buffers for Gen9
  drm/i915/gen9: Implement WaDisableKillLogic for gen 9
  drm/i915: Use expcitly fixed type in compat32 structs
  drm/i915: Fix noatomic crtc disabling, v2.
  drm/i915: fill in more mode members
  drm/i915: Added BXT check in HAS_CORE_RING_FREQ macro
  ...
parents fa78ceab e0548f19

Documentation/DocBook/drm.tmpl

+5 −1
Original line number Original line Diff line number Diff line
@@ -4012,7 +4012,6 @@ int num_ioctls;</synopsis> 
        <title>Frontbuffer Tracking</title>

        <title>Frontbuffer Tracking</title>

!Pdrivers/gpu/drm/i915/intel_frontbuffer.c frontbuffer tracking

!Pdrivers/gpu/drm/i915/intel_frontbuffer.c frontbuffer tracking

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

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

!Fdrivers/gpu/drm/i915/intel_drv.h intel_frontbuffer_flip

!Fdrivers/gpu/drm/i915/i915_gem.c i915_gem_track_fb

!Fdrivers/gpu/drm/i915/i915_gem.c i915_gem_track_fb

      </sect2>

      </sect2>

      <sect2>

      <sect2>
@@ -4044,6 +4043,11 @@ int num_ioctls;</synopsis> 
	  probing, so those sections fully apply.

	  probing, so those sections fully apply.

        </para>

        </para>

      </sect2>

      </sect2>

      <sect2>

        <title>Hotplug</title>

!Pdrivers/gpu/drm/i915/intel_hotplug.c Hotplug

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

      </sect2>

      <sect2>

      <sect2>

	<title>High Definition Audio</title>

	<title>High Definition Audio</title>

!Pdrivers/gpu/drm/i915/intel_audio.c High Definition Audio over HDMI and Display Port

!Pdrivers/gpu/drm/i915/intel_audio.c High Definition Audio over HDMI and Display Port

arch/x86/configs/x86_64_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,6 @@ CONFIG_AGP_AMD64=y 
CONFIG_AGP_INTEL=y

CONFIG_AGP_INTEL=y

CONFIG_DRM=y

CONFIG_DRM=y

CONFIG_DRM_I915=y

CONFIG_DRM_I915=y

CONFIG_DRM_I915_KMS=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_EFI=y

CONFIG_FB_EFI=y

drivers/char/agp/intel-gtt.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1408,8 +1408,8 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, 
}

}

EXPORT_SYMBOL(intel_gmch_probe);

EXPORT_SYMBOL(intel_gmch_probe);





void intel_gtt_get(size_t *gtt_total, size_t *stolen_size,

void intel_gtt_get(u64 *gtt_total, size_t *stolen_size,

		   phys_addr_t *mappable_base, unsigned long *mappable_end)

		   phys_addr_t *mappable_base, u64 *mappable_end)

{

{

	*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;

	*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;

	*stolen_size = intel_private.stolen_size;

	*stolen_size = intel_private.stolen_size;

drivers/gpu/drm/drm_crtc.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -4471,9 +4471,7 @@ static int drm_property_replace_global_blob(struct drm_device *dev, 
			goto err_created;

			goto err_created;

	}

	}





	if (old_blob)

	drm_property_unreference_blob(old_blob);

	drm_property_unreference_blob(old_blob);



	*replace = new_blob;

	*replace = new_blob;





	return 0;

	return 0;

drivers/gpu/drm/i915/Kconfig

+0 −9
Original line number Original line Diff line number Diff line
@@ -36,15 +36,6 @@ config DRM_I915 
	  i810 driver instead, and the Atom z5xx series has an entirely

	  i810 driver instead, and the Atom z5xx series has an entirely

	  different implementation.

	  different implementation.





config DRM_I915_KMS

	bool "Enable modesetting on intel by default"

	depends on DRM_I915

	default y

	help

	  Choose this option if you want kernel modesetting enabled by default.



	  If in doubt, say "Y".



config DRM_I915_FBDEV

config DRM_I915_FBDEV

	bool "Enable legacy fbdev support for the modesetting intel driver"

	bool "Enable legacy fbdev support for the modesetting intel driver"

	depends on DRM_I915

	depends on DRM_I915