Commit e2b1c3a1 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/edram: extract i915_edram.[ch] for edram detection 



While edram detection ostensibly belongs with the rest of the dram stuff
in soc/intel_dram.c, it's only required by i915 core, not
display. Extract it to a separate i915_edram.[ch] file.

This allows us to drop the edram_size_mb member from struct xe_device.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/612edb7b70755655fbf193ba8af1c539fb93b698.1763578288.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent e4c8fde0

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ i915-y += \ 
	i915_config.o \

	i915_driver.o \

	i915_drm_client.o \

	i915_edram.o \

	i915_getparam.o \

	i915_ioctl.o \

	i915_irq.o \

drivers/gpu/drm/i915/i915_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#include "i915_driver.h"

#include "i915_drm_client.h"

#include "i915_drv.h"

#include "i915_edram.h"

#include "i915_file_private.h"

#include "i915_getparam.h"

#include "i915_hwmon.h"
@@ -493,7 +494,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) 
	}



	/* needs to be done before ggtt probe */

	intel_dram_edram_detect(dev_priv);

	i915_edram_detect(dev_priv);



	ret = i915_set_dma_info(dev_priv);

	if (ret)

drivers/gpu/drm/i915/i915_edram.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/* Copyright © 2025 Intel Corporation */



#include <drm/drm_print.h>



#include "i915_drv.h"

#include "i915_edram.h"

#include "i915_reg.h"



static u32 gen9_edram_size_mb(struct drm_i915_private *i915, u32 cap)

{

	static const u8 ways[8] = { 4, 8, 12, 16, 16, 16, 16, 16 };

	static const u8 sets[4] = { 1, 1, 2, 2 };



	return EDRAM_NUM_BANKS(cap) *

		ways[EDRAM_WAYS_IDX(cap)] *

		sets[EDRAM_SETS_IDX(cap)];

}



void i915_edram_detect(struct drm_i915_private *i915)

{

	u32 edram_cap = 0;



	if (!(IS_HASWELL(i915) || IS_BROADWELL(i915) || GRAPHICS_VER(i915) >= 9))

		return;



	edram_cap = intel_uncore_read_fw(&i915->uncore, HSW_EDRAM_CAP);



	/* NB: We can't write IDICR yet because we don't have gt funcs set up */



	if (!(edram_cap & EDRAM_ENABLED))

		return;



	/*

	 * The needed capability bits for size calculation are not there with

	 * pre gen9 so return 128MB always.

	 */

	if (GRAPHICS_VER(i915) < 9)

		i915->edram_size_mb = 128;

	else

		i915->edram_size_mb = gen9_edram_size_mb(i915, edram_cap);



	drm_info(&i915->drm, "Found %uMB of eDRAM\n", i915->edram_size_mb);

}

drivers/gpu/drm/i915/i915_edram.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* Copyright © 2025 Intel Corporation */



#ifndef __I915_DRAM_H__

#define __I915_DRAM_H__



struct drm_i915_private;



void i915_edram_detect(struct drm_i915_private *i915);



#endif /* __I915_DRAM_H__ */

drivers/gpu/drm/i915/soc/intel_dram.c

+0 −36
Original line number Diff line number Diff line
@@ -861,39 +861,3 @@ const struct dram_info *intel_dram_info(struct drm_device *drm) 


	return i915->dram_info;

}
 


static u32 gen9_edram_size_mb(struct drm_i915_private *i915, u32 cap)

{

	static const u8 ways[8] = { 4, 8, 12, 16, 16, 16, 16, 16 };

	static const u8 sets[4] = { 1, 1, 2, 2 };



	return EDRAM_NUM_BANKS(cap) *

		ways[EDRAM_WAYS_IDX(cap)] *

		sets[EDRAM_SETS_IDX(cap)];

}



void intel_dram_edram_detect(struct drm_i915_private *i915)

{

	u32 edram_cap = 0;



	if (!(IS_HASWELL(i915) || IS_BROADWELL(i915) || GRAPHICS_VER(i915) >= 9))

		return;



	edram_cap = intel_uncore_read_fw(&i915->uncore, HSW_EDRAM_CAP);



	/* NB: We can't write IDICR yet because we don't have gt funcs set up */



	if (!(edram_cap & EDRAM_ENABLED))

		return;



	/*

	 * The needed capability bits for size calculation are not there with

	 * pre gen9 so return 128MB always.

	 */

	if (GRAPHICS_VER(i915) < 9)

		i915->edram_size_mb = 128;

	else

		i915->edram_size_mb = gen9_edram_size_mb(i915, edram_cap);



	drm_info(&i915->drm, "Found %uMB of eDRAM\n", i915->edram_size_mb);

}