diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index 177ac45..e00b40e 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/mesa.spec
@@ -9,16 +9,16 @@
 %endif
 
 %ifarch %{ix86} x86_64
-%define platform_drivers ,i965
+%define platform_drivers i965
 %define with_vmware 1
 %define with_xa     1
 %define with_iris   1
 %endif
 
 %ifarch %{ix86} x86_64
-%define with_vulkan 1
+%define with_vulkan_hw 1
 %else
-%define with_vulkan 0
+%define with_vulkan_hw 0
 %endif
 
 %ifarch %{arm} aarch64
@@ -31,18 +31,20 @@
 
 %global dri_drivers %{?platform_drivers}
 
-%if 0%{?with_vulkan}
-%define vulkan_drivers intel,amd
+%if 0%{?with_vulkan_hw}
+%define vulkan_drivers swrast,intel,amd
+%else
+%define vulkan_drivers swrast
 %endif
 
 %global sanitize 0
 
-#global rctag rc4
+#global rctag rc2
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-Version:        20.1.4
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Version:        20.3.0
+Release:        2%{?rctag:.%{rctag}}%{?dist}
 
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -56,9 +58,8 @@ Source3:        Makefile
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
-# Add support for TU11x nvidia
-Patch10: 0001-nir-use-bitfield_insert-instead-of-bfi-in-nir_lower_.patch
-Patch11: nouveau-tu1xx-support.patch
+Patch0:	lavapipe-disable-env-var.patch
+Patch1: 0001-radeonsi-fix-regression-on-gpus-using-the-radeon-win.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -67,7 +68,7 @@ BuildRequires:  meson >= 0.45
 %if %{with_hardware}
 BuildRequires:  kernel-headers
 %endif
-BuildRequires:  libdrm-devel >= 2.4.42
+BuildRequires:  libdrm-devel >= 2.4.103
 BuildRequires:  libXxf86vm-devel
 BuildRequires:  expat-devel
 BuildRequires:  xorg-x11-proto-devel
@@ -166,6 +167,7 @@ Provides:       libEGL-devel%{?_isa}
 %package dri-drivers
 Summary:        Mesa-based DRI drivers
 Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libdrm >= 2.4.103
 
 %description dri-drivers
 %{summary}.
@@ -282,7 +284,6 @@ Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release
 %{summary}.
 %endif
 
-%if 0%{?with_vulkan}
 %package vulkan-drivers
 Summary:        Mesa Vulkan drivers
 Requires:       vulkan%{_isa}
@@ -290,6 +291,7 @@ Requires:       vulkan%{_isa}
 %description vulkan-drivers
 The drivers with support for the Vulkan API.
 
+%if 0%{?with_vulkan_hw}
 %package vulkan-devel
 Summary:        Mesa Vulkan development files
 Requires:       %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -323,7 +325,7 @@ pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \
 export ASFLAGS="--generate-missing-build-notes=yes"
 %meson -Dcpp_std=gnu++14 \
   -Db_ndebug=true \
-  -Dplatforms=x11,wayland,drm,surfaceless \
+  -Dplatforms=x11,wayland \
   -Ddri3=true \
   -Ddri-drivers=%{?dri_drivers} \
 %if 0%{?with_hardware}
@@ -527,8 +529,8 @@ done
 %endif
 %endif
 
-%if 0%{?with_vulkan}
 %files vulkan-drivers
+%if 0%{?with_vulkan_hw}
 %{_libdir}/libvulkan_intel.so
 %{_libdir}/libvulkan_radeon.so
 %ifarch x86_64
@@ -538,14 +540,28 @@ done
 %{_datadir}/vulkan/icd.d/intel_icd.i686.json
 %{_datadir}/vulkan/icd.d/radeon_icd.i686.json
 %endif
+%endif
+%{_libdir}/libvulkan_lvp.so
+%{_datadir}/vulkan/icd.d/lvp_icd.*.json
 %{_libdir}/libVkLayer_MESA_device_select.so
 %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
 
+%if 0%{?with_vulkan_hw}
 %files vulkan-devel
 %{_includedir}/vulkan/
 %endif
 
 %changelog
+* Mon Dec 07 2020 Dave Airlie <airlied@redhat.com> - 20.3.0-2
+- Fix regression with radeon si/cik cards
+
+* Fri Dec 04 2020 Dave Airlie <airlied@redhat.com> - 20.3.0-1
+- Update to 20.3.0 release
+
+* Thu Nov 19 2020 Dave Airlie <airlied@redhat.com> - 20.3.0-0.1.rc2
+- Update 20.3.0-rc2
+- enable lavapipe behind env var so it can be used for testing
+
 * Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 20.1.4-1
 - Update to 20.1.4
 - Update nouveau tu1xx support patch (Karol)