From owner-svn-ports-head@freebsd.org Sat Oct 31 06:12:58 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1954F442316; Sat, 31 Oct 2020 06:12:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CNTPP6nwnz43jC; Sat, 31 Oct 2020 06:12:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC64A23071; Sat, 31 Oct 2020 06:12:57 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09V6Cv3b058674; Sat, 31 Oct 2020 06:12:57 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09V6CvTU058672; Sat, 31 Oct 2020 06:12:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202010310612.09V6CvTU058672@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 31 Oct 2020 06:12:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553734 - in head/graphics/mesa-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/mesa-devel: . files X-SVN-Commit-Revision: 553734 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Oct 2020 06:12:58 -0000 Author: jbeich Date: Sat Oct 31 06:12:57 2020 New Revision: 553734 URL: https://svnweb.freebsd.org/changeset/ports/553734 Log: graphics/mesa-devel: crash workaround for Intel GPUs after r553723 While upstream issue is in userland driver FreeBSD kernel driver may fail to handle it gracefully e.g., $ sway $ mpv --hwdec=vaapi /path/to/file pid 12449 (sway), jid 0, uid 1234: exited on signal 11 WARNING !drm_modeset_is_locked(&crtc->mutex) failed at drm-kmod-drm_v5.4.62_3/drivers/gpu/drm/drm_atomic_helper.c:621 #0 0xffffffff81f3e833 at linux_dump_stack+0x23 #1 0xffffffff81ea43e3 at drm_atomic_helper_check_modeset+0xb3 #2 0xffffffff8259492c at intel_atomic_check+0x8c #3 0xffffffff81ea3379 at drm_atomic_check_only+0x3f9 #4 0xffffffff81ea37c3 at drm_atomic_commit+0x13 #5 0xffffffff81eb0c3f at drm_client_modeset_commit_atomic+0x1af #6 0xffffffff81eb093a at drm_client_modeset_commit_force+0x6a #7 0xffffffff81efa12a at drm_fb_helper_restore_fbdev_mode_unlocked+0x7a #8 0xffffffff81ef2386 at vt_kms_postswitch+0x166 #9 0xffffffff8076b66b at vt_window_switch+0x12b #10 0xffffffff807688ff at vtterm_cngrab+0x1f #11 0xffffffff80805a36 at cngrab+0x16 #12 0xffffffff8086295c at vpanic+0xec #13 0xffffffff80862863 at panic+0x43 #14 0xffffffff81f5d142 at dma_buf_poll+0x12 #15 0xffffffff808d2959 at kern_poll+0x329 #16 0xffffffff808d2620 at sys_poll+0x50 #17 0xffffffff80b3353b at amd64_syscall+0xfb Added: head/graphics/mesa-devel/files/patch-revert (contents, props changed) Modified: head/graphics/mesa-devel/Makefile (contents, props changed) Modified: head/graphics/mesa-devel/Makefile ============================================================================== --- head/graphics/mesa-devel/Makefile Sat Oct 31 04:28:26 2020 (r553733) +++ head/graphics/mesa-devel/Makefile Sat Oct 31 06:12:57 2020 (r553734) @@ -3,6 +3,7 @@ PORTNAME= mesa DISTVERSION= 20.2-branchpoint-3613 DISTVERSIONSUFFIX= -g0a4c1db926c +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -devel Added: head/graphics/mesa-devel/files/patch-revert ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mesa-devel/files/patch-revert Sat Oct 31 06:12:57 2020 (r553734) @@ -0,0 +1,45 @@ +Revert https://gitlab.freedesktop.org/mesa/mesa/-/commit/13859c769f0e +due to https://gitlab.freedesktop.org/mesa/mesa/-/issues/3713 + +--- src/gallium/frontends/dri/dri2.c.orig 2020-10-31 00:18:11 UTC ++++ src/gallium/frontends/dri/dri2.c +@@ -1379,28 +1379,18 @@ static __DRIimage * + dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate) + { + __DRIimage *img; +- struct pipe_resource *tex = image->texture; +- int i; + + if (plane < 0) { + return NULL; + } else if (plane > 0) { + uint64_t planes; +- if (dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_NPLANES, 0, +- &planes) && ++ if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_NPLANES, 0, ++ &planes) || + plane >= planes) { + return NULL; + } + } + +- if (tex->next) { +- for (i = 0; i < plane; i++) { +- tex = tex->next; +- if (!tex) +- return NULL; +- } +- } +- + if (image->dri_components == 0) { + uint64_t modifier; + if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_MODIFIER, 0, +@@ -1413,8 +1403,6 @@ dri2_from_planar(__DRIimage *image, int plane, void *l + img = dri2_dup_image(image, loaderPrivate); + if (img == NULL) + return NULL; +- +- pipe_resource_reference(&img->texture, tex); + + if (img->texture->screen->resource_changed) + img->texture->screen->resource_changed(img->texture->screen,