Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5b3a31b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-09-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v4.19-rc5:
- Fix crash in vgem in drm_drv_uses_atomic_modeset.
- Allow atomic drivers that don't set DRIVER_ATOMIC to create debugfs entries.
- Fix compiler warning for unused connector_funcs.
- Fix null pointer deref on UDL unplug.
- Disable DRM support for sun4i's R40 for now.
  (Not all patches went in for v4.19, so it has to wait a cycle.)
- NULL-terminate the of_device_id table in pl111.
- Make sure vc4 NV12 planar format works when displaying an unscaled fb.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/dda393bb-f13f-8d36-711b-cacfc578e5a3@linux.intel.com
parents 7876320f 558a9ef9

drivers/gpu/drm/drm_atomic.c

+1 −1
Original line number Diff line number Diff line
@@ -2067,7 +2067,7 @@ static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p, 
	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;



	if (!drm_core_check_feature(dev, DRIVER_ATOMIC))

	if (!drm_drv_uses_atomic_modeset(dev))

		return;



	list_for_each_entry(plane, &config->plane_list, head) {

drivers/gpu/drm/drm_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id, 
		return ret;

	}



	if (drm_core_check_feature(dev, DRIVER_ATOMIC)) {

	if (drm_drv_uses_atomic_modeset(dev)) {

		ret = drm_atomic_debugfs_init(minor);

		if (ret) {

			DRM_ERROR("Failed to create atomic debugfs files\n");

drivers/gpu/drm/drm_fb_helper.c

+0 −3
Original line number Diff line number Diff line
@@ -2370,7 +2370,6 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, 
{

	int c, o;

	struct drm_connector *connector;

	const struct drm_connector_helper_funcs *connector_funcs;

	int my_score, best_score, score;

	struct drm_fb_helper_crtc **crtcs, *crtc;

	struct drm_fb_helper_connector *fb_helper_conn;
@@ -2399,8 +2398,6 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, 
	if (drm_has_preferred_mode(fb_helper_conn, width, height))

		my_score++;



	connector_funcs = connector->helper_private;



	/*

	 * select a crtc for this connector and then attempt to configure

	 * remaining connectors

drivers/gpu/drm/pl111/pl111_vexpress.c

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ static int vexpress_muxfpga_probe(struct platform_device *pdev) 
}



static const struct of_device_id vexpress_muxfpga_match[] = {

	{ .compatible = "arm,vexpress-muxfpga", }

	{ .compatible = "arm,vexpress-muxfpga", },

	{}

};



static struct platform_driver vexpress_muxfpga_driver = {

drivers/gpu/drm/sun4i/sun4i_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ static const struct of_device_id sun4i_drv_of_table[] = { 
	{ .compatible = "allwinner,sun8i-a33-display-engine" },

	{ .compatible = "allwinner,sun8i-a83t-display-engine" },

	{ .compatible = "allwinner,sun8i-h3-display-engine" },

	{ .compatible = "allwinner,sun8i-r40-display-engine" },

	{ .compatible = "allwinner,sun8i-v3s-display-engine" },

	{ .compatible = "allwinner,sun9i-a80-display-engine" },

	{ }