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, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index a1648eb3a8b1..f5addac7c154 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1742,10 +1742,10 @@ int i915_driver_unload(struct drm_device *dev)
                  * free the memory space allocated for the child device
                  * config parsed from VBT
                  */
-                if (dev_priv->child_dev && dev_priv->child_dev_num) {
-                        kfree(dev_priv->child_dev);
-                        dev_priv->child_dev = NULL;
-                        dev_priv->child_dev_num = 0;
+                if (dev_priv->vbt.child_dev && dev_priv->vbt.child_dev_num) {
+                        kfree(dev_priv->vbt.child_dev);
+                        dev_priv->vbt.child_dev = NULL;
+                        dev_priv->vbt.child_dev_num = 0;
                 }
 
                 vga_switcheroo_unregister_client(dev->pdev);