mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
Merge pull request #5273 from HiassofT/le10-kernel-5.10.25
linux (RPi): update to 5.10.25
This commit is contained in:
commit
1d70052d6d
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="57e7fd133f6e409fe0e55a1e5f277b3909b9f4de"
|
||||
PKG_SHA256="bbc609a681dc757fefb61389b6e88bb187d242964aa8774123d01e41756f4b4d"
|
||||
PKG_VERSION="f9d853415a9ade3458d55f9153d88317dbad4d9b"
|
||||
PKG_SHA256="daa17f1db52d9892ae5c01bab24e6e719bf694e50e9e295145f4a8c5d37ac485"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
@ -22,8 +22,8 @@ case "${LINUX}" in
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="13c43880f2ee6db7d26949cb6a3e8db1a4b76736" # 5.10.23
|
||||
PKG_SHA256="cfc1e54102b66719ad8f3e6f97baa4ddc46873ba82a130c481619a705901b1da"
|
||||
PKG_VERSION="11d7babee19ce8ea0c25aef8801e4e18568781ba" # 5.10.25
|
||||
PKG_SHA256="d39cbf81f698cb592937f0148cf35b82ab36418ba62265d2f7e048615497afe7"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
|
@ -1,52 +0,0 @@
|
||||
From b7622f1dddf5dbd9d49660cef2af60a04a1e1a2d Mon Sep 17 00:00:00 2001
|
||||
From: Dom Cobley <popcornmix@gmail.com>
|
||||
Date: Mon, 15 Mar 2021 13:28:06 +0000
|
||||
Subject: [PATCH] vc4/drm: vc4_plane: Remove subpixel positioning check
|
||||
|
||||
There is little harm in ignoring fractional coordinates
|
||||
(they just get truncated).
|
||||
|
||||
Without this:
|
||||
modetest -M vc4 -F tiles,gradient -s 32:1920x1080-60 -P89@74:1920x1080*.1.1@XR24
|
||||
|
||||
is rejected. We have the same issue in Kodi when trying to
|
||||
use zoom options on video.
|
||||
|
||||
Note: even if all coordinates are fully integer. e.g.
|
||||
src:[0,0,1920,1080] dest:[-10,-10,1940,1100]
|
||||
|
||||
it will still get rejected as drm_atomic_helper_check_plane_state
|
||||
uses drm_rect_clip_scaled which transforms this to fractional src coords
|
||||
|
||||
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
||||
---
|
||||
drivers/gpu/drm/vc4/vc4_plane.c | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
|
||||
index 3d33fe3dacea7..bf0093bd997f5 100644
|
||||
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
||||
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
||||
@@ -339,7 +339,6 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
|
||||
struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
|
||||
struct drm_framebuffer *fb = state->fb;
|
||||
struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0);
|
||||
- u32 subpixel_src_mask = (1 << 16) - 1;
|
||||
int num_planes = fb->format->num_planes;
|
||||
struct drm_crtc_state *crtc_state;
|
||||
u32 h_subsample = fb->format->hsub;
|
||||
@@ -361,14 +360,6 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
|
||||
for (i = 0; i < num_planes; i++)
|
||||
vc4_state->offsets[i] = bo->paddr + fb->offsets[i];
|
||||
|
||||
- /* We don't support subpixel source positioning for scaling. */
|
||||
- if ((state->src.x1 & subpixel_src_mask) ||
|
||||
- (state->src.x2 & subpixel_src_mask) ||
|
||||
- (state->src.y1 & subpixel_src_mask) ||
|
||||
- (state->src.y2 & subpixel_src_mask)) {
|
||||
- return -EINVAL;
|
||||
- }
|
||||
-
|
||||
vc4_state->src_x = state->src.x1 >> 16;
|
||||
vc4_state->src_y = state->src.y1 >> 16;
|
||||
vc4_state->src_w[0] = (state->src.x2 - state->src.x1) >> 16;
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="57e7fd133f6e409fe0e55a1e5f277b3909b9f4de"
|
||||
PKG_SHA256="0a6810c7f4be49fe39dda08d76755c5e7ac90c527a30cea558a412be7a99aa15"
|
||||
PKG_VERSION="f9d853415a9ade3458d55f9153d88317dbad4d9b"
|
||||
PKG_SHA256="1444d74d1c2df5377238979a6732d5e30df3b32eab0a1675d081d946e4bf4021"
|
||||
PKG_ARCH="arm aarch64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.20 Kernel Configuration
|
||||
# Linux/arm 5.10.25 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.20 Kernel Configuration
|
||||
# Linux/arm 5.10.25 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.20 Kernel Configuration
|
||||
# Linux/arm 5.10.25 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@ -1334,7 +1334,6 @@ CONFIG_PCIEAER=y
|
||||
CONFIG_PCIE_PME=y
|
||||
# CONFIG_PCIE_DPC is not set
|
||||
# CONFIG_PCIE_PTM is not set
|
||||
# CONFIG_PCIE_BW is not set
|
||||
CONFIG_PCI_MSI=y
|
||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
|
||||
CONFIG_PCI_QUIRKS=y
|
||||
|
Loading…
x
Reference in New Issue
Block a user