From: Zack Rusin <zackr(a)vmware.com>
With very limited vram on svga3 it's difficult to handle all the surface
migrations. Without gbobjects, i.e. the ability to store surfaces in
guest mobs, there's no reason to support intermediate svga2 features,
especially because we can fall back to fb traces and svga3 will never
support those in-between features.
On svga3 we wither want to use fb traces or screen targets
(i.e. gbobjects), nothing in between. This fixes presentation on a lot
of fusion/esxi tech previews where the exposed svga3 caps haven't been
finalized yet.
Signed-off-by: Zack Rusin <zackr(a)vmware.com>
Fixes: 2cd80dbd3551 ("drm/vmwgfx: Add basic support for SVGA3")
Cc: <stable(a)vger.kernel.org> # v5.14+
Reviewed-by: Martin Krastev <krastevm(a)vmware.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
index bf1b394753da..162dfeb1cc5a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
@@ -675,11 +675,14 @@ int vmw_cmd_emit_dummy_query(struct vmw_private *dev_priv,
*/
bool vmw_cmd_supported(struct vmw_private *vmw)
{
- if ((vmw->capabilities & (SVGA_CAP_COMMAND_BUFFERS |
- SVGA_CAP_CMD_BUFFERS_2)) != 0)
- return true;
+ bool has_cmdbufs =
+ (vmw->capabilities & (SVGA_CAP_COMMAND_BUFFERS |
+ SVGA_CAP_CMD_BUFFERS_2)) != 0;
+ if (vmw_is_svga_v3(vmw))
+ return (has_cmdbufs &&
+ (vmw->capabilities & SVGA_CAP_GBOBJECTS) != 0);
/*
* We have FIFO cmd's
*/
- return vmw->fifo_mem != NULL;
+ return has_cmdbufs || vmw->fifo_mem != NULL;
}
--
2.32.0
This is the start of the stable review cycle for the 5.10.107 release.
There are 23 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 19 Mar 2022 12:45:16 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.107-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.10.107-rc1
James Morse <james.morse(a)arm.com>
arm64: kvm: Fix copy-and-paste error in bhb templates for v5.10 stable
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring: return back safer resurrect
Chengming Zhou <zhouchengming(a)bytedance.com>
kselftest/vm: fix tests build with old libc
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
bnx2: Fix an error message
Niels Dossche <dossche.niels(a)gmail.com>
sfc: extend the locking on mcdi->seqno
Eric Dumazet <edumazet(a)google.com>
tcp: make tcp_read_sock() more robust
Sreeramya Soratkal <quic_ssramya(a)quicinc.com>
nl80211: Update bss channel on channel switch for P2P_CLIENT
Manasi Navare <manasi.d.navare(a)intel.com>
drm/vrr: Set VRR capable prop only if it is attached to connector
Golan Ben Ami <golan.ben.ami(a)intel.com>
iwlwifi: don't advertise TWT support
Jia-Ju Bai <baijiaju1990(a)gmail.com>
atm: firestream: check the return value of ioremap() in fs_init()
Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com>
can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready
Julian Braha <julianbraha(a)gmail.com>
ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE
Alexander Lobakin <alobakin(a)pm.me>
MIPS: smp: fill in sibling and core maps earlier
Johannes Berg <johannes.berg(a)intel.com>
mac80211: refuse aggregations sessions before authorized
Corentin Labbe <clabbe(a)baylibre.com>
ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
Sascha Hauer <s.hauer(a)pengutronix.de>
ARM: dts: rockchip: reorder rk322x hmdi clocks
Dinh Nguyen <dinguyen(a)kernel.org>
arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg"
Sascha Hauer <s.hauer(a)pengutronix.de>
arm64: dts: rockchip: reorder rk3399 hdmi clocks
Jakob Unterwurzacher <jakob.unterwurzacher(a)theobroma-systems.com>
arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity
Yan Yan <evitayan(a)google.com>
xfrm: Fix xfrm migrate issues when address family changes
Yan Yan <evitayan(a)google.com>
xfrm: Check if_id in xfrm_migrate
Xin Long <lucien.xin(a)gmail.com>
sctp: fix the processing for INIT chunk
Kai Lueke <kailueke(a)linux.microsoft.com>
Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/rk322x.dtsi | 4 +-
arch/arm/boot/dts/rk3288.dtsi | 2 +-
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +-
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 6 ++
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +-
arch/arm64/kvm/hyp/smccc_wa.S | 4 +-
arch/mips/kernel/smp.c | 6 +-
drivers/atm/firestream.c | 2 +
drivers/gpu/drm/drm_connector.c | 3 +
drivers/net/can/rcar/rcar_canfd.c | 6 +-
drivers/net/ethernet/broadcom/bnx2.c | 2 +-
drivers/net/ethernet/sfc/mcdi.c | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +-
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 -
fs/io_uring.c | 18 ++++--
include/net/xfrm.h | 5 +-
lib/Kconfig | 1 -
net/ipv4/tcp.c | 10 +--
net/key/af_key.c | 2 +-
net/mac80211/agg-tx.c | 10 ++-
net/sctp/sm_statefuns.c | 71 ++++++++++++++--------
net/wireless/nl80211.c | 3 +-
net/xfrm/xfrm_policy.c | 14 +++--
net/xfrm/xfrm_state.c | 15 +++--
net/xfrm/xfrm_user.c | 27 +++-----
tools/testing/selftests/vm/userfaultfd.c | 1 +
27 files changed, 141 insertions(+), 91 deletions(-)
This is the start of the stable review cycle for the 5.15.30 release.
There are 25 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 19 Mar 2022 12:45:16 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.30-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.15.30-rc1
Ivan Vecera <ivecera(a)redhat.com>
ice: Fix race condition during interface enslave
Peter Zijlstra <peterz(a)infradead.org>
x86/module: Fix the paravirt vs alternative order
Chengming Zhou <zhouchengming(a)bytedance.com>
kselftest/vm: fix tests build with old libc
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
bnx2: Fix an error message
Niels Dossche <dossche.niels(a)gmail.com>
sfc: extend the locking on mcdi->seqno
Eric Dumazet <edumazet(a)google.com>
tcp: make tcp_read_sock() more robust
Sreeramya Soratkal <quic_ssramya(a)quicinc.com>
nl80211: Update bss channel on channel switch for P2P_CLIENT
Manasi Navare <manasi.d.navare(a)intel.com>
drm/vrr: Set VRR capable prop only if it is attached to connector
Golan Ben Ami <golan.ben.ami(a)intel.com>
iwlwifi: don't advertise TWT support
Jia-Ju Bai <baijiaju1990(a)gmail.com>
atm: firestream: check the return value of ioremap() in fs_init()
Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com>
can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready
Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com>
Bluetooth: hci_core: Fix leaking sent_cmd skb
Julian Braha <julianbraha(a)gmail.com>
ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE
Alexander Lobakin <alobakin(a)pm.me>
MIPS: smp: fill in sibling and core maps earlier
Johannes Berg <johannes.berg(a)intel.com>
mac80211: refuse aggregations sessions before authorized
Corentin Labbe <clabbe(a)baylibre.com>
ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
Sascha Hauer <s.hauer(a)pengutronix.de>
ARM: dts: rockchip: reorder rk322x hmdi clocks
Dinh Nguyen <dinguyen(a)kernel.org>
arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg"
Sascha Hauer <s.hauer(a)pengutronix.de>
arm64: dts: rockchip: reorder rk3399 hdmi clocks
Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com>
arm64: dts: rockchip: align pl330 node name with dtschema
Jakob Unterwurzacher <jakob.unterwurzacher(a)theobroma-systems.com>
arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity
Yan Yan <evitayan(a)google.com>
xfrm: Fix xfrm migrate issues when address family changes
Yan Yan <evitayan(a)google.com>
xfrm: Check if_id in xfrm_migrate
Quentin Schulz <quentin.schulz(a)theobroma-systems.com>
arm64: dts: rockchip: fix rk3399-puma-haikou USB OTG mode
Kai Lueke <kailueke(a)linux.microsoft.com>
Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
-------------
Diffstat:
Makefile | 4 ++--
arch/arm/boot/dts/rk322x.dtsi | 4 ++--
arch/arm/boot/dts/rk3288.dtsi | 2 +-
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 ++--
arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
.../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 20 ++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++---
arch/mips/kernel/smp.c | 6 ++---
arch/x86/kernel/module.c | 13 +++++++----
drivers/atm/firestream.c | 2 ++
drivers/gpu/drm/drm_connector.c | 3 +++
drivers/net/can/rcar/rcar_canfd.c | 6 ++---
drivers/net/ethernet/broadcom/bnx2.c | 2 +-
drivers/net/ethernet/intel/ice/ice.h | 11 ++++++++-
drivers/net/ethernet/intel/ice/ice_main.c | 12 +++++++++-
drivers/net/ethernet/sfc/mcdi.c | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +--
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 -
include/net/xfrm.h | 5 ++--
lib/Kconfig | 1 -
net/bluetooth/hci_core.c | 1 +
net/ipv4/tcp.c | 10 ++++----
net/key/af_key.c | 2 +-
net/mac80211/agg-tx.c | 10 +++++++-
net/wireless/nl80211.c | 3 ++-
net/xfrm/xfrm_policy.c | 14 ++++++-----
net/xfrm/xfrm_state.c | 15 ++++++++----
net/xfrm/xfrm_user.c | 27 +++++++---------------
tools/testing/selftests/vm/userfaultfd.c | 1 +
31 files changed, 126 insertions(+), 69 deletions(-)