diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2015-10-25 14:57:53 +0000 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2015-10-25 14:57:53 +0000 |
| commit | 57d1cdf84bd98105882c354aea21b4a67d628cb9 (patch) | |
| tree | bcfb2042fbcfc00433de016e577ac1da52a5c884 /sys/dev/drm2 | |
| parent | f89934e0d7a2af95ccadda8278886fd5cba9cb3a (diff) | |
| download | FreeBSD-src-57d1cdf84bd98105882c354aea21b4a67d628cb9.zip FreeBSD-src-57d1cdf84bd98105882c354aea21b4a67d628cb9.tar.gz | |
drm/i915: Reduce diff with Linux 3.8
There is no functional change. The goal is to ease the future update to
Linux 3.8's i915 driver.
MFC after: 2 month
Diffstat (limited to 'sys/dev/drm2')
| -rw-r--r-- | sys/dev/drm2/i915/intel_crt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/drm2/i915/intel_crt.c b/sys/dev/drm2/i915/intel_crt.c index 5f52bfd..ef6bf4c 100644 --- a/sys/dev/drm2/i915/intel_crt.c +++ b/sys/dev/drm2/i915/intel_crt.c @@ -498,16 +498,16 @@ static int intel_crt_get_modes(struct drm_connector *connector) struct drm_device *dev = connector->dev; struct drm_i915_private *dev_priv = dev->dev_private; int ret; - device_t iic; + device_t i2c; - iic = intel_gmbus_get_adapter(dev_priv, dev_priv->crt_ddc_pin); - ret = intel_ddc_get_modes(connector, iic); + i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->crt_ddc_pin); + ret = intel_ddc_get_modes(connector, i2c); if (ret || !IS_G4X(dev)) return ret; /* Try to probe digital port for output in DVI-I -> VGA mode. */ - iic = intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPB); - return intel_ddc_get_modes(connector, iic); + i2c = intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPB); + return intel_ddc_get_modes(connector, i2c); } static int intel_crt_set_property(struct drm_connector *connector, @@ -522,8 +522,9 @@ static void intel_crt_reset(struct drm_connector *connector) struct drm_device *dev = connector->dev; struct intel_crt *crt = intel_attached_crt(connector); - if (HAS_PCH_SPLIT(dev)) + if (HAS_PCH_SPLIT(dev)) { crt->force_hotplug_required = 1; + } } /* @@ -596,6 +597,7 @@ void intel_crt_init(struct drm_device *dev) return; crt = malloc(sizeof(struct intel_crt), DRM_MEM_KMS, M_WAITOK | M_ZERO); + intel_connector = malloc(sizeof(struct intel_connector), DRM_MEM_KMS, M_WAITOK | M_ZERO); |
