Commit 1d2a1eb1 authored May 15, 2020 by Dave Airlie

drm-misc into drm-fixes



Just one meson patch this time to propagate an error code

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200514073538.wvdtv5s2mt4wdrdj@gilmour.lan

parents 27db6f7b c54a8f1f

drivers/gpu/drm/meson/meson_drv.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev)
		if (priv->afbcd.ops)
		priv->afbcd.ops->init(priv);

		drm_mode_config_helper_resume(priv->drm);

		return 0;
		return drm_mode_config_helper_resume(priv->drm);
		}

		static int compare_of(struct device dev, void data)

Admin message