github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: move dram_info to struct intel_display

Browse Source 
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>
This commit is contained in:
Jani Nikula 2025-11-19 20:52:45 +02:00
parent b8660fa662
commit de4ca6f8e9
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_display_core.h
View File

@ -394,6 +394,10 @@ struct intel_display {
u32 mmio_base;
} dsi;
struct {
const struct dram_info *info;
} dram;
struct {
/* list of fbdev register on this device */
struct intel_fbdev *fbdev;

7
drivers/gpu/drm/i915/display/intel_dram.c
View File

@ -817,7 +817,6 @@ static int xelpdp_get_dram_info(struct intel_display *display, struct dram_info
int intel_dram_detect(struct intel_display *display)
{
struct drm_i915_private *i915 = to_i915(display->drm);
struct dram_info *dram_info;
int ret;
@ -828,7 +827,7 @@ int intel_dram_detect(struct intel_display *display)
if (!dram_info)
return -ENOMEM;
i915->dram_info = dram_info;
display->dram.info = dram_info;
if (DISPLAY_VER(display) >= 14)
ret = xelpdp_get_dram_info(display, dram_info);
@ -865,7 +864,5 @@ int intel_dram_detect(struct intel_display *display)
*/
const struct dram_info *intel_dram_info(struct intel_display *display)
{
struct drm_i915_private *i915 = to_i915(display->drm);
return i915->dram_info;
return display->dram.info;
}

3
drivers/gpu/drm/i915/i915_drv.h
View File

@ -60,7 +60,6 @@
#include "intel_step.h"
#include "intel_uncore.h"
struct dram_info;
struct drm_i915_clock_gating_funcs;
struct intel_display;
struct intel_pxp;
@ -279,8 +278,6 @@ struct drm_i915_private {
u32 suspend_count;
struct vlv_s0ix_state *vlv_s0ix_state;
const struct dram_info *dram_info;
struct intel_runtime_pm runtime_pm;
struct i915_perf perf;

2
drivers/gpu/drm/xe/xe_device_types.h
View File

@ -34,7 +34,6 @@
#define TEST_VM_OPS_ERROR
#endif
struct dram_info;
struct intel_display;
struct intel_dg_nvm_dev;
struct xe_ggtt;
@ -637,7 +636,6 @@ struct xe_device {
* drm_i915_private during build. After cleanup these should go away,
* migrating to the right sub-structs
*/
const struct dram_info *dram_info;
struct intel_uncore {
spinlock_t lock;