mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #3377 from MilhouseVH/le10_gpudriver_bump1
xf86-video-amd/intel: updates 19.0.1/6afed33
This commit is contained in:
commit
366b0223d5
@ -1,9 +1,10 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xf86-video-amdgpu"
|
||||
PKG_VERSION="18.1.0"
|
||||
PKG_SHA256="e11f25bb51d718b8ea938ad2b8095323c0ab16f4ddffd92091d80f9a445a9672"
|
||||
PKG_VERSION="19.0.1"
|
||||
PKG_SHA256="aaa197196aadcb12e93e10a2aa03c9aedc9ba7b27c2643a8ef620d41e2d1c6d5"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.x.org/"
|
||||
|
@ -1,33 +0,0 @@
|
||||
From aa572683d86174be2bfc09d4e173ae2a9907d40e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
|
||||
Date: Wed, 10 Oct 2018 17:28:35 +0200
|
||||
Subject: Fix condition for calling set_pixmap_bo in drmmode_xf86crtc_resize
|
||||
|
||||
This matches CreateScreenResources_KMS.
|
||||
|
||||
Fixes crash when resizing the screen (e.g. using xrandr) with depth <
|
||||
24.
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/104914
|
||||
Acked-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
---
|
||||
src/drmmode_display.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
|
||||
index 5315747..9065e0f 100644
|
||||
--- a/src/drmmode_display.c
|
||||
+++ b/src/drmmode_display.c
|
||||
@@ -2881,8 +2881,7 @@ static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
|
||||
if (!amdgpu_glamor_create_screen_resources(scrn->pScreen))
|
||||
goto fail;
|
||||
|
||||
- if (info->use_glamor ||
|
||||
- (info->front_buffer->flags & AMDGPU_BO_FLAGS_GBM)) {
|
||||
+ if (info->use_glamor || info->dri2.enabled) {
|
||||
if (!amdgpu_set_pixmap_bo(ppix, info->front_buffer))
|
||||
goto fail;
|
||||
}
|
||||
--
|
||||
cgit v1.1
|
||||
|
@ -1,9 +1,10 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xf86-video-ati"
|
||||
PKG_VERSION="18.1.0"
|
||||
PKG_SHA256="6c335f423c1dc3d904550d41cb871ca4130ba7037dda67d82e3f1555e1bfb9ac"
|
||||
PKG_VERSION="19.0.1"
|
||||
PKG_SHA256="5cb6015d8664546ad1311bc9c363d7bc41ebf60e7046ceb44dd38e5b707961b0"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.x.org/"
|
||||
|
@ -1,57 +0,0 @@
|
||||
From f892d3791219d1041e0cbb1b866e15774004aa18 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
|
||||
Date: Mon, 15 Oct 2018 17:14:41 +0200
|
||||
Subject: dri3: Handle radeon_get_pixmap_bo returning NULL
|
||||
|
||||
We were trying to already, but testing the wrong pointer.
|
||||
|
||||
Fixes: b85b7b11f5b5 "Add struct radeon_buffer"
|
||||
Bug: https://bugs.debian.org/910846
|
||||
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
---
|
||||
src/radeon_dri3.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c
|
||||
index 7e89a2f..25078ba 100644
|
||||
--- a/src/radeon_dri3.c
|
||||
+++ b/src/radeon_dri3.c
|
||||
@@ -212,7 +212,7 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen,
|
||||
CARD16 *stride,
|
||||
CARD32 *size)
|
||||
{
|
||||
- struct radeon_bo *bo;
|
||||
+ struct radeon_buffer *bo;
|
||||
int fd;
|
||||
#ifdef USE_GLAMOR
|
||||
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
|
||||
@@ -222,10 +222,10 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen,
|
||||
return glamor_fd_from_pixmap(screen, pixmap, stride, size);
|
||||
#endif
|
||||
|
||||
- bo = radeon_get_pixmap_bo(pixmap)->bo.radeon;
|
||||
+ bo = radeon_get_pixmap_bo(pixmap);
|
||||
if (!bo) {
|
||||
exaMoveInPixmap(pixmap);
|
||||
- bo = radeon_get_pixmap_bo(pixmap)->bo.radeon;
|
||||
+ bo = radeon_get_pixmap_bo(pixmap);
|
||||
if (!bo)
|
||||
return -1;
|
||||
}
|
||||
@@ -233,11 +233,11 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen,
|
||||
if (pixmap->devKind > UINT16_MAX)
|
||||
return -1;
|
||||
|
||||
- if (radeon_gem_prime_share_bo(bo, &fd) < 0)
|
||||
+ if (radeon_gem_prime_share_bo(bo->bo.radeon, &fd) < 0)
|
||||
return -1;
|
||||
|
||||
*stride = pixmap->devKind;
|
||||
- *size = bo->size;
|
||||
+ *size = bo->bo.radeon->size;
|
||||
return fd;
|
||||
}
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xf86-video-intel"
|
||||
PKG_VERSION="3d39506"
|
||||
PKG_SHA256="cfc7287fcb38028a68ffd7677032db0882c02112ad24038ee936de854761e8b3"
|
||||
PKG_VERSION="6afed33b2d673d88674f0c76efe500ae414e8e1b"
|
||||
PKG_SHA256="d492fffa561b215b94e403011144165b80a84cf8ee2109ce243f4939c0943681"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://intellinuxgraphics.org/"
|
||||
|
Loading…
x
Reference in New Issue
Block a user