From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 6A52B74809 for ; Mon, 2 Apr 2018 20:25:36 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id x82so29794106wmg.1 for ; Mon, 02 Apr 2018 13:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gLhl25gqayzvVqmoRVNZKqPycyCPQSjqUAV7mAwSjp4=; b=DKflFu4Ds1YWBywtb7jdcThEcLymQmcpQyT+PRkxVbvoR3dPx3A0bUs7t2Jwf9PYKg mRsvyKQZ7kh5b3Z9/H0CJV6YDIx2CPijvtZNeDXrDlRhhxmjtjFpJNgR2cGpPwoSbaH4 48Qq0lFcbj4i/zpQoFIRpAL91GT3JalaT2V+xvLW05OMsBiratSF5cfe5rdJk6tF8yrN tbEcCfVX2AxAbBdComERlbvQwfVjMk+ohd6+cHldi7th8hWCEBw3FnXxFTILfiger500 jI7pX2UkVRJLzCNcOR8K6Me0gsNZV41Qe8PoNiDNXV+An20uBaPxkue9YTsByBTeqFDc zcHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gLhl25gqayzvVqmoRVNZKqPycyCPQSjqUAV7mAwSjp4=; b=Yswk180BgjsfC7YqAU5Ulq+N8+eFlbD5L77VdkASDlYGyUVEKfjojkO8/nDwMOm5Wr S+QE6RPMubDgvsm1TnchG+g8QWpyZCjWLuNJDKZGoG7+Jpj1QRXP6+C3jMTNgBFph2kZ 5VDpqvDBgDNNSC1l9eZ0MnbHGeZm6CMo88VeH2Lg1sB1njmGH4hI9AudVCWfyG7bsbGi SDpf30shqqFyfJ+vuuJYlwhCIxL9zFqvQYZL6FyRBw71GohHQ3B8vwDzZ/pGzW85PiN2 yf+7tkka37r3CgQhPuDuIca1MGHSY/gFZWLNty0SgXt68l/rdroOiG/egkf9Puly0w/e kt4w== X-Gm-Message-State: ALQs6tBZIztQGPfxHMQDTfAjHCBMM81v2yUh0NWBpwYLz0drwAe/sUb/ XnABaPZZvsxcym+E/rF8Wem9/w== X-Google-Smtp-Source: AIpwx48AXjVIFja4UkfhFAJkquQ6jTX5I66AP6q0MHSGvbQbD/ShAzxqfNk73gmI4GHkpMbtxjnqPA== X-Received: by 10.28.141.85 with SMTP id p82mr1695830wmd.19.1522700737414; Mon, 02 Apr 2018 13:25:37 -0700 (PDT) Received: from PC192-168-2-116.speedport.ip (p200300F07BC1FD051E6F65FFFE3E7F61.dip0.t-ipconnect.de. [2003:f0:7bc1:fd05:1e6f:65ff:fe3e:7f61]) by smtp.gmail.com with ESMTPSA id b185sm368791wmb.48.2018.04.02.13.25.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Apr 2018 13:25:36 -0700 (PDT) From: =?UTF-8?q?Andreas=20M=C3=BCller?= To: openembedded-core@lists.openembedded.org Date: Mon, 2 Apr 2018 22:25:25 +0200 Message-Id: <20180402202526.7988-1-schnitzeltony@gmail.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 Subject: [PATCH 1/2] mesa: fix unitialized modifier for DRI2 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Apr 2018 20:25:37 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This came up whith disabled DRI3 on Raspi/VC4 [1] but might be important for other drivers: It fixes an improper initialization. [1] https://lists.freedesktop.org/archives/mesa-dev/2018-March/190562.html Signed-off-by: Andreas Müller --- ...i-Initialise-modifier-to-INVALID-for-DRI2.patch | 43 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa_17.3.7.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch diff --git a/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch b/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch new file mode 100644 index 0000000000..126f14f784 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch @@ -0,0 +1,43 @@ +From 4cbecb61682a0ee426faaa03d824fc8fd7aef826 Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Mon, 2 Apr 2018 13:20:34 +0100 +Subject: [PATCH] st/dri: Initialise modifier to INVALID for DRI2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When allocating a buffer for DRI2, set the modifier to INVALID to inform +the backend that we have no supplied modifiers and it should do its own +thing. The missed initialisation forced linear, even if the +implementation had made other decisions. + +This resulted in VC4 DRI2 clients failing with: + Modifier 0x0 vs. tiling (0x700000000000001) mismatch + +Signed-off-by: Daniel Stone +Reported-by: Andreas Müller +Reviewed-by: Eric Anholt +Fixes: 3f8513172ff6 ("gallium/winsys/drm: introduce modifier field to winsys_handle") + +Upstream-Status: Applied [1] + +[1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=4cbecb61682a0ee426faaa03d824fc8fd7aef826 +--- + src/gallium/state_trackers/dri/dri2.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c +index 31d17d46c2..58a6757f03 100644 +--- a/src/gallium/state_trackers/dri/dri2.c ++++ b/src/gallium/state_trackers/dri/dri2.c +@@ -806,6 +806,7 @@ dri2_allocate_textures(struct dri_context *ctx, + whandle.handle = buf->name; + whandle.stride = buf->pitch; + whandle.offset = 0; ++ whandle.modifier = DRM_FORMAT_MOD_INVALID; + if (screen->can_share_buffer) + whandle.type = DRM_API_HANDLE_TYPE_SHARED; + else +-- +2.14.3 + diff --git a/meta/recipes-graphics/mesa/mesa_17.3.7.bb b/meta/recipes-graphics/mesa/mesa_17.3.7.bb index fe09a2988d..9c75d6c693 100644 --- a/meta/recipes-graphics/mesa/mesa_17.3.7.bb +++ b/meta/recipes-graphics/mesa/mesa_17.3.7.bb @@ -9,6 +9,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://llvm-config-version.patch \ file://0001-winsys-svga-drm-Include-sys-types.h.patch \ file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \ " SRC_URI[md5sum] = "769137f2538562c300c4b76bcb097377" -- 2.14.3