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

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

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

- dmc fixes from Animesh (not yet all) for deeper sleep states
- piles of prep patches from Ville to make mmio functions type-safe
- more fbc work from Paulo all over
- w/a shuffling from Arun Siluvery
- first part of atomic watermark updates from Matt and Ville (later parts had to
  be dropped again unfortunately)
- lots of patches to prepare bxt dsi support ( Shashank Sharma)
- userptr fixes from Chris
- audio rate interface between i915/snd_hda plus kerneldoc (Libin Yang)
- shrinker improvements and fixes (Chris Wilson)
- lots and lots of small patches all over

* tag 'drm-intel-next-2015-10-10' of git://anongit.freedesktop.org/drm-intel: (134 commits)
  drm/i915: Update DRIVER_DATE to 20151010
  drm/i915: Partial revert of atomic watermark series
  drm/i915: Early exit from semaphore_waits_for for execlist mode.
  drm/i915: Remove wrong warning from i915_gem_context_clean
  drm/i915: Determine the stolen memory base address on gen2
  drm/i915: fix FBC buffer size checks
  drm/i915: fix CFB size calculation
  drm/i915: remove pre-atomic check from SKL update_primary_plane
  drm/i915: don't allocate fbcon from stolen memory if it's too big
  Revert "drm/i915: Call encoder hotplug for init and resume cases"
  Revert "drm/i915: Add hot_plug hook for hdmi encoder"
  drm/i915: use error path
  drm/i915/irq: Fix misspelled word register in kernel-doc
  drm/i915/irq: Fix kernel-doc warnings
  drm/i915: Hook up ring workaround writes at context creation time on Gen6-7.
  drm/i915: Don't warn if the workaround list is empty.
  drm/i915: Resurrect golden context on gen6/7
  drm/i915/chv: remove pre-production hardware workarounds
  drm/i915/snb: remove pre-production hardware workaround
  drm/i915/bxt: Set time interval unit to 0.833us
  ...
parents 86b68716 80bea189

Documentation/DocBook/drm.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -3989,6 +3989,7 @@ int num_ioctls;</synopsis> 
	<title>High Definition Audio</title>

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

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

!Iinclude/drm/i915_component.h

      </sect2>

      <sect2>

	<title>Panel Self Refresh PSR (PSR/SRD)</title>

drivers/gpu/drm/i915/dvo.h

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ struct intel_dvo_dev_ops { 
	 * after this function is called.

	 */

	void (*mode_set)(struct intel_dvo_device *dvo,

			 struct drm_display_mode *mode,

			 struct drm_display_mode *adjusted_mode);

			 const struct drm_display_mode *mode,

			 const struct drm_display_mode *adjusted_mode);



	/*

	 * Probe for a connected output, and return detect_status.

drivers/gpu/drm/i915/dvo_ch7017.c

+2 −2
Original line number Diff line number Diff line
@@ -255,8 +255,8 @@ static enum drm_mode_status ch7017_mode_valid(struct intel_dvo_device *dvo, 
}



static void ch7017_mode_set(struct intel_dvo_device *dvo,

			    struct drm_display_mode *mode,

			    struct drm_display_mode *adjusted_mode)

			    const struct drm_display_mode *mode,

			    const struct drm_display_mode *adjusted_mode)

{

	uint8_t lvds_pll_feedback_div, lvds_pll_vco_control;

	uint8_t outputs_enable, lvds_control_2, lvds_power_down;

drivers/gpu/drm/i915/dvo_ch7xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ static enum drm_mode_status ch7xxx_mode_valid(struct intel_dvo_device *dvo, 
}



static void ch7xxx_mode_set(struct intel_dvo_device *dvo,

			    struct drm_display_mode *mode,

			    struct drm_display_mode *adjusted_mode)

			    const struct drm_display_mode *mode,

			    const struct drm_display_mode *adjusted_mode)

{

	uint8_t tvco, tpcp, tpd, tlpf, idf;

drivers/gpu/drm/i915/dvo_ivch.c

+6 −6
Original line number Diff line number Diff line
@@ -394,8 +394,8 @@ static bool ivch_get_hw_state(struct intel_dvo_device *dvo) 
}



static void ivch_mode_set(struct intel_dvo_device *dvo,

			  struct drm_display_mode *mode,

			  struct drm_display_mode *adjusted_mode)

			  const struct drm_display_mode *mode,

			  const struct drm_display_mode *adjusted_mode)

{

	struct ivch_priv *priv = dvo->dev_priv;

	uint16_t vr40 = 0;
@@ -414,16 +414,16 @@ static void ivch_mode_set(struct intel_dvo_device *dvo, 
	vr40 = (VR40_STALL_ENABLE | VR40_VERTICAL_INTERP_ENABLE |

		VR40_HORIZONTAL_INTERP_ENABLE);



	if (mode->hdisplay != adjusted_mode->hdisplay ||

	    mode->vdisplay != adjusted_mode->vdisplay) {

	if (mode->hdisplay != adjusted_mode->crtc_hdisplay ||

	    mode->vdisplay != adjusted_mode->crtc_vdisplay) {

		uint16_t x_ratio, y_ratio;



		vr01 |= VR01_PANEL_FIT_ENABLE;

		vr40 |= VR40_CLOCK_GATING_ENABLE;

		x_ratio = (((mode->hdisplay - 1) << 16) /

			   (adjusted_mode->hdisplay - 1)) >> 2;

			   (adjusted_mode->crtc_hdisplay - 1)) >> 2;

		y_ratio = (((mode->vdisplay - 1) << 16) /

			   (adjusted_mode->vdisplay - 1)) >> 2;

			   (adjusted_mode->crtc_vdisplay - 1)) >> 2;

		ivch_write(dvo, VR42, x_ratio);

		ivch_write(dvo, VR41, y_ratio);

	} else {