Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa4ce449 authored by Zhi Wang's avatar Zhi Wang Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Fix firmware loading interface for GVT-g golden HW state 



Firmware loading interface for GVT-g golden HW state has been broken
before. This patch fixes GVT-g firmware loading interface. A user should
apply this patch if he wants to load GVT-g golden HW state from firmware
interface.

Fixes: 579cea5f ("drm/i915/gvt: golden virtual HW state management")
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: drm-intel-fixes@lists.freedesktop.org
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent f8572690

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

+6 −3
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt) 
	struct gvt_firmware_header *h;

	void *firmware;

	void *p;

	unsigned long size;

	unsigned long size, crc32_start;

	int i;

	int ret;



	size = sizeof(*h) + info->mmio_size + info->cfg_space_size - 1;

	size = sizeof(*h) + info->mmio_size + info->cfg_space_size;

	firmware = vzalloc(size);

	if (!firmware)

		return -ENOMEM;
@@ -112,6 +112,9 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt) 


	memcpy(gvt->firmware.mmio, p, info->mmio_size);



	crc32_start = offsetof(struct gvt_firmware_header, crc32) + 4;

	h->crc32 = crc32_le(0, firmware + crc32_start, size - crc32_start);



	firmware_attr.size = size;

	firmware_attr.private = firmware;
@@ -234,7 +237,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt) 


	firmware->mmio = mem;



	sprintf(path, "%s/vid_0x%04x_did_0x%04x_rid_0x%04x.golden_hw_state",

	sprintf(path, "%s/vid_0x%04x_did_0x%04x_rid_0x%02x.golden_hw_state",

		 GVT_FIRMWARE_PATH, pdev->vendor, pdev->device,

		 pdev->revision);