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

Commit 80d69009 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-11-20-merged' of... 

Merge tag 'drm-intel-next-2015-11-20-merged' of git://anongit.freedesktop.org/drm-intel into drm-next

drm-intel-next-2015-11-20-rebased:
4 weeks because of my vacation, so a bit more:
- final bits of the typesafe register mmio functions (Ville)
- power domain fix for hdmi detection (Imre)
- tons of fixes and improvements to the psr code (Rodrigo)
- refactoring of the dp detection code (Ander)
- complete rework of the dmc loader and dc5/dc6 handling (Imre, Patrik and
  others)
- dp compliance improvements from Shubhangi Shrivastava
- stop_machine hack from Chris to fix corruptions when updating GTT ptes on bsw
- lots of fifo underrun fixes from Ville
- big pile of fbc fixes and improvements from Paulo
- fix fbdev failures paths (Tvrtko and Lukas Wunner)
- dp link training refactoring (Ander)
- interruptible prepare_plane for atomic (Maarten)
- basic kabylake support (Deepak&Rodrigo)
- don't leak ringspace on resets (Chris)
drm-intel-next-2015-10-23:
- 2nd attempt at atomic watermarks from Matt, but just prep for now
- fixes all over

* tag 'drm-intel-next-2015-11-20-merged' of git://anongit.freedesktop.org/drm-intel: (209 commits)
  drm/i915: Update DRIVER_DATE to 20151120
  drm/i915: take a power domain reference while checking the HDMI live status
  drm/i915: take a power domain ref only when needed during HDMI detect
  drm/i915: Tear down fbdev if initialization fails
  async: export current_is_async()
  Revert "drm/i915: Initialize HWS page address after GPU reset"
  drm/i915: Fix oops caused by fbdev initialization failure
  drm/i915: Fix i915_ggtt_view_equal to handle rotation correctly
  drm/i915: Stuff rotation params into view union
  drm/i915: Drop return value from intel_fill_fb_ggtt_view
  drm/i915 : Fix to remove unnecsessary checks in postclose function.
  drm/i915: add MISSING_CASE to a few port/aux power domain helpers
  drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect
  drm/i915: Remove platform specific *_dp_detect() functions
  drm/i915: Don't do edp panel detection in g4x_dp_detect()
  drm/i915: Send TP1 TP2/3 even when panel claims no NO_TRAIN_ON_EXIT.
  drm/i915: PSR: Don't Skip aux handshake on DP_PSR_NO_TRAIN_ON_EXIT.
  drm/i915: Reduce PSR re-activation time for VLV/CHV.
  drm/i915: Delay first PSR activation.
  drm/i915: Type safe register read/write
  ...
parents aeb745e9 92907cbb

Documentation/DocBook/gpu.tmpl

+8 −4
Original line number Diff line number Diff line
@@ -4177,17 +4177,21 @@ int num_ioctls;</synopsis> 
      </sect2>

    </sect1>

    <sect1>

      <title>GuC-based Command Submission</title>

      <sect2>

      <title>GuC</title>

      <sect2>

        <title>GuC-specific firmware loader</title>

!Pdrivers/gpu/drm/i915/intel_guc_loader.c GuC-specific firmware loader

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

      </sect2>

      <sect2>

        <title>GuC Client</title>

!Pdrivers/gpu/drm/i915/i915_guc_submission.c GuC-based command submissison

        <title>GuC-based command submission</title>

!Pdrivers/gpu/drm/i915/i915_guc_submission.c GuC-based command submission

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

      </sect2>

      <sect2>

        <title>GuC Firmware Layout</title>

!Pdrivers/gpu/drm/i915/intel_guc_fwif.h GuC Firmware Layout

      </sect2>

    </sect1>



    <sect1>

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ static const struct pci_device_id intel_stolen_ids[] __initconst = { 
	INTEL_CHV_IDS(&chv_stolen_funcs),

	INTEL_SKL_IDS(&gen9_stolen_funcs),

	INTEL_BXT_IDS(&gen9_stolen_funcs),

	INTEL_KBL_IDS(&gen9_stolen_funcs),

};



static void __init intel_graphics_stolen(int num, int slot, int func)

drivers/gpu/drm/i915/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config DRM_I915 
	# the shmem_readpage() which depends upon tmpfs

	select SHMEM

	select TMPFS

	select STOP_MACHINE

	select DRM_KMS_HELPER

	select DRM_PANEL

	select DRM_MIPI_DSI

drivers/gpu/drm/i915/Makefile

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

	  intel_crt.o \

	  intel_ddi.o \

	  intel_dp_link_training.o \

	  intel_dp_mst.o \

	  intel_dp.o \

	  intel_dsi.o \

drivers/gpu/drm/i915/dvo.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ struct intel_dvo_device { 
	const char *name;

	int type;

	/* DVOA/B/C output register */

	u32 dvo_reg;

	i915_reg_t dvo_reg;

	i915_reg_t dvo_srcdim_reg;

	/* GPIO register used for i2c bus to control this device */

	u32 gpio;

	int slave_addr;