Commit 26df39de authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.12-2024-09-13' of... 

Merge tag 'amd-drm-next-6.12-2024-09-13' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.12-2024-09-13:

amdgpu:
- GPUVM sync fixes
- kdoc fixes
- Misc spelling mistakes
- Add some raven GFXOFF quirks
- Use clamp helper
- DC fixes
- JPEG fixes
- Process isolation fix
- Queue reset fix
- W=1 cleanup
- SMU14 fixes
- JPEG fixes

amdkfd:
- Fetch cacheline info from IP discovery
- Queue reset fix
- RAS fix
- Document SVM events
- CRIU fixes
- Race fix in dma-buf handling

drm:
- dma-buf fd race fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240913134139.2861073-1-alexander.deucher@amd.com
parents bf05aeac 0c8c5bdd

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −17
Original line number Diff line number Diff line
@@ -39,23 +39,7 @@ ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \ 
	-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm \

	-I$(FULL_AMD_PATH)/amdkfd



subdir-ccflags-y := -Wextra

subdir-ccflags-y += -Wunused

subdir-ccflags-y += -Wmissing-prototypes

subdir-ccflags-y += -Wmissing-declarations

subdir-ccflags-y += -Wmissing-include-dirs

subdir-ccflags-y += -Wold-style-definition

subdir-ccflags-y += -Wmissing-format-attribute

# Need this to avoid recursive variable evaluation issues

cond-flags := $(call cc-option, -Wunused-but-set-variable) \

	$(call cc-option, -Wunused-const-variable) \

	$(call cc-option, -Wstringop-truncation) \

	$(call cc-option, -Wpacked-not-aligned)

subdir-ccflags-y += $(cond-flags)

subdir-ccflags-y += -Wno-unused-parameter

subdir-ccflags-y += -Wno-type-limits

subdir-ccflags-y += -Wno-sign-compare

subdir-ccflags-y += -Wno-missing-field-initializers

# Locally disable W=1 warnings enabled in drm subsystem Makefile

subdir-ccflags-y += -Wno-override-init

subdir-ccflags-$(CONFIG_DRM_AMDGPU_WERROR) += -Werror

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

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ extern int sched_policy; 
extern bool debug_evictions;

extern bool no_system_mem_limit;

extern int halt_if_hws_hang;

extern uint amdgpu_svm_default_granularity;

#else

static const int __maybe_unused sched_policy = KFD_SCHED_POLICY_HWS;

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

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

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include <linux/module.h>

#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include "amdgpu.h"

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

+3 −9
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/pagemap.h>

#include <linux/sched/mm.h>

#include <linux/sched/task.h>

#include <linux/fdtable.h>

#include <drm/ttm/ttm_tt.h>



#include <drm/drm_exec.h>
@@ -818,18 +817,13 @@ static int kfd_mem_export_dmabuf(struct kgd_mem *mem) 
	if (!mem->dmabuf) {

		struct amdgpu_device *bo_adev;

		struct dma_buf *dmabuf;

		int r, fd;



		bo_adev = amdgpu_ttm_adev(mem->bo->tbo.bdev);

		r = drm_gem_prime_handle_to_fd(&bo_adev->ddev, bo_adev->kfd.client.file,

		dmabuf = drm_gem_prime_handle_to_dmabuf(&bo_adev->ddev, bo_adev->kfd.client.file,

					       mem->gem_handle,

			mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE ?

					       DRM_RDWR : 0, &fd);

		if (r)

			return r;

		dmabuf = dma_buf_get(fd);

		close_fd(fd);

		if (WARN_ON_ONCE(IS_ERR(dmabuf)))

					       DRM_RDWR : 0);

		if (IS_ERR(dmabuf))

			return PTR_ERR(dmabuf);

		mem->dmabuf = dmabuf;

	}

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

+17 −0
Original line number Diff line number Diff line
@@ -169,6 +169,16 @@ uint amdgpu_sdma_phase_quantum = 32; 
char *amdgpu_disable_cu;

char *amdgpu_virtual_display;

bool enforce_isolation;



/* Specifies the default granularity for SVM, used in buffer

 * migration and restoration of backing memory when handling

 * recoverable page faults.

 *

 * The value is given as log(numPages(buffer)); for a 2 MiB

 * buffer it computes to be 9

 */

uint amdgpu_svm_default_granularity = 9;



/*

 * OverDrive(bit 14) disabled by default

 * GFX DCS(bit 19) disabled by default
@@ -320,6 +330,13 @@ module_param_named(pcie_gen2, amdgpu_pcie_gen2, int, 0444); 
MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)");

module_param_named(msi, amdgpu_msi, int, 0444);



/**

 * DOC: svm_default_granularity (uint)

 * Used in buffer migration and handling of recoverable page faults

 */

MODULE_PARM_DESC(svm_default_granularity, "SVM's default granularity in log(2^Pages), default 9 = 2^9 = 2 MiB");

module_param_named(svm_default_granularity, amdgpu_svm_default_granularity, uint, 0644);



/**

 * DOC: lockup_timeout (string)

 * Set GPU scheduler timeout value in ms.