Commit ca177779 authored by Rikard Falkeborn's avatar Rikard Falkeborn Committed by Zhi Wang
Browse files

drm/i915/gvt: Constify gvt_mmio_block 



These are never modified, so make them const to allow the compiler to
put it in read-only memory.

Signed-off-by: default avatarRikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20211204105527.15741-6-rikard.falkeborn@gmail.com


Reviewed-by: default avatarZhi Wang <zhi.a.wang@intel.com>
parent 46420777

drivers/gpu/drm/i915/gvt/gvt.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ struct intel_gvt_mmio { 
/* Value of command write of this reg needs to be patched */

#define F_CMD_WRITE_PATCH	(1 << 8)



	struct gvt_mmio_block *mmio_block;

	const struct gvt_mmio_block *mmio_block;

	unsigned int num_mmio_block;



	DECLARE_HASHTABLE(mmio_info_table, INTEL_GVT_MMIO_HASH_BITS);

drivers/gpu/drm/i915/gvt/handlers.c

+6 −6
Original line number Diff line number Diff line
@@ -3628,11 +3628,11 @@ static int init_bxt_mmio_info(struct intel_gvt *gvt) 
	return 0;

}



static struct gvt_mmio_block *find_mmio_block(struct intel_gvt *gvt,

static const struct gvt_mmio_block *find_mmio_block(struct intel_gvt *gvt,

						    unsigned int offset)

{

	unsigned long device = intel_gvt_get_device_type(gvt);

	struct gvt_mmio_block *block = gvt->mmio.mmio_block;

	const struct gvt_mmio_block *block = gvt->mmio.mmio_block;

	int num = gvt->mmio.num_mmio_block;

	int i;
@@ -3671,7 +3671,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt) 
 * accessible (should have no F_CMD_ACCESS flag).

 * otherwise, need to update cmd_reg_handler in cmd_parser.c

 */

static struct gvt_mmio_block mmio_blocks[] = {

static const struct gvt_mmio_block mmio_blocks[] = {

	{D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},

	{D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},

	{D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
@@ -3754,7 +3754,7 @@ int intel_gvt_for_each_tracked_mmio(struct intel_gvt *gvt, 
	int (*handler)(struct intel_gvt *gvt, u32 offset, void *data),

	void *data)

{

	struct gvt_mmio_block *block = gvt->mmio.mmio_block;

	const struct gvt_mmio_block *block = gvt->mmio.mmio_block;

	struct intel_gvt_mmio_info *e;

	int i, j, ret;
@@ -3872,7 +3872,7 @@ int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset, 
	struct drm_i915_private *i915 = vgpu->gvt->gt->i915;

	struct intel_gvt *gvt = vgpu->gvt;

	struct intel_gvt_mmio_info *mmio_info;

	struct gvt_mmio_block *mmio_block;

	const struct gvt_mmio_block *mmio_block;

	gvt_mmio_func func;

	int ret;