From: Dave Airlie <airlied@redhat.com>
Date: Sun, 17 Jan 2016 21:01:16 +0000 (+1000)
Subject: Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: v4.5-rc1~74^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28f03607bb2e7a3dab71d0a377fd13f6ed3ebb9f;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next

Since your main drm-next pull isn't out of the door yet I figured I might
as well flush out drm-misc instead of delaying for 4.6. It's really just
random stuff all over, biggest thing probably connector_mask tracking from
Maarten.

* tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel: (24 commits)
  drm/fb_cma_helper: Remove implicit call to disable_unused_functions
  drm/sysfs: use kobj_to_dev()
  drm/i915: Init power domains early in driver load
  drm: Do not set connector->encoder in drivers
  apple-gmux: Add initial documentation
  drm: move MODULE_PARM_DESC to other file
  drm/edid: index CEA/HDMI mode tables using the VIC
  drm/atomic: Remove drm_atomic_connectors_for_crtc.
  drm/i915: Update connector_mask during readout, v2.
  drm: Remove opencoded drm_gem_object_release_handle()
  drm: Do not set outparam on error during GEM handle allocation
  drm/docs: more leftovers from the big vtable documentation pile
  drm/atomic-helper: Reject legacy flips on a disabled pipe
  drm/atomic: add connector mask to drm_crtc_state.
  drm/tegra: Use __drm_atomic_helper_reset_connector for subclassing connector state, v2.
  drm/atomic: Add __drm_atomic_helper_connector_reset, v2.
  drm/i915: Set connector_state->connector using the helper.
  drm: Use a normal idr allocation for the obj->name
  drm: Only bump object-reference count when adding first handle
  drm: Balance error path for GEM handle allocation
  ...
---

28f03607bb2e7a3dab71d0a377fd13f6ed3ebb9f
diff --cc drivers/gpu/drm/bridge/dw-hdmi.c
index 6fbec99,f224945..b0aac473
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
@@@ -1657,18 -1645,9 +1657,16 @@@ static int dw_hdmi_register(struct drm_
  
  	drm_connector_helper_add(&hdmi->connector,
  				 &dw_hdmi_connector_helper_funcs);
 -	drm_connector_init(drm, &hdmi->connector, &dw_hdmi_connector_funcs,
 -			   DRM_MODE_CONNECTOR_HDMIA);
 +
 +	if (drm_core_check_feature(drm, DRIVER_ATOMIC))
 +		drm_connector_init(drm, &hdmi->connector,
 +				   &dw_hdmi_atomic_connector_funcs,
 +				   DRM_MODE_CONNECTOR_HDMIA);
 +	else
 +		drm_connector_init(drm, &hdmi->connector,
 +				   &dw_hdmi_connector_funcs,
 +				   DRM_MODE_CONNECTOR_HDMIA);
  
- 	hdmi->connector.encoder = encoder;
- 
  	drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
  
  	return 0;