Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: move dram_info to struct intel_display
With all of dram code under display, also move dram_info to struct
intel_display.
This further cleans up struct xe_device from display related members.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/cbbca93003952ea24ae60e66d79d901dba78ccd8.1763578288.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+6
-10
+4
drivers/gpu/drm/i915/display/intel_display_core.h
+4
drivers/gpu/drm/i915/display/intel_display_core.h
+2
-5
drivers/gpu/drm/i915/display/intel_dram.c
+2
-5
drivers/gpu/drm/i915/display/intel_dram.c
···
817
817
818
818
int intel_dram_detect(struct intel_display *display)
819
819
{
820
-
struct drm_i915_private *i915 = to_i915(display->drm);
821
820
struct dram_info *dram_info;
822
821
int ret;
823
822
···
827
828
if (!dram_info)
828
829
return -ENOMEM;
829
830
830
-
i915->dram_info = dram_info;
831
+
display->dram.info = dram_info;
831
832
832
833
if (DISPLAY_VER(display) >= 14)
833
834
ret = xelpdp_get_dram_info(display, dram_info);
···
864
865
*/
865
866
const struct dram_info *intel_dram_info(struct intel_display *display)
866
867
{
867
-
struct drm_i915_private *i915 = to_i915(display->drm);
868
-
869
-
return i915->dram_info;
868
+
return display->dram.info;
870
869
}
-3
drivers/gpu/drm/i915/i915_drv.h
-3
drivers/gpu/drm/i915/i915_drv.h
···
60
60
#include "intel_step.h"
61
61
#include "intel_uncore.h"
62
62
63
-
struct dram_info;
64
63
struct drm_i915_clock_gating_funcs;
65
64
struct intel_display;
66
65
struct intel_pxp;
···
277
278
278
279
u32 suspend_count;
279
280
struct vlv_s0ix_state *vlv_s0ix_state;
280
-
281
-
const struct dram_info *dram_info;
282
281
283
282
struct intel_runtime_pm runtime_pm;
284
283
-2
drivers/gpu/drm/xe/xe_device_types.h
-2
drivers/gpu/drm/xe/xe_device_types.h
···
34
34
#define TEST_VM_OPS_ERROR
35
35
#endif
36
36
37
-
struct dram_info;
38
37
struct intel_display;
39
38
struct intel_dg_nvm_dev;
40
39
struct xe_ggtt;
···
636
637
* drm_i915_private during build. After cleanup these should go away,
637
638
* migrating to the right sub-structs
638
639
*/
639
-
const struct dram_info *dram_info;
640
640
641
641
struct intel_uncore {
642
642
spinlock_t lock;