Commit b1073352 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.11-2020-12-09' of git://people.freedesktop.org/~agd5f/linux into drm-next 

amd-drm-next-5.11-2020-12-09:

amdgpu:
- SR-IOV fixes
- Navy Flounder updates
- Sienna Cichlid updates
- Dimgrey Cavefish updates
- Vangogh updates
- Misc SMU fixes
- Misc display fixes
- Last big hunk of W=1 warning fixes
- Cursor validation fixes
- CI BACO updates

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201210045344.21566-1-alexander.deucher@amd.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 60f2f749 f8aab604

drivers/gpu/drm/amd/amdgpu/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ amdgpu-y += \ 
	athub_v2_0.o \

	athub_v2_1.o



# add SMUIO block

amdgpu-y += \

	smuio_v9_0.o \

	smuio_v11_0.o



# add amdkfd interfaces

amdgpu-y += amdgpu_amdkfd.o

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

+9 −3
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#include "amdgpu_mmhub.h"

#include "amdgpu_gfxhub.h"

#include "amdgpu_df.h"

#include "amdgpu_smuio.h"



#define MAX_GPU_INSTANCE		16
@@ -193,9 +194,9 @@ extern int sched_policy; 
extern bool debug_evictions;

extern bool no_system_mem_limit;

#else

static const int sched_policy = KFD_SCHED_POLICY_HWS;

static const bool debug_evictions; /* = false */

static const bool no_system_mem_limit;

static const int __maybe_unused sched_policy = KFD_SCHED_POLICY_HWS;

static const bool __maybe_unused debug_evictions; /* = false */

static const bool __maybe_unused no_system_mem_limit;

#endif



extern int amdgpu_tmz;
@@ -920,6 +921,9 @@ struct amdgpu_device { 
	/* nbio */

	struct amdgpu_nbio		nbio;



	/* smuio */

	struct amdgpu_smuio		smuio;



	/* mmhub */

	struct amdgpu_mmhub		mmhub;
@@ -1307,9 +1311,11 @@ int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev); 


void amdgpu_acpi_get_backlight_caps(struct amdgpu_device *adev,

		struct amdgpu_dm_backlight_caps *caps);

bool amdgpu_acpi_is_s0ix_supported(void);

#else

static inline int amdgpu_acpi_init(struct amdgpu_device *adev) { return 0; }

static inline void amdgpu_acpi_fini(struct amdgpu_device *adev) { }

static inline bool amdgpu_acpi_is_s0ix_supported(void) { return false; }

#endif



int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,

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

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct device *get_mfd_cell_dev(const char *device_name, int r) 
/**

 * acp_hw_init - start and test ACP block

 *

 * @adev: amdgpu_device pointer

 * @handle: handle used to pass amdgpu_device pointer

 *

 */

static int acp_hw_init(void *handle)
@@ -405,7 +405,7 @@ failure: 
/**

 * acp_hw_fini - stop the hardware block

 *

 * @adev: amdgpu_device pointer

 * @handle: handle used to pass amdgpu_device pointer

 *

 */

static int acp_hw_fini(void *handle)

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

+14 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/power_supply.h>

#include <linux/pm_runtime.h>

#include <acpi/video.h>

#include <acpi/actbl.h>



#include <drm/drm_crtc_helper.h>

#include "amdgpu.h"
@@ -894,3 +895,16 @@ void amdgpu_acpi_fini(struct amdgpu_device *adev) 
	unregister_acpi_notifier(&adev->acpi_nb);

	kfree(adev->atif);

}



/**

 * amdgpu_acpi_is_s0ix_supported

 *

 * returns true if supported, false if not.

 */

bool amdgpu_acpi_is_s0ix_supported(void)

{

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)

		return true;



	return false;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "soc15.h"

#include "soc15d.h"

#include "gfx_v9_0.h"

#include "amdgpu_amdkfd_gfx_v9.h"



enum hqd_dequeue_request_type {

	NO_ACTION = 0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE