drm/i915: Organize VBT stuff inside drm_i915_private

drm_i915_private is getting bigger and bigger when adding new vbt stuff.
So, the better way of getting drm_i915_private organized is to create
a special structure for vbt stuff.

v2: Basically conflicts fixes

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 015f9f4263fe..2f54dc3dc5df 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1526,7 +1526,7 @@ intel_sdvo_get_analog_edid(struct drm_connector *connector)
 
         return drm_get_edid(connector,
                             intel_gmbus_get_adapter(dev_priv,
-                                                    dev_priv->crt_ddc_pin));
+                                                    dev_priv->vbt.crt_ddc_pin));
 }
 
 static enum drm_connector_status
@@ -1809,9 +1809,9 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
                 goto end;
 
         /* Fetch modes from VBT */
-        if (dev_priv->sdvo_lvds_vbt_mode != NULL) {
+        if (dev_priv->vbt.sdvo_lvds_vbt_mode != NULL) {
                 newmode = drm_mode_duplicate(connector->dev,
-                                             dev_priv->sdvo_lvds_vbt_mode);
+                                             dev_priv->vbt.sdvo_lvds_vbt_mode);
                 if (newmode != NULL) {
                         /* Guarantee the mode is preferred */
                         newmode->type = (DRM_MODE_TYPE_PREFERRED |