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

Commit 2f7d10b3 authored by Jammy Zhou's avatar Jammy Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: merge amdgpu_family.h into amd_shared.h (v2) 



Make the definitions common for all driver components

v2: fix kfd

Signed-off-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fa9f1d4e

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <drm/amdgpu_drm.h>



#include "amd_shared.h"

#include "amdgpu_family.h"

#include "amdgpu_mode.h"

#include "amdgpu_ih.h"

#include "amdgpu_irq.h"
@@ -1900,7 +1899,7 @@ struct amdgpu_device { 
	struct rw_semaphore		exclusive_lock;



	/* ASIC */

	enum amdgpu_asic_type           asic_type;

	enum amd_asic_type		asic_type;

	uint32_t			family;

	uint32_t			rev_id;

	uint32_t			external_rev_id;

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 */



#include "amdgpu_amdkfd.h"

#include "amdgpu_family.h"

#include "amd_shared.h"

#include <drm/drmP.h>

#include "amdgpu.h"

#include <linux/module.h>

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

+2 −2
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ bool amdgpu_atombios_get_asic_ss_info(struct amdgpu_device *adev, 
					if ((id == ASIC_INTERNAL_ENGINE_SS) ||

					    (id == ASIC_INTERNAL_MEMORY_SS))

						ss->rate /= 100;

					if (adev->flags & AMDGPU_IS_APU)

					if (adev->flags & AMD_IS_APU)

						amdgpu_atombios_get_igp_ss_overrides(adev, ss, id);

					return true;

				}
@@ -1058,7 +1058,7 @@ void amdgpu_atombios_set_memory_clock(struct amdgpu_device *adev, 
	SET_MEMORY_CLOCK_PS_ALLOCATION args;

	int index = GetIndexIntoMasterTable(COMMAND, SetMemoryClock);



	if (adev->flags & AMDGPU_IS_APU)

	if (adev->flags & AMD_IS_APU)

		return;



	args.ulTargetMemoryClock = cpu_to_le32(mem_clock);	/* 10 khz */

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

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) 
	resource_size_t vram_base;

	resource_size_t size = 256 * 1024; /* ??? */



	if (!(adev->flags & AMDGPU_IS_APU))

	if (!(adev->flags & AMD_IS_APU))

		if (!amdgpu_card_posted(adev))

			return false;
@@ -184,7 +184,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) 
	bool found = false;



	/* ATRM is for the discrete card only */

	if (adev->flags & AMDGPU_IS_APU)

	if (adev->flags & AMD_IS_APU)

		return false;



	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
@@ -246,7 +246,7 @@ static inline bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) 


static bool amdgpu_read_disabled_bios(struct amdgpu_device *adev)

{

	if (adev->flags & AMDGPU_IS_APU)

	if (adev->flags & AMD_IS_APU)

		return igp_read_bios_from_vram(adev);

	else

		return amdgpu_asic_read_disabled_bios(adev);

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

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ bool amdgpu_device_is_px(struct drm_device *dev) 
{

	struct amdgpu_device *adev = dev->dev_private;



	if (adev->flags & AMDGPU_IS_PX)

	if (adev->flags & AMD_IS_PX)

		return true;

	return false;

}
@@ -1377,7 +1377,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	adev->ddev = ddev;

	adev->pdev = pdev;

	adev->flags = flags;

	adev->asic_type = flags & AMDGPU_ASIC_MASK;

	adev->asic_type = flags & AMD_ASIC_MASK;

	adev->is_atom_bios = false;

	adev->usec_timeout = AMDGPU_MAX_USEC_TIMEOUT;

	adev->mc.gtt_size = 512 * 1024 * 1024;