drm/amdgpu: move atom scratch setup into amdgpu_atombios.c (43bf11bd) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -1748,3 +1748,31 @@ void amdgpu_atombios_copy_swap(u8 dst, u8 src, u8 num_bytes, bool to_le)
		memcpy(dst, src, num_bytes);
		#endif
		}

		int amdgpu_atombios_allocate_fb_scratch(struct amdgpu_device *adev)
		{
		struct atom_context *ctx = adev->mode_info.atom_context;
		int index = GetIndexIntoMasterTable(DATA, VRAM_UsageByFirmware);
		uint16_t data_offset;
		int usage_bytes = 0;
		struct _ATOM_VRAM_USAGE_BY_FIRMWARE *firmware_usage;

		if (amdgpu_atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) {
		firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset);

		DRM_DEBUG("atom firmware requested %08x %dkb\n",
		le32_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware),
		le16_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb));

		usage_bytes = le16_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb) * 1024;
		}
		ctx->scratch_size_bytes = 0;
		if (usage_bytes == 0)
		usage_bytes = 20 * 1024;
		/* allocate some scratch memory */
		ctx->scratch = kzalloc(usage_bytes, GFP_KERNEL);
		if (!ctx->scratch)
		return -ENOMEM;
		ctx->scratch_size_bytes = usage_bytes;
		return 0;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -215,4 +215,7 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,
		int amdgpu_atombios_get_svi2_info(struct amdgpu_device *adev,
		u8 voltage_type,
		u8 svd_gpio_id, u8 svc_gpio_id);

		int amdgpu_atombios_allocate_fb_scratch(struct amdgpu_device *adev);

		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -994,7 +994,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)

		mutex_init(&adev->mode_info.atom_context->mutex);
		amdgpu_atombios_scratch_regs_init(adev);
		amdgpu_atom_allocate_fb_scratch(adev->mode_info.atom_context);
		amdgpu_atombios_allocate_fb_scratch(adev);
		return 0;
		}

+0 −26

Original line number	Diff line number	Diff line
		@@ -1417,29 +1417,3 @@ bool amdgpu_atom_parse_cmd_header(struct atom_context ctx, int index, uint8_t
		return true;
		}

		int amdgpu_atom_allocate_fb_scratch(struct atom_context *ctx)
		{
		int index = GetIndexIntoMasterTable(DATA, VRAM_UsageByFirmware);
		uint16_t data_offset;
		int usage_bytes = 0;
		struct _ATOM_VRAM_USAGE_BY_FIRMWARE *firmware_usage;

		if (amdgpu_atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) {
		firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset);

		DRM_DEBUG("atom firmware requested %08x %dkb\n",
		le32_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware),
		le16_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb));

		usage_bytes = le16_to_cpu(firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb) * 1024;
		}
		ctx->scratch_size_bytes = 0;
		if (usage_bytes == 0)
		usage_bytes = 20 * 1024;
		/* allocate some scratch memory */
		ctx->scratch = kzalloc(usage_bytes, GFP_KERNEL);
		if (!ctx->scratch)
		return -ENOMEM;
		ctx->scratch_size_bytes = usage_bytes;
		return 0;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ bool amdgpu_atom_parse_data_header(struct atom_context *ctx, int index, uint16_t
		uint8_t frev, uint8_t crev, uint16_t *data_start);
		bool amdgpu_atom_parse_cmd_header(struct atom_context *ctx, int index,
		uint8_t frev, uint8_t crev);
		int amdgpu_atom_allocate_fb_scratch(struct atom_context *ctx);
		#include "atom-types.h"
		#include "atombios.h"
		#include "ObjectID.h"