mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 22:20:51 +00:00
Merge #18861: add AMDGPU-PRO driver
This commit is contained in:
Vladimír Čunát
commit
9d1dfc9ed0
|
|
@ -95,6 +95,7 @@
|
|||
codyopel = "Cody Opel <codyopel@gmail.com>";
|
||||
colemickens = "Cole Mickens <cole.mickens@gmail.com>";
|
||||
copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
|
||||
corngood = "David McFarland <corngood@gmail.com>";
|
||||
coroa = "Jonas Hörsch <jonas@chaoflow.net>";
|
||||
couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
|
||||
cransom = "Casey Ransom <cransom@hubns.net>";
|
||||
|
|
|
|||
56
nixos/modules/hardware/video/amdgpu-pro.nix
Normal file
56
nixos/modules/hardware/video/amdgpu-pro.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
# This module provides the proprietary AMDGPU-PRO drivers.
|
||||
|
||||
{ config, lib, pkgs, pkgs_i686, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
drivers = config.services.xserver.videoDrivers;
|
||||
|
||||
enabled = elem "amdgpu-pro" drivers;
|
||||
|
||||
package = config.boot.kernelPackages.amdgpu-pro;
|
||||
package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
|
||||
|
||||
opengl = config.hardware.opengl;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
config = mkIf enabled {
|
||||
|
||||
services.xserver.drivers = singleton
|
||||
{ name = "amdgpu"; modules = [ package ]; libPath = [ package ]; };
|
||||
|
||||
hardware.opengl.package = package;
|
||||
hardware.opengl.package32 = package32;
|
||||
|
||||
boot.extraModulePackages = [ package ];
|
||||
|
||||
boot.blacklistedKernelModules = [ "radeon" ];
|
||||
|
||||
hardware.firmware = [ package ];
|
||||
|
||||
system.activationScripts.setup-amdgpu-pro = ''
|
||||
mkdir -p /run/lib
|
||||
ln -sfn ${package}/lib ${package.libCompatDir}
|
||||
'' + optionalString opengl.driSupport32Bit ''
|
||||
ln -sfn ${package32}/lib ${package32.libCompatDir}
|
||||
'';
|
||||
|
||||
environment.etc = {
|
||||
"amd/amdrc".source = package + "/etc/amd/amdrc";
|
||||
"amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb";
|
||||
"gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf";
|
||||
"OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd";
|
||||
"vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json";
|
||||
} // optionalAttrs opengl.driSupport32Bit {
|
||||
"OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd";
|
||||
"vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
./hardware/opengl.nix
|
||||
./hardware/pcmcia.nix
|
||||
./hardware/video/amdgpu.nix
|
||||
./hardware/video/amdgpu-pro.nix
|
||||
./hardware/video/ati.nix
|
||||
./hardware/video/bumblebee.nix
|
||||
./hardware/video/displaylink.nix
|
||||
|
|
|
|||
155
pkgs/os-specific/linux/amdgpu-pro/default.nix
Normal file
155
pkgs/os-specific/linux/amdgpu-pro/default.nix
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
{ stdenv, fetchurl, elfutils, mesa_noglu
|
||||
, xorg, patchelf, openssl, libdrm, libudev
|
||||
, libxcb, libxshmfence, epoxy, perl, zlib
|
||||
, libsOnly ? false, kernel ? null
|
||||
}:
|
||||
|
||||
assert (!libsOnly) -> kernel != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
kernelDir = if libsOnly then null else kernel.dev;
|
||||
|
||||
inherit (mesa_noglu) driverLink;
|
||||
|
||||
bitness = if stdenv.is64bit then "64" else "32";
|
||||
|
||||
libArch =
|
||||
if stdenv.system == "i686-linux" then
|
||||
"i386-linux-gnu"
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
"x86_64-linux-gnu"
|
||||
else throw "amdgpu-pro is Linux only. Sorry. The build was stopped.";
|
||||
|
||||
libReplaceDir = "/usr/lib/${libArch}";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
version = "16.30";
|
||||
pname = "amdgpu-pro";
|
||||
build = "16.30.3-315407";
|
||||
|
||||
libCompatDir = "/run/lib/${libArch}";
|
||||
|
||||
name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}");
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://www2.ati.com/drivers/linux/amdgpu-pro_${build}.tar.xz";
|
||||
sha256 = "97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354";
|
||||
curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
|
||||
inherit libsOnly;
|
||||
|
||||
postUnpack = ''
|
||||
cd $sourceRoot
|
||||
mkdir root
|
||||
cd root
|
||||
for deb in ../*.deb; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done
|
||||
sourceRoot=.
|
||||
'';
|
||||
|
||||
modulePatches = [
|
||||
./patches/0001-add-OS-detection-for-arch.patch
|
||||
./patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
|
||||
./patches/0003-add-kcl_drm_gem_object_lookup.patch
|
||||
./patches/0004-paging-changes-for-linux-4.6.patch
|
||||
./patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch
|
||||
./patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
|
||||
./patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
|
||||
./patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
|
||||
./patches/0009-disable-dal-by-default.patch
|
||||
./patches/0010-remove-dependency-on-System.map.patch
|
||||
];
|
||||
|
||||
patchPhase = optionalString (!libsOnly) ''
|
||||
pushd usr/src/amdgpu-pro-${build}
|
||||
for patch in $modulePatches; do echo $patch; patch -p1 < $patch; done
|
||||
popd
|
||||
'';
|
||||
|
||||
preBuild = optionalString (!libsOnly) ''
|
||||
makeFlags="$makeFlags M=$(pwd)/usr/src/amdgpu-pro-${build}"
|
||||
'';
|
||||
|
||||
postBuild = optionalString (!libsOnly) ''
|
||||
xz usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko
|
||||
'';
|
||||
|
||||
makeFlags = optionalString (!libsOnly)
|
||||
"-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules";
|
||||
|
||||
depLibPath = makeLibraryPath [
|
||||
stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib
|
||||
xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r usr/bin $out/bin
|
||||
cp -r etc $out/etc
|
||||
cp -r usr/include $out/include
|
||||
cp -r usr/lib/${libArch} $out/lib
|
||||
mv $out/lib/amdgpu-pro/* $out/lib/
|
||||
rmdir $out/lib/amdgpu-pro
|
||||
cp -r usr/share $out/share
|
||||
'' + optionalString (!libsOnly) ''
|
||||
if [ -d $out/lib/xorg ]; then
|
||||
rm $out/lib/xorg
|
||||
mv $out/lib/1.18 $out/lib/xorg
|
||||
rm -r $out/lib/1.*
|
||||
fi
|
||||
cp -r lib/firmware $out/lib/firmware
|
||||
mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz
|
||||
cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz
|
||||
'' + ''
|
||||
interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
libPath="$out/lib:$out/lib/gbm:$depLibPath"
|
||||
echo patching with $interpreter $libPath
|
||||
for prog in "$out"/bin/*; do
|
||||
echo patching program $prog
|
||||
patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$prog"
|
||||
done
|
||||
for lib in `find "$out/lib/" -name '*.so*'`; do
|
||||
echo patching library $lib
|
||||
patchelf --set-rpath "$libPath" "$lib"
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = assert (stringLength libReplaceDir == stringLength libCompatDir); ''
|
||||
libPath="$out/lib:$out/lib/gbm:$depLibPath"
|
||||
for lib in libgbm.so.1.0.0 ${optionalString (!libsOnly) "xorg/modules/drivers/amdgpu_drv.so"} amdvlk${bitness}.so vdpau/libvdpau_amdgpu.so; do
|
||||
if [ -e "$out/lib/$lib" ]; then
|
||||
patchelf --set-rpath "$libPath" "$out/lib/$lib"
|
||||
fi
|
||||
done
|
||||
for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do
|
||||
if [ -e "$out/lib/$lib" ]; then
|
||||
perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
|
||||
fi
|
||||
done
|
||||
substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
patchelf
|
||||
perl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "AMDGPU-PRO drivers";
|
||||
homepage = http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx ;
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ corngood ];
|
||||
# Copied from the nvidia default.nix to prevent a store collision.
|
||||
priority = 4;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Sun, 21 Aug 2016 16:30:25 -0300
|
||||
Subject: [PATCH 1/8] add OS detection for arch
|
||||
|
||||
---
|
||||
amd/backport/Makefile | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/amd/backport/Makefile b/amd/backport/Makefile
|
||||
index 0c285ef..6447a15 100644
|
||||
--- a/amd/backport/Makefile
|
||||
+++ b/amd/backport/Makefile
|
||||
@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME))
|
||||
ccflags-y += -DOS_NAME_UBUNTU
|
||||
else ifeq ("steamos",$(OS_NAME))
|
||||
ccflags-y += -DOS_NAME_STEAMOS
|
||||
+else ifeq ("arch",$(OS_NAME))
|
||||
+ccflags-y += -DOS_NAME_ARCH
|
||||
+OS_VERSION = "0.0"
|
||||
else
|
||||
ccflags-y += -DOS_NAME_UNKNOWN
|
||||
endif
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Sun, 21 Aug 2016 16:31:12 -0300
|
||||
Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7
|
||||
|
||||
---
|
||||
amd/backport/include/kcl/kcl_ttm.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h
|
||||
index 3575004..0d1560d 100644
|
||||
--- a/amd/backport/include/kcl/kcl_ttm.h
|
||||
+++ b/amd/backport/include/kcl/kcl_ttm.h
|
||||
@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo,
|
||||
bool interruptible, bool no_wait,
|
||||
struct ww_acquire_ctx *ticket)
|
||||
{
|
||||
-#if defined(BUILD_AS_DKMS)
|
||||
+#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
|
||||
return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket);
|
||||
#else
|
||||
return ttm_bo_reserve(bo, interruptible, no_wait, ticket);
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,204 @@
|
|||
From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Sun, 21 Aug 2016 16:37:34 -0300
|
||||
Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup
|
||||
|
||||
---
|
||||
amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++
|
||||
amd/amdgpu/amdgpu_bo_list.c | 2 +-
|
||||
amd/amdgpu/amdgpu_cs.c | 2 +-
|
||||
amd/amdgpu/amdgpu_display.c | 2 +-
|
||||
amd/amdgpu/amdgpu_gem.c | 10 +++++-----
|
||||
amd/amdgpu/dce_v10_0.c | 2 +-
|
||||
amd/amdgpu/dce_v11_0.c | 2 +-
|
||||
amd/amdgpu/dce_v8_0.c | 2 +-
|
||||
amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++
|
||||
amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +-
|
||||
10 files changed, 27 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c
|
||||
index cc9b998..7e47478 100644
|
||||
--- a/amd/amdgpu/amdgpu_atpx_handler.c
|
||||
+++ b/amd/amdgpu/amdgpu_atpx_handler.c
|
||||
@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void)
|
||||
if (!r)
|
||||
return;
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
||||
+ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0);
|
||||
+#else
|
||||
vga_switcheroo_register_handler(&amdgpu_atpx_handler);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c
|
||||
index 35d0856..1d163ec 100644
|
||||
--- a/amd/amdgpu/amdgpu_bo_list.c
|
||||
+++ b/amd/amdgpu/amdgpu_bo_list.c
|
||||
@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
|
||||
struct amdgpu_bo *bo;
|
||||
struct mm_struct *usermm;
|
||||
|
||||
- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
|
||||
+ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
|
||||
if (!gobj) {
|
||||
r = -ENOENT;
|
||||
goto error_free;
|
||||
diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c
|
||||
index d16ed26..b0390b5 100644
|
||||
--- a/amd/amdgpu/amdgpu_cs.c
|
||||
+++ b/amd/amdgpu/amdgpu_cs.c
|
||||
@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
|
||||
{
|
||||
struct drm_gem_object *gobj;
|
||||
|
||||
- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
|
||||
+ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp,
|
||||
data->handle);
|
||||
if (gobj == NULL)
|
||||
return -EINVAL;
|
||||
diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c
|
||||
index 46326b3..9b5441f 100644
|
||||
--- a/amd/amdgpu/amdgpu_display.c
|
||||
+++ b/amd/amdgpu/amdgpu_display.c
|
||||
@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
|
||||
struct amdgpu_framebuffer *amdgpu_fb;
|
||||
int ret;
|
||||
|
||||
- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
|
||||
+ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
|
||||
if (obj == NULL) {
|
||||
dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
|
||||
"can't create framebuffer\n", mode_cmd->handles[0]);
|
||||
diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c
|
||||
index 0069aec..d10c282 100644
|
||||
--- a/amd/amdgpu/amdgpu_gem.c
|
||||
+++ b/amd/amdgpu/amdgpu_gem.c
|
||||
@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
|
||||
struct drm_gem_object *gobj;
|
||||
struct amdgpu_bo *robj;
|
||||
|
||||
- gobj = drm_gem_object_lookup(dev, filp, handle);
|
||||
+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
|
||||
if (gobj == NULL) {
|
||||
return -ENOENT;
|
||||
}
|
||||
@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
|
||||
int r = 0;
|
||||
long ret;
|
||||
|
||||
- gobj = drm_gem_object_lookup(dev, filp, handle);
|
||||
+ gobj = kcl_drm_gem_object_lookup(dev, filp, handle);
|
||||
if (gobj == NULL) {
|
||||
return -ENOENT;
|
||||
}
|
||||
@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
|
||||
int r = -1;
|
||||
|
||||
DRM_DEBUG("%d \n", args->handle);
|
||||
- gobj = drm_gem_object_lookup(dev, filp, args->handle);
|
||||
+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
|
||||
if (gobj == NULL)
|
||||
return -ENOENT;
|
||||
robj = gem_to_amdgpu_bo(gobj);
|
||||
@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- gobj = drm_gem_object_lookup(dev, filp, args->handle);
|
||||
+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
|
||||
if (gobj == NULL)
|
||||
return -ENOENT;
|
||||
rbo = gem_to_amdgpu_bo(gobj);
|
||||
@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
|
||||
struct amdgpu_bo *robj;
|
||||
int r;
|
||||
|
||||
- gobj = drm_gem_object_lookup(dev, filp, args->handle);
|
||||
+ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle);
|
||||
if (gobj == NULL) {
|
||||
return -ENOENT;
|
||||
}
|
||||
diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c
|
||||
index 7554dd7..6d38754 100644
|
||||
--- a/amd/amdgpu/dce_v10_0.c
|
||||
+++ b/amd/amdgpu/dce_v10_0.c
|
||||
@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
if (!obj) {
|
||||
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
|
||||
return -ENOENT;
|
||||
diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c
|
||||
index d9c9b88..93dbc1a 100644
|
||||
--- a/amd/amdgpu/dce_v11_0.c
|
||||
+++ b/amd/amdgpu/dce_v11_0.c
|
||||
@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
if (!obj) {
|
||||
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
|
||||
return -ENOENT;
|
||||
diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c
|
||||
index 7a027ce..c56a298 100644
|
||||
--- a/amd/amdgpu/dce_v8_0.c
|
||||
+++ b/amd/amdgpu/dce_v8_0.c
|
||||
@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
if (!obj) {
|
||||
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
|
||||
return -ENOENT;
|
||||
diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h
|
||||
index a65ee25..5a8a7b3 100644
|
||||
--- a/amd/backport/include/kcl/kcl_drm.h
|
||||
+++ b/amd/backport/include/kcl/kcl_drm.h
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <drm/drmP.h>
|
||||
+#include <drm/drm_gem.h>
|
||||
|
||||
#if defined(BUILD_AS_DKMS)
|
||||
extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
|
||||
@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr
|
||||
#endif
|
||||
}
|
||||
|
||||
+static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev,
|
||||
+ struct drm_file *filp,
|
||||
+ u32 handle) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
|
||||
+ return drm_gem_object_lookup(filp, handle);
|
||||
+#else
|
||||
+ return drm_gem_object_lookup(dev, filp, handle);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
#endif /* AMDGPU_BACKPORT_KCL_DRM_H */
|
||||
diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
|
||||
index 3f357a5..2e2d2e6 100644
|
||||
--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
|
||||
+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
|
||||
@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new(
|
||||
|
||||
amdgpu_crtc = to_amdgpu_crtc(crtc);
|
||||
|
||||
- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
+ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle);
|
||||
|
||||
if (!obj) {
|
||||
DRM_ERROR(
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Sun, 21 Aug 2016 16:40:32 -0300
|
||||
Subject: [PATCH 4/8] paging changes for linux-4.6
|
||||
|
||||
---
|
||||
amd/amdgpu/amdgpu_ttm.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
|
||||
index 7bdebde..8b676c2 100644
|
||||
--- a/amd/amdgpu/amdgpu_ttm.c
|
||||
+++ b/amd/amdgpu/amdgpu_ttm.c
|
||||
@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)
|
||||
list_add(&guptask.list, >t->guptasks);
|
||||
spin_unlock(>t->guptasklock);
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
||||
+ r = get_user_pages(userptr, num_pages, write, 0, p, NULL);
|
||||
+#else
|
||||
r = get_user_pages(current, current->mm, userptr, num_pages,
|
||||
- write, 0, p, NULL);
|
||||
+ write, 0, p, NULL);
|
||||
+#endif
|
||||
|
||||
spin_lock(>t->guptasklock);
|
||||
list_del(&guptask.list);
|
||||
@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
|
||||
set_page_dirty(page);
|
||||
|
||||
mark_page_accessed(page);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
|
||||
+ put_page(page);
|
||||
+#else
|
||||
page_cache_release(page);
|
||||
+#endif
|
||||
}
|
||||
|
||||
sg_free_table(ttm->sg);
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001
|
||||
From: "Luke A. Guest" <laguest@archeia.com>
|
||||
Date: Mon, 4 Jul 2016 19:19:45 +0100
|
||||
Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x
|
||||
|
||||
---
|
||||
amd/amdgpu/amdgpu_ttm.c | 4 ++--
|
||||
amd/backport/kcl_ttm.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
|
||||
index 8b676c2..752d065 100644
|
||||
--- a/amd/amdgpu/amdgpu_ttm.c
|
||||
+++ b/amd/amdgpu/amdgpu_ttm.c
|
||||
@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
|
||||
return flags;
|
||||
}
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
|
||||
|
||||
static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
|
||||
{
|
||||
@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
|
||||
.fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
|
||||
.io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
|
||||
.io_mem_free = &amdgpu_ttm_io_mem_free,
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
|
||||
.lru_removal = &amdgpu_ttm_lru_removal,
|
||||
.lru_tail = &amdgpu_ttm_lru_tail,
|
||||
.swap_lru_tail = &amdgpu_ttm_swap_lru_tail,
|
||||
diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c
|
||||
index 24f7a83..1a2cb7b 100644
|
||||
--- a/amd/backport/kcl_ttm.c
|
||||
+++ b/amd/backport/kcl_ttm.c
|
||||
@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo)
|
||||
{
|
||||
int put_count = 0;
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
|
||||
struct ttm_bo_device *bdev = bo->bdev;
|
||||
|
||||
if (bdev->driver->lru_removal)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001
|
||||
From: "Luke A. Guest" <laguest@archeia.com>
|
||||
Date: Mon, 4 Jul 2016 19:30:08 +0100
|
||||
Subject: [PATCH 6/8] Change name of vblank_disable_allowed to
|
||||
vblank_disable_immediate under 4.7.x.
|
||||
|
||||
---
|
||||
amd/amdgpu/amdgpu_irq.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c
|
||||
index d13865a..5cfa69f 100644
|
||||
--- a/amd/amdgpu/amdgpu_irq.c
|
||||
+++ b/amd/amdgpu/amdgpu_irq.c
|
||||
@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
|
||||
INIT_WORK(&adev->hotplug_work,
|
||||
amdgpu_hotplug_work_func);
|
||||
}
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
|
||||
+ adev->ddev->vblank_disable_immediate = true;
|
||||
+#else
|
||||
adev->ddev->vblank_disable_allowed = true;
|
||||
+#endif
|
||||
|
||||
INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func);
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001
|
||||
From: "Luke A. Guest" <laguest@archeia.com>
|
||||
Date: Mon, 4 Jul 2016 19:41:08 +0100
|
||||
Subject: [PATCH 7/8] Remove connector parameter from
|
||||
__drm_atomic_helper_connector_destroy_state for 4.7.x kernels.
|
||||
|
||||
---
|
||||
amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
|
||||
index 2e2d2e6..cd34607 100644
|
||||
--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c
|
||||
+++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c
|
||||
@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state(
|
||||
struct dm_connector_state *dm_state =
|
||||
to_dm_connector_state(state);
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
|
||||
+ __drm_atomic_helper_connector_destroy_state(state);
|
||||
+#else
|
||||
__drm_atomic_helper_connector_destroy_state(connector, state);
|
||||
+#endif
|
||||
|
||||
kfree(dm_state);
|
||||
}
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Sun, 21 Aug 2016 16:58:45 -0300
|
||||
Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error
|
||||
|
||||
---
|
||||
amd/dal/dc/calcs/bandwidth_calcs.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c
|
||||
index 8a19139..c4ededd 100644
|
||||
--- a/amd/dal/dc/calcs/bandwidth_calcs.c
|
||||
+++ b/amd/dal/dc/calcs/bandwidth_calcs.c
|
||||
@@ -3181,7 +3181,7 @@ static void calculate_bandwidth(
|
||||
bw_int_to_fixed(
|
||||
2),
|
||||
vbios->mcifwrmc_urgent_latency),
|
||||
- results->dmif_burst_time[i][j]),
|
||||
+ results->dmif_burst_time[results->y_clk_level][results->sclk_level]),
|
||||
results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])),
|
||||
results->dispclk),
|
||||
bw_int_to_fixed(
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Thu, 25 Aug 2016 22:17:06 -0300
|
||||
Subject: [PATCH] disable dal by default
|
||||
|
||||
---
|
||||
amd/amdgpu/amdgpu_drv.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c
|
||||
index 793528b..9a4dfcc 100644
|
||||
--- a/amd/amdgpu/amdgpu_drv.c
|
||||
+++ b/amd/amdgpu/amdgpu_drv.c
|
||||
@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1;
|
||||
int amdgpu_vm_fault_stop = 0;
|
||||
int amdgpu_vm_debug = 0;
|
||||
int amdgpu_exp_hw_support = 0;
|
||||
-int amdgpu_dal = -1;
|
||||
+int amdgpu_dal = 0;
|
||||
int amdgpu_sched_jobs = 32;
|
||||
int amdgpu_sched_hw_submission = 2;
|
||||
int amdgpu_powerplay = -1;
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Thu, 25 Aug 2016 23:08:02 -0300
|
||||
Subject: [PATCH] remove dependency on System.map
|
||||
|
||||
---
|
||||
amd/backport/Makefile | 3 +--
|
||||
amd/backport/kcl_fence.c | 10 ++++++++--
|
||||
amd/backport/symbols | 3 ---
|
||||
dkms.conf | 1 -
|
||||
pre-build.sh | 32 --------------------------------
|
||||
5 files changed, 9 insertions(+), 40 deletions(-)
|
||||
delete mode 100644 amd/backport/symbols
|
||||
delete mode 100755 pre-build.sh
|
||||
|
||||
diff --git a/amd/backport/Makefile b/amd/backport/Makefile
|
||||
index 6447a15..4682e0f 100644
|
||||
--- a/amd/backport/Makefile
|
||||
+++ b/amd/backport/Makefile
|
||||
@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7
|
||||
endif
|
||||
endif
|
||||
|
||||
-BACKPORT_OBJS = symbols.o
|
||||
endif
|
||||
|
||||
-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
|
||||
+BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o
|
||||
|
||||
amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS))
|
||||
|
||||
diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c
|
||||
index 2141eef..ceef1fe 100644
|
||||
--- a/amd/backport/kcl_fence.c
|
||||
+++ b/amd/backport/kcl_fence.c
|
||||
@@ -22,8 +22,14 @@ struct default_wait_cb {
|
||||
struct task_struct *task;
|
||||
};
|
||||
|
||||
-extern void
|
||||
-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb);
|
||||
+static void
|
||||
+fence_default_wait_cb(struct fence *fence, struct fence_cb *cb)
|
||||
+{
|
||||
+ struct default_wait_cb *wait =
|
||||
+ container_of(cb, struct default_wait_cb, base);
|
||||
+
|
||||
+ wake_up_process(wait->task);
|
||||
+}
|
||||
|
||||
signed long
|
||||
_kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count,
|
||||
diff --git a/amd/backport/symbols b/amd/backport/symbols
|
||||
deleted file mode 100644
|
||||
index 2d3f2ee..0000000
|
||||
--- a/amd/backport/symbols
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-SYMS=""
|
||||
-
|
||||
-SYMS+="fence_default_wait_cb"
|
||||
diff --git a/dkms.conf b/dkms.conf
|
||||
index 9ca148e..36be480 100644
|
||||
--- a/dkms.conf
|
||||
+++ b/dkms.conf
|
||||
@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu"
|
||||
BUILT_MODULE_LOCATION[0]="amd/amdgpu"
|
||||
DEST_MODULE_LOCATION[0]="/extra"
|
||||
AUTOINSTALL="yes"
|
||||
-PRE_BUILD="pre-build.sh $kernelver"
|
||||
\ No newline at end of file
|
||||
diff --git a/pre-build.sh b/pre-build.sh
|
||||
deleted file mode 100755
|
||||
index 88ec680..0000000
|
||||
--- a/pre-build.sh
|
||||
+++ /dev/null
|
||||
@@ -1,32 +0,0 @@
|
||||
-#!/bin/bash
|
||||
-
|
||||
-KERNELVER=$1
|
||||
-KERNELVER_BASE=${KERNELVER%%-*}
|
||||
-
|
||||
-version_lt () {
|
||||
- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
|
||||
- [ "$1" != "$newest" ]
|
||||
-}
|
||||
-
|
||||
-version_ge () {
|
||||
- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1)
|
||||
- [ "$1" = "$newest" ]
|
||||
-}
|
||||
-
|
||||
-version_gt () {
|
||||
- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
|
||||
- [ "$1" != "$oldest" ]
|
||||
-}
|
||||
-
|
||||
-version_le () {
|
||||
- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1)
|
||||
- [ "$1" = "$oldest" ]
|
||||
-}
|
||||
-
|
||||
-source amd/backport/symbols
|
||||
-
|
||||
-echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c
|
||||
-for sym in $SYMS; do
|
||||
- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}')
|
||||
- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c
|
||||
-done
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -10876,6 +10876,8 @@ in
|
|||
|
||||
acpi_call = callPackage ../os-specific/linux/acpi-call {};
|
||||
|
||||
amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
|
||||
|
||||
batman_adv = callPackage ../os-specific/linux/batman-adv {};
|
||||
|
||||
bcc = callPackage ../os-specific/linux/bcc { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue