Commit 5e7e8225 authored by David Francis's avatar David Francis Committed by Alex Deucher
Browse files

drm/amdgpu: Handle null atom context in VBIOS info ioctl 



On some APU systems, there is no atom context and so the
atom_context struct is null.

Add a check to the VBIOS_INFO branch of amdgpu_info_ioctl
to handle this case, returning all zeroes.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDavid Francis <David.Francis@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9296da8c

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

+11 −6
Original line number Diff line number Diff line
@@ -940,12 +940,17 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			struct atom_context *atom_context;



			atom_context = adev->mode_info.atom_context;

			memcpy(vbios_info.name, atom_context->name, sizeof(atom_context->name));

			memcpy(vbios_info.vbios_pn, atom_context->vbios_pn, sizeof(atom_context->vbios_pn));

			if (atom_context) {

				memcpy(vbios_info.name, atom_context->name,

				       sizeof(atom_context->name));

				memcpy(vbios_info.vbios_pn, atom_context->vbios_pn,

				       sizeof(atom_context->vbios_pn));

				vbios_info.version = atom_context->version;

				memcpy(vbios_info.vbios_ver_str, atom_context->vbios_ver_str,

				       sizeof(atom_context->vbios_ver_str));

			memcpy(vbios_info.date, atom_context->date, sizeof(atom_context->date));

				memcpy(vbios_info.date, atom_context->date,

				       sizeof(atom_context->date));

			}



			return copy_to_user(out, &vbios_info,

						min((size_t)size, sizeof(vbios_info))) ? -EFAULT : 0;