Hi all,
Today's linux-next merge of the drm tree got a conflict in:
arch/arm/configs/omap2plus_defconfig
between commit:
98c2cc359f8f ("ARM: omap2plus_defconfig: Update for moved and dropped options")
from the omap tree and commit:
e7e67d9a2f1d ("drm/omap: Switch the HDMI and VENC outputs to drm_bridge")
from the drm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be …
[View More]mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/configs/omap2plus_defconfig
index eedb26ff93f9,54f1a21de7e0..000000000000
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -360,10 -353,10 +360,9 @@@ CONFIG_OMAP2_DSS_DSI=
CONFIG_DRM_OMAP_PANEL_DSI_CM=m
CONFIG_DRM_TILCDC=m
CONFIG_DRM_PANEL_SIMPLE=m
+ CONFIG_DRM_DISPLAY_CONNECTOR=m
+ CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_TI_TFP410=m
+ CONFIG_DRM_TI_TPD12S015=m
CONFIG_DRM_PANEL_LG_LB035Q02=m
CONFIG_DRM_PANEL_NEC_NL8048HL11=m
CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
[View Less]
Hi Dave and Daniel,
Here goes drm-intel-next-fixes-2020-04-02:
Only gvt fixes on this round:
- Fix non-privilege access warning (Tina)
- Fix display port type (Tina)
- BDW cmd parser missed SWTESS_BASE_ADDRESS (Yan)
- Bypass length check of LRI (Yan)
- Fix one klocwork warning (Tina)
Thanks,
Rodrigo.
The following changes since commit 2bdd4c28baff29163808677a70942de2b45f17dc:
drm/i915/display: Fix mode private_flags comparison at atomic_check (2020-03-26 10:21:30 -0700)
are available …
[View More]in the Git repository at:
git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2020-04-02
for you to fetch changes up to 17d0c1062a0c60e17c96538adf4a84c208930d9d:
Merge tag 'gvt-next-fixes-2020-03-31' of https://github.com/intel/gvt-linux into drm-intel-next-fixes (2020-03-31 09:25:15 -0700)
----------------------------------------------------------------
Only gvt fixes on this round:
- Fix non-privilege access warning (Tina)
- Fix display port type (Tina)
- BDW cmd parser missed SWTESS_BASE_ADDRESS (Yan)
- Bypass length check of LRI (Yan)
- Fix one klocwork warning (Tina)
----------------------------------------------------------------
Rodrigo Vivi (1):
Merge tag 'gvt-next-fixes-2020-03-31' of https://github.com/intel/gvt-linux into drm-intel-next-fixes
Tina Zhang (3):
drm/i915/gvt: Add some regs to force-to-nonpriv whitelist
drm/i915/gvt: Fix display port type issue
drm/i915/gvt: Fix klocwork issues about data size
Yan Zhao (2):
drm/i915/gvt: add support to command SWTESS_BASE_ADDRESS
drm/i915/gvt: do not check len & max_len for lri
drivers/gpu/drm/i915/gvt/cmd_parser.c | 16 ++++------------
drivers/gpu/drm/i915/gvt/display.c | 6 +++---
drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++++--
drivers/gpu/drm/i915/gvt/scheduler.c | 4 ++--
4 files changed, 15 insertions(+), 19 deletions(-)
[View Less]
https://bugzilla.kernel.org/show_bug.cgi?id=207047
Bug ID: 207047
Summary: Crash after failed to pin userptr on amdgpu
Product: Drivers
Version: 2.5
Kernel Version: 5.5.13
Hardware: All
OS: Linux
Tree: Mainline
Status: NEW
Severity: normal
Priority: P1
Component: Video(DRI - non Intel)
Assignee: drivers_video-dri(a)kernel-bugs.osdl.org
Reporter: …
[View More]me(a)artem.ist
Regression: No
Created attachment 288139
--> https://bugzilla.kernel.org/attachment.cgi?id=288139&action=edit
dmesg output since usermode crash that caused bug
When a user-mode program crashes while using amdgpu resources amdgpu fails to
pin userptr then segfaults in the GPU scheduler. This occured while attempting
to port a program to use Wayland and Vulkan on AMD Ryzen 3700X and AMD RX580
using unmodified amdgpu drivers.
--
You are receiving this mail because:
You are watching the assignee of the bug.
[View Less]
From: Ville Syrjälä <ville.syrjala(a)linux.intel.com>
A lot of the panel drivers put bogus looking values into
mode.clock. This series replaces the bogus values with
mode.vrefresh*mode.htotal*mode.vtotal.
Now, that may not be the right choice in all cases. There
are quite a few cases where the error looks very minor and
it may be that mode.vrefresh was just miscalculated. But
other cases show huge discepancies. Either way I want to
know which way we should go.
I need to get these …
[View More]sorted one way or the other to
land the drm_display_mode diet patches.
Entire series available here:
git://github.com/vsyrjala/linux.git mode_clock_vs_vrefresh
Ville Syrjälä (33):
drm/panel-novatek-nt35510: Fix dotclock
drm/panel-arm-versatile: Fix dotclock
drm/panel-feixin-k101-im2ba02: Fix dotclock
drm/panel-ilitek-ili9322: Fix dotclocks
drm/panel-leadtek-ltk500hd1829: Fix dotclock
drm/panel-lg-lg4573: Fix dotclock
drm/panel-sitronix-st7789v: Fix dotclock
drm/panel-sony-acx424akp: Fix dotclocks
drm/panel-simple: Fix dotclock for AUO G101EVN010
drm/panel-simple: Fix dotclock for AUO G104SN02 V2
drm/panel-simple: Fix dotclock for CDTech S043WQ26H-CT7
drm/panel-simple: Fix dotclock for CDTech S070WV95-CT16
drm/panel-simple: Fix dotclock for Chunghwa CLAA070WP03XG
drm/panel-simple: Fix dotclock for Chunghwa Picture Tubes 10.1" WXGA
drm/panel-simple: Fix dotclock for EDT ET035012DM6
drm/panel-simple: Fix dotclock for EDT ET043080DH6-GP
drm/panel-simple: Fix dotclock for Foxlink FL500WVR00-A0T
drm/panel-simple: Fix dotclock for Giantplus GPG482739QS5
drm/panel-simple: Fix dotclock for Innolux AT070TN92
drm/panel-simple: Fix dotclock for LeMaker BL035-RGB-002 3.5" LCD
drm/panel-simple: Fix dotclock for Logic PD Type 28
drm/panel-simple: Fix dotclock for Netron DY E231732
drm/panel-simple: Fix dotclock for On Tat Industrial Company 7" DPI
TFT
drm/panel-simple: Fix dotclock for Ortustech COM37H3M
drm/panel-simple: Fix dotclock for PDA 91-00156-A0
drm/panel-simple: Fix dotclock for QiaoDian qd43003c0-40
drm/panel-simple: Fix dotclock for Sharp LQ035Q7DB03
drm/panel-simple: Fix dotclock for Sharp LQ150X1LG11
drm/panel-simple: Fix dotclock for Shelly SCA07010-BFN-LNN
drm/panel-simple: Fix dotclock for TPK U.S.A. LLC Fusion
drm/panel-simple: Fix dotclock for XT VL050-8048NT-C01
drm/panel-simple: Fix dotclock for LG LH500WX1-SD03
drm/panel-simple: Fix dotclock for LG ACX467AKM-7
drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +--
.../gpu/drm/panel/panel-feixin-k101-im2ba02.c | 2 +-
drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 14 +++---
.../drm/panel/panel-leadtek-ltk500hd1829.c | 2 +-
drivers/gpu/drm/panel/panel-lg-lg4573.c | 2 +-
drivers/gpu/drm/panel/panel-novatek-nt35510.c | 2 +-
drivers/gpu/drm/panel/panel-simple.c | 50 +++++++++----------
.../gpu/drm/panel/panel-sitronix-st7789v.c | 2 +-
drivers/gpu/drm/panel/panel-sony-acx424akp.c | 4 +-
9 files changed, 42 insertions(+), 42 deletions(-)
--
2.24.1
[View Less]
Now we have new struct drm_device based drm_WARN* macros. These are
preferred over the regular WARN* macros.
Remove WARN_ON and WARN_ON_ONCE overriedes to avoid any temptations to
use them in the future.
Suggested-by: Jani Nikula <jani.nikula(a)intel.com>
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya(a)intel.com>
---
drivers/gpu/drm/i915/i915_utils.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/…
[View More]gpu/drm/i915/i915_utils.h
index 03a73d2bd50d..c666a64375d9 100644
--- a/drivers/gpu/drm/i915/i915_utils.h
+++ b/drivers/gpu/drm/i915/i915_utils.h
@@ -36,21 +36,6 @@ struct timer_list;
#define FDO_BUG_URL "https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs"
-#undef WARN_ON
-/* Many gcc seem to no see through this and fall over :( */
-#if 0
-#define WARN_ON(x) ({ \
- bool __i915_warn_cond = (x); \
- if (__builtin_constant_p(__i915_warn_cond)) \
- BUILD_BUG_ON(__i915_warn_cond); \
- WARN(__i915_warn_cond, "WARN_ON(" #x ")"); })
-#else
-#define WARN_ON(x) WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
-#endif
-
-#undef WARN_ON_ONCE
-#define WARN_ON_ONCE(x) WARN_ONCE((x), "%s", "WARN_ON_ONCE(" __stringify(x) ")")
-
#define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
__stringify(x), (long)(x))
--
2.23.0
[View Less]