Merge pull request #4656 from by-gnome/imx6

Fixes for NXP/iMX6
This commit is contained in:
Jernej Škrabec 2020-11-15 12:10:57 +01:00 committed by GitHub
commit df2a079693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 526 additions and 140 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,24 +0,0 @@
From 91f6e594dcd0f657b17d3ffa2e64972b5fb3339d Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Fri, 19 Jul 2019 09:35:02 -0700
Subject: [PATCH] windowing/gbm: quirk imx-drm to only allow selecting an
overlay plane for video
---
xbmc/windowing/gbm/DRMUtils.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xbmc/windowing/gbm/DRMUtils.cpp b/xbmc/windowing/gbm/DRMUtils.cpp
index bbbc447498cf..bb8baf42dab9 100644
--- a/xbmc/windowing/gbm/DRMUtils.cpp
+++ b/xbmc/windowing/gbm/DRMUtils.cpp
@@ -370,6 +370,9 @@ drmModePlanePtr CDRMUtils::FindPlane(drmModePlaneResPtr resources, int crtc_inde
{
case KODI_VIDEO_PLANE:
{
+ if (m_module == "imx-drm" && props->prop_values[j] != DRM_PLANE_TYPE_OVERLAY)
+ break;
+
if (SupportsFormat(plane, DRM_FORMAT_NV12))
{
CLog::Log(LOGDEBUG, "CDRMUtils::%s - found video plane %u", __FUNCTION__, plane->plane_id);