From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2014 23:04:59 +0000 (+1000)
Subject: Merge tag 'v3.16' into drm-next
X-Git-Tag: v3.17-rc1~82^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5d42f82a9b8c5168d75cf59307cd271feca94464;p=linux.git

Merge tag 'v3.16' into drm-next

Linux 3.16

backmerge requested by i915, nouveau and radeon authors

Conflicts:
	drivers/gpu/drm/i915/i915_gem_render_state.c
	drivers/gpu/drm/i915/intel_drv.h
---

5d42f82a9b8c5168d75cf59307cd271feca94464
diff --cc drivers/gpu/drm/i915/intel_drv.h
index b2837c5fccfc,f67340ed2c12..8a475a6909c3
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -556,17 -537,12 +556,20 @@@ struct intel_dp 
  	unsigned long last_power_cycle;
  	unsigned long last_power_on;
  	unsigned long last_backlight_off;
 -	bool psr_setup_done;
++
+ 	struct notifier_block edp_notifier;
+ 
  	bool use_tps3;
 +	bool can_mst; /* this port supports mst */
 +	bool is_mst;
 +	int active_mst_links;
 +	/* connector directly attached - won't be use for modeset in mst world */
  	struct intel_connector *attached_connector;
  
 +	/* mst connector list */
 +	struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES];
 +	struct drm_dp_mst_topology_mgr mst_mgr;
 +
  	uint32_t (*get_aux_clock_divider)(struct intel_dp *dp, int index);
  	/*
  	 * This function returns the value we have to program the AUX_CTL