]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'drm-misc-fixes-2020-02-07' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Fri, 14 Feb 2020 02:52:49 +0000 (12:52 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 14 Feb 2020 02:53:00 +0000 (12:53 +1000)
Fixes for v5.6:
- Revert allow_fb_modifiers in sun4i, as it causes a regression for DE2 and DE3.
- Fix null pointer deref in drm_dp_mst_process_up_req().

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/672810c3-4212-0a46-337b-2cb855573fd2@linux.intel.com
1  2 
drivers/gpu/drm/drm_dp_mst_topology.c
drivers/gpu/drm/panfrost/panfrost_drv.c
drivers/gpu/drm/panfrost/panfrost_job.c
drivers/gpu/drm/sun4i/sun4i_drv.c

Simple merge
Simple merge