From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Tue, 22 Jan 2019 22:51:36 +0000 (-0800)
Subject: Merge drm/drm-next into drm-intel-next-queued
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f42fb2317ffcbd005eeb22b1e49020821a11e23a;p=openwrt%2Fstaging%2Fblogic.git

Merge drm/drm-next into drm-intel-next-queued

We need avi infoframe stuff who got merged via drm-misc

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

f42fb2317ffcbd005eeb22b1e49020821a11e23a
diff --cc drivers/gpu/drm/i915/intel_lspcon.c
index f08a9b4058f0,7d15be5932e0..322bdddda164
--- a/drivers/gpu/drm/i915/intel_lspcon.c
+++ b/drivers/gpu/drm/i915/intel_lspcon.c
@@@ -459,13 -459,11 +459,11 @@@ void lspcon_set_infoframes(struct intel
  {
  	ssize_t ret;
  	union hdmi_infoframe frame;
 -	uint8_t buf[VIDEO_DIP_DATA_SIZE];
 +	u8 buf[VIDEO_DIP_DATA_SIZE];
  	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
  	struct intel_lspcon *lspcon = &dig_port->lspcon;
- 	struct intel_dp *intel_dp = &dig_port->dp;
- 	struct drm_connector *connector = &intel_dp->attached_connector->base;
- 	const struct drm_display_mode *mode = &crtc_state->base.adjusted_mode;
- 	bool is_hdmi2_sink = connector->display_info.hdmi.scdc.supported;
+ 	const struct drm_display_mode *adjusted_mode =
+ 		&crtc_state->base.adjusted_mode;
  
  	if (!lspcon->active) {
  		DRM_ERROR("Writing infoframes while LSPCON disabled ?\n");