generated from archlinux/template
Compare commits
No commits in common. "388d13d3f6ed0f8de8ad3e15e60c44f231a883b2" and "dff80e9b3210d4b1e5eceb5eaf8f8c69e55b6266" have entirely different histories.
388d13d3f6
...
dff80e9b32
66
.SRCINFO
66
.SRCINFO
@ -1,66 +0,0 @@
|
|||||||
pkgbase = linux
|
|
||||||
pkgdesc = Linux
|
|
||||||
pkgver = 6.14.4.arch1
|
|
||||||
pkgrel = 2
|
|
||||||
url = https://github.com/archlinux/linux
|
|
||||||
arch = x86_64
|
|
||||||
license = GPL-2.0-only
|
|
||||||
makedepends = bc
|
|
||||||
makedepends = cpio
|
|
||||||
makedepends = gettext
|
|
||||||
makedepends = libelf
|
|
||||||
makedepends = pahole
|
|
||||||
makedepends = perl
|
|
||||||
makedepends = python
|
|
||||||
makedepends = rust
|
|
||||||
makedepends = rust-bindgen
|
|
||||||
makedepends = rust-src
|
|
||||||
makedepends = tar
|
|
||||||
makedepends = xz
|
|
||||||
makedepends = graphviz
|
|
||||||
makedepends = imagemagick
|
|
||||||
makedepends = python-sphinx
|
|
||||||
makedepends = python-yaml
|
|
||||||
makedepends = texlive-latexextra
|
|
||||||
options = !debug
|
|
||||||
options = !strip
|
|
||||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.4.tar.xz
|
|
||||||
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.14.4.tar.sign
|
|
||||||
source = https://github.com/archlinux/linux/releases/download/v6.14.4-arch1/linux-v6.14.4-arch1.patch.zst
|
|
||||||
source = https://github.com/archlinux/linux/releases/download/v6.14.4-arch1/linux-v6.14.4-arch1.patch.zst.sig
|
|
||||||
source = config
|
|
||||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
|
||||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
|
||||||
validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
|
|
||||||
sha256sums = 9452f28d7a0051fba4886712395b484c4c7fcf9f85944a62fd3d97dc923f5339
|
|
||||||
sha256sums = SKIP
|
|
||||||
sha256sums = e39c50dc9d58d817f3d27b6269f007624d69a62124e1fc4f82e93dbb1163dba9
|
|
||||||
sha256sums = SKIP
|
|
||||||
sha256sums = 869860f66c2cb1d278f08a1d4bb54d247771e9d56a92f2b95ced7ffe70d5da64
|
|
||||||
b2sums = 8f5f44fa6f7b2a964a3fb14afd10dc0c6cc5ec73eb3b6dba24d35664f7083546b70eff7a3d5a9b3ba3c8b84785518c6df91aff0ed948cd538ff0b3b0484fd613
|
|
||||||
b2sums = SKIP
|
|
||||||
b2sums = 9baa56eb0df29c3266bb1979c1924cd283ff9cab52d11407226b5967dd603983fb5a16ffca0e4938784e95272e688ad37550d78551aba193947eda13c1ffa281
|
|
||||||
b2sums = SKIP
|
|
||||||
b2sums = 63b72509117c51ea3e6e7a186bb7419716175990bb458bbf51c047bc86b06e0a0a2daee8ddf8c9e2d6c981db83ff733813411a3a3d3b86981d574e950ef3ba50
|
|
||||||
|
|
||||||
pkgname = linux
|
|
||||||
pkgdesc = The Linux kernel and modules
|
|
||||||
depends = coreutils
|
|
||||||
depends = initramfs
|
|
||||||
depends = kmod
|
|
||||||
optdepends = linux-firmware: firmware images needed for some devices
|
|
||||||
optdepends = scx-scheds: to use sched-ext schedulers
|
|
||||||
optdepends = wireless-regdb: to set the correct wireless channels of your country
|
|
||||||
provides = KSMBD-MODULE
|
|
||||||
provides = NTSYNC-MODULE
|
|
||||||
provides = VIRTUALBOX-GUEST-MODULES
|
|
||||||
provides = WIREGUARD-MODULE
|
|
||||||
replaces = virtualbox-guest-modules-arch
|
|
||||||
replaces = wireguard-arch
|
|
||||||
|
|
||||||
pkgname = linux-headers
|
|
||||||
pkgdesc = Headers and scripts for building modules for the Linux kernel
|
|
||||||
depends = pahole
|
|
||||||
|
|
||||||
pkgname = linux-docs
|
|
||||||
pkgdesc = Documentation for the Linux kernel
|
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +0,0 @@
|
|||||||
*.zst
|
|
||||||
src
|
|
||||||
*.tar.*
|
|
||||||
*.sig
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
[linux]
|
|
||||||
source = "github"
|
|
||||||
github = "archlinux/linux"
|
|
||||||
use_max_tag = true
|
|
||||||
include_regex = 'v\d+(\.\d+)*-arch\d+'
|
|
||||||
from_pattern = '-([a-z])'
|
|
||||||
to_pattern = '.\1'
|
|
||||||
prefix = "v"
|
|
||||||
264
PKGBUILD
264
PKGBUILD
@ -1,264 +0,0 @@
|
|||||||
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
|
||||||
|
|
||||||
pkgbase=linux
|
|
||||||
pkgver=6.14.4.arch1
|
|
||||||
pkgrel=2
|
|
||||||
pkgdesc='Linux'
|
|
||||||
url='https://github.com/archlinux/linux'
|
|
||||||
arch=(x86_64)
|
|
||||||
license=(GPL-2.0-only)
|
|
||||||
makedepends=(
|
|
||||||
bc
|
|
||||||
cpio
|
|
||||||
gettext
|
|
||||||
libelf
|
|
||||||
pahole
|
|
||||||
perl
|
|
||||||
python
|
|
||||||
rust
|
|
||||||
rust-bindgen
|
|
||||||
rust-src
|
|
||||||
tar
|
|
||||||
xz
|
|
||||||
|
|
||||||
# htmldocs
|
|
||||||
graphviz
|
|
||||||
imagemagick
|
|
||||||
python-sphinx
|
|
||||||
python-yaml
|
|
||||||
texlive-latexextra
|
|
||||||
)
|
|
||||||
options=(
|
|
||||||
!debug
|
|
||||||
!strip
|
|
||||||
)
|
|
||||||
_srcname=linux-${pkgver%.*}
|
|
||||||
_srctag=v${pkgver%.*}-${pkgver##*.}
|
|
||||||
source=(
|
|
||||||
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
|
|
||||||
$url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
|
|
||||||
config # the main kernel config file
|
|
||||||
)
|
|
||||||
validpgpkeys=(
|
|
||||||
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
|
|
||||||
647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman
|
|
||||||
83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig)
|
|
||||||
)
|
|
||||||
# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
|
|
||||||
sha256sums=('9452f28d7a0051fba4886712395b484c4c7fcf9f85944a62fd3d97dc923f5339'
|
|
||||||
'SKIP'
|
|
||||||
'e39c50dc9d58d817f3d27b6269f007624d69a62124e1fc4f82e93dbb1163dba9'
|
|
||||||
'SKIP'
|
|
||||||
'869860f66c2cb1d278f08a1d4bb54d247771e9d56a92f2b95ced7ffe70d5da64')
|
|
||||||
b2sums=('8f5f44fa6f7b2a964a3fb14afd10dc0c6cc5ec73eb3b6dba24d35664f7083546b70eff7a3d5a9b3ba3c8b84785518c6df91aff0ed948cd538ff0b3b0484fd613'
|
|
||||||
'SKIP'
|
|
||||||
'9baa56eb0df29c3266bb1979c1924cd283ff9cab52d11407226b5967dd603983fb5a16ffca0e4938784e95272e688ad37550d78551aba193947eda13c1ffa281'
|
|
||||||
'SKIP'
|
|
||||||
'63b72509117c51ea3e6e7a186bb7419716175990bb458bbf51c047bc86b06e0a0a2daee8ddf8c9e2d6c981db83ff733813411a3a3d3b86981d574e950ef3ba50')
|
|
||||||
|
|
||||||
export KBUILD_BUILD_HOST=archlinux
|
|
||||||
export KBUILD_BUILD_USER=$pkgbase
|
|
||||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
cd $_srcname
|
|
||||||
|
|
||||||
echo "Setting version..."
|
|
||||||
echo "-$pkgrel" > localversion.10-pkgrel
|
|
||||||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
|
||||||
|
|
||||||
local src
|
|
||||||
for src in "${source[@]}"; do
|
|
||||||
src="${src%%::*}"
|
|
||||||
src="${src##*/}"
|
|
||||||
src="${src%.zst}"
|
|
||||||
[[ $src = *.patch ]] || continue
|
|
||||||
echo "Applying patch $src..."
|
|
||||||
patch -Np1 < "../$src"
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Setting config..."
|
|
||||||
cp ../config .config
|
|
||||||
make olddefconfig
|
|
||||||
diff -u ../config .config || :
|
|
||||||
|
|
||||||
make -s kernelrelease > version
|
|
||||||
echo "Prepared $pkgbase version $(<version)"
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd $_srcname
|
|
||||||
make all
|
|
||||||
make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
|
|
||||||
make htmldocs
|
|
||||||
}
|
|
||||||
|
|
||||||
_package() {
|
|
||||||
pkgdesc="The $pkgdesc kernel and modules"
|
|
||||||
depends=(
|
|
||||||
coreutils
|
|
||||||
initramfs
|
|
||||||
kmod
|
|
||||||
)
|
|
||||||
optdepends=(
|
|
||||||
'linux-firmware: firmware images needed for some devices'
|
|
||||||
'scx-scheds: to use sched-ext schedulers'
|
|
||||||
'wireless-regdb: to set the correct wireless channels of your country'
|
|
||||||
)
|
|
||||||
provides=(
|
|
||||||
KSMBD-MODULE
|
|
||||||
NTSYNC-MODULE
|
|
||||||
VIRTUALBOX-GUEST-MODULES
|
|
||||||
WIREGUARD-MODULE
|
|
||||||
)
|
|
||||||
replaces=(
|
|
||||||
virtualbox-guest-modules-arch
|
|
||||||
wireguard-arch
|
|
||||||
)
|
|
||||||
|
|
||||||
cd $_srcname
|
|
||||||
local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
|
|
||||||
|
|
||||||
echo "Installing boot image..."
|
|
||||||
# systemd expects to find the kernel here to allow hibernation
|
|
||||||
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
|
|
||||||
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
|
|
||||||
|
|
||||||
# Used by mkinitcpio to name the kernel
|
|
||||||
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
|
|
||||||
|
|
||||||
echo "Installing modules..."
|
|
||||||
ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
|
|
||||||
DEPMOD=/doesnt/exist modules_install # Suppress depmod
|
|
||||||
|
|
||||||
# remove build link
|
|
||||||
rm "$modulesdir"/build
|
|
||||||
}
|
|
||||||
|
|
||||||
_package-headers() {
|
|
||||||
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
|
|
||||||
depends=(pahole)
|
|
||||||
|
|
||||||
cd $_srcname
|
|
||||||
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
|
|
||||||
|
|
||||||
echo "Installing build files..."
|
|
||||||
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
|
|
||||||
localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
|
|
||||||
install -Dt "$builddir/kernel" -m644 kernel/Makefile
|
|
||||||
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
|
|
||||||
cp -t "$builddir" -a scripts
|
|
||||||
ln -srt "$builddir" "$builddir/scripts/gdb/vmlinux-gdb.py"
|
|
||||||
|
|
||||||
# required when STACK_VALIDATION is enabled
|
|
||||||
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
|
|
||||||
|
|
||||||
# required when DEBUG_INFO_BTF_MODULES is enabled
|
|
||||||
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
|
|
||||||
|
|
||||||
echo "Installing headers..."
|
|
||||||
cp -t "$builddir" -a include
|
|
||||||
cp -t "$builddir/arch/x86" -a arch/x86/include
|
|
||||||
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
|
|
||||||
|
|
||||||
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
|
|
||||||
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
|
|
||||||
|
|
||||||
# https://bugs.archlinux.org/task/13146
|
|
||||||
install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
|
|
||||||
|
|
||||||
# https://bugs.archlinux.org/task/20402
|
|
||||||
install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
|
|
||||||
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
|
|
||||||
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
|
|
||||||
|
|
||||||
# https://bugs.archlinux.org/task/71392
|
|
||||||
install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
|
|
||||||
|
|
||||||
echo "Installing KConfig files..."
|
|
||||||
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
|
|
||||||
|
|
||||||
echo "Installing Rust files..."
|
|
||||||
install -Dt "$builddir/rust" -m644 rust/*.rmeta
|
|
||||||
install -Dt "$builddir/rust" rust/*.so
|
|
||||||
|
|
||||||
echo "Installing unstripped VDSO..."
|
|
||||||
make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install \
|
|
||||||
link= # Suppress build-id symlinks
|
|
||||||
|
|
||||||
echo "Removing unneeded architectures..."
|
|
||||||
local arch
|
|
||||||
for arch in "$builddir"/arch/*/; do
|
|
||||||
[[ $arch = */x86/ ]] && continue
|
|
||||||
echo "Removing $(basename "$arch")"
|
|
||||||
rm -r "$arch"
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "Removing documentation..."
|
|
||||||
rm -r "$builddir/Documentation"
|
|
||||||
|
|
||||||
echo "Removing broken symlinks..."
|
|
||||||
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
|
|
||||||
|
|
||||||
echo "Removing loose objects..."
|
|
||||||
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
|
|
||||||
|
|
||||||
echo "Stripping build tools..."
|
|
||||||
local file
|
|
||||||
while read -rd '' file; do
|
|
||||||
case "$(file -Sib "$file")" in
|
|
||||||
application/x-sharedlib\;*) # Libraries (.so)
|
|
||||||
strip -v $STRIP_SHARED "$file" ;;
|
|
||||||
application/x-archive\;*) # Libraries (.a)
|
|
||||||
strip -v $STRIP_STATIC "$file" ;;
|
|
||||||
application/x-executable\;*) # Binaries
|
|
||||||
strip -v $STRIP_BINARIES "$file" ;;
|
|
||||||
application/x-pie-executable\;*) # Relocatable binaries
|
|
||||||
strip -v $STRIP_SHARED "$file" ;;
|
|
||||||
esac
|
|
||||||
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
|
|
||||||
|
|
||||||
echo "Stripping vmlinux..."
|
|
||||||
strip -v $STRIP_STATIC "$builddir/vmlinux"
|
|
||||||
|
|
||||||
echo "Adding symlink..."
|
|
||||||
mkdir -p "$pkgdir/usr/src"
|
|
||||||
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
|
|
||||||
}
|
|
||||||
|
|
||||||
_package-docs() {
|
|
||||||
pkgdesc="Documentation for the $pkgdesc kernel"
|
|
||||||
|
|
||||||
cd $_srcname
|
|
||||||
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
|
|
||||||
|
|
||||||
echo "Installing documentation..."
|
|
||||||
local src dst
|
|
||||||
while read -rd '' src; do
|
|
||||||
dst="${src#Documentation/}"
|
|
||||||
dst="$builddir/Documentation/${dst#output/}"
|
|
||||||
install -Dm644 "$src" "$dst"
|
|
||||||
done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
|
|
||||||
|
|
||||||
echo "Adding symlink..."
|
|
||||||
mkdir -p "$pkgdir/usr/share/doc"
|
|
||||||
ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
|
|
||||||
}
|
|
||||||
|
|
||||||
pkgname=(
|
|
||||||
"$pkgbase"
|
|
||||||
"$pkgbase-headers"
|
|
||||||
"$pkgbase-docs"
|
|
||||||
)
|
|
||||||
for _p in "${pkgname[@]}"; do
|
|
||||||
eval "package_$_p() {
|
|
||||||
$(declare -f "_package${_p#$pkgbase}")
|
|
||||||
_package${_p#$pkgbase}
|
|
||||||
}"
|
|
||||||
done
|
|
||||||
|
|
||||||
source+=('bigscreenBeyond.patch')
|
|
||||||
sha256sums+=('3a86f2b023e43e91a8cf6367ff8219f73b1ffc78737adef3a9a517b5a2598c96')
|
|
||||||
b2sums+=(934a9ccf4f473e3c03d5be116cbae7355e7074313daa271b317869246fa6a20bd043701b92406bad82eec7e80d6a8b78b1c44ef1e79c1ba708b50d6c8c47c4e8)
|
|
||||||
|
|
||||||
# vim:set ts=8 sts=2 sw=2 et:
|
|
||||||
@ -1,185 +0,0 @@
|
|||||||
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
|
|
||||||
index 3b4065099..639699e3b 100644
|
|
||||||
--- a/drivers/gpu/drm/drm_edid.c
|
|
||||||
+++ b/drivers/gpu/drm/drm_edid.c
|
|
||||||
@@ -189,6 +189,9 @@ static const struct edid_quirk {
|
|
||||||
/* Rotel RSX-1058 forwards sink's EDID but only does HDMI 1.1*/
|
|
||||||
EDID_QUIRK('E', 'T', 'R', 13896, EDID_QUIRK_FORCE_8BPC),
|
|
||||||
|
|
||||||
+ /* Bigscreen Beyond Headset */
|
|
||||||
+ EDID_QUIRK('B', 'I', 'G', 0x1234, EDID_QUIRK_NON_DESKTOP),
|
|
||||||
+
|
|
||||||
/* Valve Index Headset */
|
|
||||||
EDID_QUIRK('V', 'L', 'V', 0x91a8, EDID_QUIRK_NON_DESKTOP),
|
|
||||||
EDID_QUIRK('V', 'L', 'V', 0x91b0, EDID_QUIRK_NON_DESKTOP),
|
|
||||||
|
|
||||||
From c33583995576e9ac532c4ad9e260324b1c4fa3a3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Yaroslav Bolyukin <iam@lach.pw>
|
|
||||||
Date: Sun, 30 Oct 2022 19:04:26 +0100
|
|
||||||
Subject: [PATCH 3/3] drm/amd: use fixed dsc bits-per-pixel from edid
|
|
||||||
|
|
||||||
VESA vendor header from DisplayID spec may contain fixed bit per pixel
|
|
||||||
rate, it should be respected by drm driver
|
|
||||||
|
|
||||||
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
|
|
||||||
Reviewed-by: Wayne Lin <Wayne.Lin@amd.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 ++
|
|
||||||
drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +++
|
|
||||||
2 files changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
|
|
||||||
index 38d71b5c1f2d..f2467b64268b 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
|
|
||||||
@@ -103,6 +103,8 @@ static bool dc_stream_construct(struct dc_stream_state *stream,
|
|
||||||
|
|
||||||
/* EDID CAP translation for HDMI 2.0 */
|
|
||||||
stream->timing.flags.LTE_340MCSC_SCRAMBLE = dc_sink_data->edid_caps.lte_340mcsc_scramble;
|
|
||||||
+ stream->timing.dsc_fixed_bits_per_pixel_x16 =
|
|
||||||
+ dc_sink_data->edid_caps.dsc_fixed_bits_per_pixel_x16;
|
|
||||||
|
|
||||||
memset(&stream->timing.dsc_cfg, 0, sizeof(stream->timing.dsc_cfg));
|
|
||||||
stream->timing.dsc_cfg.num_slices_h = 0;
|
|
||||||
diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
|
|
||||||
index dc78e2404b48..65915a10ab48 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
|
|
||||||
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
|
|
||||||
@@ -231,6 +231,9 @@ struct dc_edid_caps {
|
|
||||||
bool edid_hdmi;
|
|
||||||
bool hdr_supported;
|
|
||||||
|
|
||||||
+ /* DisplayPort caps */
|
|
||||||
+ uint32_t dsc_fixed_bits_per_pixel_x16;
|
|
||||||
+
|
|
||||||
struct dc_panel_patch panel_patch;
|
|
||||||
};
|
|
||||||
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
|
|
||||||
index 3b4065099..15268afa3 100644
|
|
||||||
--- a/drivers/gpu/drm/drm_edid.c
|
|
||||||
+++ b/drivers/gpu/drm/drm_edid.c
|
|
||||||
@@ -6391,7 +6391,7 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
|
|
||||||
if (oui(vesa->oui[0], vesa->oui[1], vesa->oui[2]) != VESA_IEEE_OUI)
|
|
||||||
return;
|
|
||||||
|
|
||||||
- if (sizeof(*vesa) != sizeof(*block) + block->num_bytes) {
|
|
||||||
+ if (block->num_bytes < 5) {
|
|
||||||
drm_dbg_kms(connector->dev,
|
|
||||||
"[CONNECTOR:%d:%s] Unexpected VESA vendor block size\n",
|
|
||||||
connector->base.id, connector->name);
|
|
||||||
@@ -6414,24 +6414,37 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!info->mso_stream_count) {
|
|
||||||
- info->mso_pixel_overlap = 0;
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
+ info->mso_pixel_overlap = 0;
|
|
||||||
+
|
|
||||||
+ if (info->mso_stream_count) {
|
|
||||||
+ info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso);
|
|
||||||
+
|
|
||||||
+ if (info->mso_pixel_overlap > 8) {
|
|
||||||
+ drm_dbg_kms(connector->dev,
|
|
||||||
+ "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n",
|
|
||||||
+ connector->base.id, connector->name,
|
|
||||||
+ info->mso_pixel_overlap);
|
|
||||||
+ info->mso_pixel_overlap = 8;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso);
|
|
||||||
- if (info->mso_pixel_overlap > 8) {
|
|
||||||
drm_dbg_kms(connector->dev,
|
|
||||||
- "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n",
|
|
||||||
- connector->base.id, connector->name,
|
|
||||||
- info->mso_pixel_overlap);
|
|
||||||
- info->mso_pixel_overlap = 8;
|
|
||||||
+ "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n",
|
|
||||||
+ connector->base.id, connector->name,
|
|
||||||
+ info->mso_stream_count, info->mso_pixel_overlap);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (block->num_bytes < 7) {
|
|
||||||
+ /* DSC bpp is optional */
|
|
||||||
+ return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ info->dp_dsc_bpp = FIELD_GET(DISPLAYID_VESA_DSC_BPP_INT, vesa->dsc_bpp_int) * 16 +
|
|
||||||
+ FIELD_GET(DISPLAYID_VESA_DSC_BPP_FRACT, vesa->dsc_bpp_fract);
|
|
||||||
+
|
|
||||||
drm_dbg_kms(connector->dev,
|
|
||||||
- "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n",
|
|
||||||
- connector->base.id, connector->name,
|
|
||||||
- info->mso_stream_count, info->mso_pixel_overlap);
|
|
||||||
+ "[CONNECTOR:%d:%s] DSC bits per pixel %u\n",
|
|
||||||
+ connector->base.id, connector->name,
|
|
||||||
+ info->dp_dsc_bpp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void drm_update_mso(struct drm_connector *connector,
|
|
||||||
@@ -6479,6 +6492,7 @@ static void drm_reset_display_info(struct drm_connector *connector)
|
|
||||||
info->mso_stream_count = 0;
|
|
||||||
info->mso_pixel_overlap = 0;
|
|
||||||
info->max_dsc_bpp = 0;
|
|
||||||
+ info->dp_dsc_bpp = 0;
|
|
||||||
|
|
||||||
kfree(info->vics);
|
|
||||||
info->vics = NULL;
|
|
||||||
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
|
|
||||||
index fe88d7fc6..1de1d1726 100644
|
|
||||||
--- a/include/drm/drm_connector.h
|
|
||||||
+++ b/include/drm/drm_connector.h
|
|
||||||
@@ -803,6 +803,12 @@ struct drm_display_info {
|
|
||||||
*/
|
|
||||||
u32 max_dsc_bpp;
|
|
||||||
|
|
||||||
+ /**
|
|
||||||
+ * @dp_dsc_bpp: DP Display-Stream-Compression (DSC) timing's target
|
|
||||||
+ * DST bits per pixel in 6.4 fixed point format. 0 means undefined
|
|
||||||
+ */
|
|
||||||
+ u16 dp_dsc_bpp;
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* @vics: Array of vics_len VICs. Internal to EDID parsing.
|
|
||||||
*/
|
|
||||||
diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h
|
|
||||||
index 566497eeb..3a4bd0816 100644
|
|
||||||
--- a/drivers/gpu/drm/drm_displayid_internal.h
|
|
||||||
+++ b/drivers/gpu/drm/drm_displayid_internal.h
|
|
||||||
@@ -131,12 +131,16 @@ struct displayid_detailed_timing_block {
|
|
||||||
|
|
||||||
#define DISPLAYID_VESA_MSO_OVERLAP GENMASK(3, 0)
|
|
||||||
#define DISPLAYID_VESA_MSO_MODE GENMASK(6, 5)
|
|
||||||
+#define DISPLAYID_VESA_DSC_BPP_INT GENMASK(5, 0)
|
|
||||||
+#define DISPLAYID_VESA_DSC_BPP_FRACT GENMASK(3, 0)
|
|
||||||
|
|
||||||
struct displayid_vesa_vendor_specific_block {
|
|
||||||
struct displayid_block base;
|
|
||||||
u8 oui[3];
|
|
||||||
u8 data_structure_type;
|
|
||||||
u8 mso;
|
|
||||||
+ u8 dsc_bpp_int;
|
|
||||||
+ u8 dsc_bpp_fract;
|
|
||||||
} __packed;
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
|
|
||||||
index 2c36f3d00ca2..322059dca3ae 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
|
|
||||||
@@ -122,6 +122,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
|
|
||||||
|
|
||||||
edid_caps->edid_hdmi = connector->display_info.is_hdmi;
|
|
||||||
|
|
||||||
+ edid_caps->dsc_fixed_bits_per_pixel_x16 = connector->display_info.dp_dsc_bpp;
|
|
||||||
+
|
|
||||||
apply_edid_quirks(edid_buf, edid_caps);
|
|
||||||
|
|
||||||
sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads);
|
|
||||||
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
||||||
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
|
|
||||||
=Xuim
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
||||||
mDMEZXeS9hYJKwYBBAHaRw8BAQdAT04Na8ee0UltkhyNi2RGHYdjZDgg+X/K8Jix
|
|
||||||
dSSQ+Ni0OEphbiBBbGV4YW5kZXIgU3RlZmZlbnMgKGhlZnRpZykgPGphbi5zdGVm
|
|
||||||
ZmVuc0BnbWFpbC5jb20+iJMEExYKADsCGwMCF4ACGQEWIQSDvIiJNRtd67toQW64
|
|
||||||
rAhgDxCM3wUCZar+QgULCQgHAwUVCgkICwUWAgMBAAIeBQAKCRC4rAhgDxCM37JI
|
|
||||||
AP48j30kmwVbPYJpLd6fGNQwJYlkm9JX0bUWqZ5Mq0f3mgD+KyZVGMFvBsKsMMSx
|
|
||||||
lUgrc15HJHKGJYhUVdaLH8qcfgK0NkphbiBBbGV4YW5kZXIgU3RlZmZlbnMgKGhl
|
|
||||||
ZnRpZykgPGhlZnRpZ0BhcmNobGludXgub3JnPoiQBBMWCgA4AhsDAheAFiEEg7yI
|
|
||||||
iTUbXeu7aEFuuKwIYA8QjN8FAmWq/kcFCwkIBwMFFQoJCAsFFgIDAQACHgUACgkQ
|
|
||||||
uKwIYA8QjN+2qAEAh/RLZq7Hmqv/z09yq0m6IEb0kbXaW50POi/V+2VcJ9wBAN5I
|
|
||||||
k/fFgnGMlvZF7Rugu37o2fk7jnUVsWJca9QmytgGuDgEZXeS9hIKKwYBBAGXVQEF
|
|
||||||
AQEHQOH/sK5tCH8xps4Orchyip4ZTMQZQ9TwZcJWsOY8eKFZAwEIB4h4BBgWCgAg
|
|
||||||
FiEEg7yIiTUbXeu7aEFuuKwIYA8QjN8FAmV3kvYCGwwACgkQuKwIYA8QjN9qjQD8
|
|
||||||
CIk8HiKCLIeM+BHw6kqHg3P6nCYWsP+PmXZgLReLZ04A/iMsMRrVUI02Gru9YDxK
|
|
||||||
pSNqt4HMenCUbY5tTBjE5GMFuDMEZXeUSxYJKwYBBAHaRw8BAQdAkvIbYwde3OFq
|
|
||||||
oAy6QOO9BPwFNCll8tgQ6iAmQMkOjtWIeAQYFgoAIBYhBIO8iIk1G13ru2hBbris
|
|
||||||
CGAPEIzfBQJld5RLAhsgAAoJELisCGAPEIzfhU8A/3NZzIEk3dmCAL0XLtylcFp/
|
|
||||||
HExnN+5QRGmT0+SzzuGaAP9ozoMlSjtcGLAZMglLk8/mYzKveR89RJlB0cZtUU6U
|
|
||||||
Ag==
|
|
||||||
=aji+
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
||||||
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
|
|
||||||
=d8eq
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
git remote add upstream https://gitlab.archlinux.org/archlinux/packaging/packages/linux.git
|
git remote add aur https://aur.archlinux.org/REPO_NAME.git
|
||||||
git fetch upstream
|
git fetch aur
|
||||||
git merge -X theirs --no-edit upstream/main
|
git merge -X theirs --no-edit aur/master
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user