Wed Jul 24 03:34:58 2013 UTC ()
Make intel_prepare_ddi_buffers static in intel_ddi.c.


(riastradh)
diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
cvs diff -r1.1.1.1.2.2 -r1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_ddi.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_ddi.c 2013/07/23 21:28:22 1.1.1.1.2.2
+++ src/sys/external/bsd/drm2/dist/drm/i915/Attic/intel_ddi.c 2013/07/24 03:34:58 1.1.1.1.2.3
@@ -74,26 +74,29 @@ static enum port intel_ddi_get_encoder_p @@ -74,26 +74,29 @@ static enum port intel_ddi_get_encoder_p
74 74
75 } else { 75 } else {
76 DRM_ERROR("Invalid DDI encoder type %d\n", type); 76 DRM_ERROR("Invalid DDI encoder type %d\n", type);
77 BUG(); 77 BUG();
78 } 78 }
79} 79}
80 80
81/* On Haswell, DDI port buffers must be programmed with correct values 81/* On Haswell, DDI port buffers must be programmed with correct values
82 * in advance. The buffer values are different for FDI and DP modes, 82 * in advance. The buffer values are different for FDI and DP modes,
83 * but the HDMI/DVI fields are shared among those. So we program the DDI 83 * but the HDMI/DVI fields are shared among those. So we program the DDI
84 * in either FDI or DP modes only, as HDMI connections will work with both 84 * in either FDI or DP modes only, as HDMI connections will work with both
85 * of those 85 * of those
86 */ 86 */
 87#ifdef __NetBSD__
 88static
 89#endif
87void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port, bool use_fdi_mode) 90void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port, bool use_fdi_mode)
88{ 91{
89 struct drm_i915_private *dev_priv = dev->dev_private; 92 struct drm_i915_private *dev_priv = dev->dev_private;
90 u32 reg; 93 u32 reg;
91 int i; 94 int i;
92 const u32 *ddi_translations = ((use_fdi_mode) ? 95 const u32 *ddi_translations = ((use_fdi_mode) ?
93 hsw_ddi_translations_fdi : 96 hsw_ddi_translations_fdi :
94 hsw_ddi_translations_dp); 97 hsw_ddi_translations_dp);
95 98
96 DRM_DEBUG_DRIVER("Initializing DDI buffers for port %c in %s mode\n", 99 DRM_DEBUG_DRIVER("Initializing DDI buffers for port %c in %s mode\n",
97 port_name(port), 100 port_name(port),
98 use_fdi_mode ? "FDI" : "DP"); 101 use_fdi_mode ? "FDI" : "DP");
99 102