diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-04-14 10:14:55 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-04-14 10:14:55 +0000 |
| commit | 9f7b0921603520095dd22535e96859917ee7ed2a (patch) | |
| tree | 97b1df96a36c7959c2dd1bd53d7769ac0b604927 /sys/dev/pci/drm/radeon/vce_v1_0.c | |
| parent | 1385ee84a74b2316b691d76fe5282b8aa4568a0a (diff) | |
Update shared drm code, inteldrm(4) and radeondrm(4) from linux 4.4 to
linux 4.19.34.
Adds support for more Intel hardware:
Broxton/Apollo Lake (was is_preliminary in 4.4)
Amber Lake (another Kaby Lake refresh)
Gemini Lake
Coffee Lake
Whiskey Lake
Cannon Lake (though no hardware with Intel graphics ever shipped)
Ice Lake (alpha support, hardware not released)
This does not add support for new radeon hardware on the AMD side as
newer radeons have a different kernel driver (amdgpu).
Thanks to the OpenBSD Foundation for sponsoring this work, kettenis@ for
helping and a bunch of other developers for testing.
Diffstat (limited to 'sys/dev/pci/drm/radeon/vce_v1_0.c')
| -rw-r--r-- | sys/dev/pci/drm/radeon/vce_v1_0.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/radeon/vce_v1_0.c b/sys/dev/pci/drm/radeon/vce_v1_0.c index 391555d8f96..f541a4b5ac5 100644 --- a/sys/dev/pci/drm/radeon/vce_v1_0.c +++ b/sys/dev/pci/drm/radeon/vce_v1_0.c @@ -25,7 +25,8 @@ * Authors: Christian König <christian.koenig@amd.com> */ -#include <dev/pci/drm/drmP.h> +#include <linux/firmware.h> +#include <drm/drmP.h> #include "radeon.h" #include "radeon_asic.h" #include "sid.h" @@ -195,7 +196,7 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data) memset(&data[5], 0, 44); memcpy(&data[16], &sign[1], rdev->vce_fw->size - sizeof(*sign)); - data += le32_to_cpu(data[4]) / 4; + data += (le32_to_cpu(sign->len) + 64) / 4; data[0] = sign->val[i].sigval[0]; data[1] = sign->val[i].sigval[1]; data[2] = sign->val[i].sigval[2]; |