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

Commit 2e161017 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-intel into drm-next 

4 weeks worth of stuff since I was traveling&lazy:

- lspcon improvements (Imre)
- proper atomic state for cdclk handling (Ville)
- gpu reset improvements (Chris)
- lots and lots of polish around fences, requests, waiting and
  everything related all over (both gem and modeset code), from Chris
- atomic by default on gen5+ minus byt/bsw (Maarten did the patch to
  flip the default, really this is a massive joint team effort)
- moar power domains, now 64bit (Ander)
- big pile of in-kernel unit tests for various gem subsystems (Chris),
  including simple mock objects for i915 device and and the ggtt
  manager.
- i915_gpu_info in debugfs, for taking a snapshot of the current gpu
  state. Same thing as i915_error_state, but useful if the kernel didn't
  notice something is stick. From Chris.
- bxt dsi fixes (Umar Shankar)
- bxt w/a updates (Jani)
- no more struct_mutex for gem object unreference (Chris)
- some execlist refactoring (Tvrtko)
- color manager support for glk (Ander)
- improve the power-well sync code to better take over from the
  firmware (Imre)
- gem tracepoint polish (Tvrtko)
- lots of glk fixes all around (Ander)
- ctx switch improvements (Chris)
- glk dsi support&fixes (Deepak M)
- dsi fixes for vlv and clanups, lots of them (Hans de Goede)
- switch to i915.ko types in lots of our internal modeset code (Ander)
- byt/bsw atomic wm update code, yay (Ville)

* tag 'drm-intel-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-intel: (432 commits)
  drm/i915: Update DRIVER_DATE to 20170306
  drm/i915: Don't use enums for hardware engine id
  drm/i915: Split breadcrumbs spinlock into two
  drm/i915: Refactor wakeup of the next breadcrumb waiter
  drm/i915: Take reference for signaling the request from hardirq
  drm/i915: Add FIFO underrun tracepoints
  drm/i915: Add cxsr toggle tracepoint
  drm/i915: Add VLV/CHV watermark/FIFO programming tracepoints
  drm/i915: Add plane update/disable tracepoints
  drm/i915: Kill level 0 wm hack for VLV/CHV
  drm/i915: Workaround VLV/CHV sprite1->sprite0 enable underrun
  drm/i915: Sanitize VLV/CHV watermarks properly
  drm/i915: Only use update_wm_{pre,post} for pre-ilk platforms
  drm/i915: Nuke crtc->wm.cxsr_allowed
  drm/i915: Compute proper intermediate wms for vlv/cvh
  drm/i915: Skip useless watermark/FIFO related work on VLV/CHV when not needed
  drm/i915: Compute vlv/chv wms the atomic way
  drm/i915: Compute VLV/CHV FIFO sizes based on the PM2 watermarks
  drm/i915: Plop vlv/chv fifo sizes into crtc state
  drm/i915: Plop vlv wm state into crtc_state
  ...
parents b558dfd5 505b6815

Documentation/gpu/i915.rst

+9 −0
Original line number Original line Diff line number Diff line
@@ -222,6 +222,15 @@ Video BIOS Table (VBT) 
.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h

.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h

   :internal:

   :internal:





Display clocks

--------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c

   :doc: CDCLK / RAWCLK



.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c

   :internal:



Display PLLs

Display PLLs

------------

------------

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -526,6 +526,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { 
	INTEL_SKL_IDS(&gen9_early_ops),

	INTEL_SKL_IDS(&gen9_early_ops),

	INTEL_BXT_IDS(&gen9_early_ops),

	INTEL_BXT_IDS(&gen9_early_ops),

	INTEL_KBL_IDS(&gen9_early_ops),

	INTEL_KBL_IDS(&gen9_early_ops),

	INTEL_GLK_IDS(&gen9_early_ops),

};

};





static void __init

static void __init

drivers/char/agp/intel-gtt.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -332,14 +332,6 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry, 
	writel_relaxed(addr | pte_flags, intel_private.gtt + entry);

	writel_relaxed(addr | pte_flags, intel_private.gtt + entry);

}

}





static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {

	{32, 8192, 3},

	{64, 16384, 4},

	{128, 32768, 5},

	{256, 65536, 6},

	{512, 131072, 7},

};



static unsigned int intel_gtt_stolen_size(void)

static unsigned int intel_gtt_stolen_size(void)

{

{

	u16 gmch_ctrl;

	u16 gmch_ctrl;
@@ -670,6 +662,14 @@ static int intel_gtt_init(void) 
}

}





#if IS_ENABLED(CONFIG_AGP_INTEL)

#if IS_ENABLED(CONFIG_AGP_INTEL)

static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {

	{32, 8192, 3},

	{64, 16384, 4},

	{128, 32768, 5},

	{256, 65536, 6},

	{512, 131072, 7},

};



static int intel_fake_agp_fetch_size(void)

static int intel_fake_agp_fetch_size(void)

{

{

	int num_sizes = ARRAY_SIZE(intel_fake_agp_sizes);

	int num_sizes = ARRAY_SIZE(intel_fake_agp_sizes);

drivers/gpu/drm/i915/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ config DRM_I915 
	select INPUT if ACPI

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

	select ACPI_BUTTON if ACPI

	select SYNC_FILE

	help

	help

	  Choose this option if you have a system that has "Intel Graphics

	  Choose this option if you have a system that has "Intel Graphics

	  Media Accelerator" or "HD Graphics" integrated graphics,

	  Media Accelerator" or "HD Graphics" integrated graphics,

drivers/gpu/drm/i915/Kconfig.debug

+29 −0
Original line number Original line Diff line number Diff line
@@ -24,7 +24,9 @@ config DRM_I915_DEBUG 
        select X86_MSR # used by igt/pm_rpm

        select X86_MSR # used by igt/pm_rpm

        select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)

        select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)

        select DRM_DEBUG_MM if DRM=y

        select DRM_DEBUG_MM if DRM=y

	select DRM_DEBUG_MM_SELFTEST

	select DRM_I915_SW_FENCE_DEBUG_OBJECTS

	select DRM_I915_SW_FENCE_DEBUG_OBJECTS

	select DRM_I915_SELFTEST

        default n

        default n

        help

        help

          Choose this option to turn on extra driver debugging that may affect

          Choose this option to turn on extra driver debugging that may affect
@@ -58,3 +60,30 @@ config DRM_I915_SW_FENCE_DEBUG_OBJECTS 
          Recommended for driver developers only.

          Recommended for driver developers only.





          If in doubt, say "N".

          If in doubt, say "N".



config DRM_I915_SELFTEST

	bool "Enable selftests upon driver load"

	depends on DRM_I915

	default n

	select FAULT_INJECTION

	select PRIME_NUMBERS

	help

	  Choose this option to allow the driver to perform selftests upon

	  loading; also requires the i915.selftest=1 module parameter. To

	  exit the module after running the selftests (i.e. to prevent normal

	  module initialisation afterwards) use i915.selftest=-1.



	  Recommended for driver developers only.



	  If in doubt, say "N".



config DRM_I915_LOW_LEVEL_TRACEPOINTS

        bool "Enable low level request tracing events"

        depends on DRM_I915

        default n

        help

          Choose this option to turn on low level request tracing events.

          This provides the ability to precisely monitor engine utilisation

          and also analyze the request dependency resolving timeline.



          If in doubt, say "N".