drm/i915/dram: hide the dram structs better

Finish the job started in d28ae3b28187 ("drm/i915: split out
intel_dram.[ch] from i915_drv.c") by moving struct dram_dimm_info and
dram_channel_info inside intel_dram.c, the only user of the structs.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227145359.17543-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c038295230aff37b87790d4f835ebea50601c241..00ed8b647f2db98ab459e3a24bc064a872ce3e2a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1244,16 +1244,6 @@ struct drm_i915_private {
         */
 };
 
-struct dram_dimm_info {
-       u8 size, width, ranks;
-};
-
-struct dram_channel_info {
-       struct dram_dimm_info dimm_l, dimm_s;
-       u8 ranks;
-       bool is_16gb_dimm;
-};
-
 static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
 {
        return container_of(dev, struct drm_i915_private, drm);

diff --git a/drivers/gpu/drm/i915/intel_dram.c b/drivers/gpu/drm/i915/intel_dram.c
index 9bb9dd724d3f11cd3f1898f8aa722c123a82f06a..6b922efb1d7c68dc22532850e322c83f8cafca07 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dram.c
+++ b/drivers/gpu/drm/i915/intel_dram.c
@@ -6,6 +6,16 @@
 #include "i915_drv.h"
 #include "intel_dram.h"
 
+struct dram_dimm_info {
+       u8 size, width, ranks;
+};
+
+struct dram_channel_info {
+       struct dram_dimm_info dimm_l, dimm_s;
+       u8 ranks;
+       bool is_16gb_dimm;
+};
+
 #define DRAM_TYPE_STR(type) [INTEL_DRAM_ ## type] = #type
 
 static const char *intel_dram_type_str(enum intel_dram_type type)