Commit 7b74026d authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Cross-subsystem:
- omap: Instantiate dss children in omapdss instead of mach (Laurent)

Other:
- htmldocs build warning (Sean)
- MST NULL deref fix (Stanislav)
- omap: Various runtime ref gets on probe/bind (Laurent)
- omap: Fix to the above dss children patch (Tony)

Cc: Sean Paul <sean@poorly.run>
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181114204542.GA52569@art_vandelay
parents ccda4af0 adf59dd2

arch/arm/mach-omap2/display.c

+53 −58
Original line number Diff line number Diff line
@@ -209,11 +209,61 @@ static int __init omapdss_init_fbdev(void) 


	return 0;

}

#else

static inline int omapdss_init_fbdev(void)



static const char * const omapdss_compat_names[] __initconst = {

	"ti,omap2-dss",

	"ti,omap3-dss",

	"ti,omap4-dss",

	"ti,omap5-dss",

	"ti,dra7-dss",

};



static struct device_node * __init omapdss_find_dss_of_node(void)

{

	struct device_node *node;

	int i;



	for (i = 0; i < ARRAY_SIZE(omapdss_compat_names); ++i) {

		node = of_find_compatible_node(NULL, NULL,

			omapdss_compat_names[i]);

		if (node)

			return node;

	}



	return NULL;

}



static int __init omapdss_init_of(void)

{

	int r;

	struct device_node *node;

	struct platform_device *pdev;



	/* only create dss helper devices if dss is enabled in the .dts */



	node = omapdss_find_dss_of_node();

	if (!node)

		return 0;



	if (!of_device_is_available(node))

		return 0;



	pdev = of_find_device_by_node(node);



	if (!pdev) {

		pr_err("Unable to find DSS platform device\n");

		return -ENODEV;

	}



	r = of_platform_populate(node, NULL, NULL, &pdev->dev);

	if (r) {

		pr_err("Unable to populate DSS submodule devices\n");

		return r;

	}



	return omapdss_init_fbdev();

}

omap_device_initcall(omapdss_init_of);

#endif /* CONFIG_FB_OMAP2 */



static void dispc_disable_outputs(void)
@@ -361,58 +411,3 @@ int omap_dss_reset(struct omap_hwmod *oh) 


	return r;

}
 


static const char * const omapdss_compat_names[] __initconst = {

	"ti,omap2-dss",

	"ti,omap3-dss",

	"ti,omap4-dss",

	"ti,omap5-dss",

	"ti,dra7-dss",

};



static struct device_node * __init omapdss_find_dss_of_node(void)

{

	struct device_node *node;

	int i;



	for (i = 0; i < ARRAY_SIZE(omapdss_compat_names); ++i) {

		node = of_find_compatible_node(NULL, NULL,

			omapdss_compat_names[i]);

		if (node)

			return node;

	}



	return NULL;

}



static int __init omapdss_init_of(void)

{

	int r;

	struct device_node *node;

	struct platform_device *pdev;



	/* only create dss helper devices if dss is enabled in the .dts */



	node = omapdss_find_dss_of_node();

	if (!node)

		return 0;



	if (!of_device_is_available(node))

		return 0;



	pdev = of_find_device_by_node(node);



	if (!pdev) {

		pr_err("Unable to find DSS platform device\n");

		return -ENODEV;

	}



	r = of_platform_populate(node, NULL, NULL, &pdev->dev);

	if (r) {

		pr_err("Unable to populate DSS submodule devices\n");

		return r;

	}



	return omapdss_init_fbdev();

}

omap_device_initcall(omapdss_init_of);

drivers/gpu/drm/drm_dp_mst_topology.c

+3 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,9 @@ static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_ 
	mutex_lock(&mgr->lock);

	mstb = mgr->mst_primary;



	if (!mstb)

		goto out;



	for (i = 0; i < lct - 1; i++) {

		int shift = (i % 2) ? 0 : 4;

		int port_num = (rad[i / 2] >> shift) & 0xf;

drivers/gpu/drm/drm_fourcc.c

+1 −1
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ EXPORT_SYMBOL(drm_mode_legacy_fb_format); 


/**

 * drm_driver_legacy_fb_format - compute drm fourcc code from legacy description

 * @dev: DRM device

 * @bpp: bits per pixels

 * @depth: bit depth per pixel

 * @native: use host native byte order

 *

 * Computes a drm fourcc pixel format code for the given @bpp/@depth values.

 * Unlike drm_mode_legacy_fb_format() this looks at the drivers mode_config,

drivers/gpu/drm/meson/meson_venc.c

+8 −7
Original line number Diff line number Diff line
@@ -854,6 +854,13 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, 
	unsigned int sof_lines;

	unsigned int vsync_lines;



	/* Use VENCI for 480i and 576i and double HDMI pixels */

	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {

		hdmi_repeat = true;

		use_enci = true;

		venc_hdmi_latency = 1;

	}



	if (meson_venc_hdmi_supported_vic(vic)) {

		vmode = meson_venc_hdmi_get_vic_vmode(vic);

		if (!vmode) {
@@ -865,13 +872,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, 
	} else {

		meson_venc_hdmi_get_dmt_vmode(mode, &vmode_dmt);

		vmode = &vmode_dmt;

	}



	/* Use VENCI for 480i and 576i and double HDMI pixels */

	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {

		hdmi_repeat = true;

		use_enci = true;

		venc_hdmi_latency = 1;

		use_enci = false;

	}



	/* Repeat VENC pixels for 480/576i/p, 720p50/60 and 1080p50/60 */

drivers/gpu/drm/omapdrm/dss/dsi.c

+11 −11
Original line number Diff line number Diff line
@@ -5409,11 +5409,14 @@ static int dsi_probe(struct platform_device *pdev) 


	/* DSI on OMAP3 doesn't have register DSI_GNQ, set number

	 * of data to 3 by default */

	if (dsi->data->quirks & DSI_QUIRK_GNQ)

	if (dsi->data->quirks & DSI_QUIRK_GNQ) {

		dsi_runtime_get(dsi);

		/* NB_DATA_LANES */

		dsi->num_lanes_supported = 1 + REG_GET(dsi, DSI_GNQ, 11, 9);

	else

		dsi_runtime_put(dsi);

	} else {

		dsi->num_lanes_supported = 3;

	}



	r = dsi_init_output(dsi);

	if (r)
@@ -5426,15 +5429,19 @@ static int dsi_probe(struct platform_device *pdev) 
	}



	r = of_platform_populate(dev->of_node, NULL, NULL, dev);

	if (r)

	if (r) {

		DSSERR("Failed to populate DSI child devices: %d\n", r);

		goto err_uninit_output;

	}



	r = component_add(&pdev->dev, &dsi_component_ops);

	if (r)

		goto err_uninit_output;

		goto err_of_depopulate;



	return 0;



err_of_depopulate:

	of_platform_depopulate(dev);

err_uninit_output:

	dsi_uninit_output(dsi);

err_pm_disable:
@@ -5470,19 +5477,12 @@ static int dsi_runtime_suspend(struct device *dev) 
	/* wait for current handler to finish before turning the DSI off */

	synchronize_irq(dsi->irq);



	dispc_runtime_put(dsi->dss->dispc);



	return 0;

}



static int dsi_runtime_resume(struct device *dev)

{

	struct dsi_data *dsi = dev_get_drvdata(dev);

	int r;



	r = dispc_runtime_get(dsi->dss->dispc);

	if (r)

		return r;



	dsi->is_enabled = true;

	/* ensure the irq handler sees the is_enabled value */

CRA Git | Maintained and supported by SUSTech CRA and CCSE