Commit 42e85606 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'imx-drm-next-20160301' of git://git.pengutronix.de/git/pza/linux into drm-next 

imx-drm vblank IRQ control, fence support, and of endpoint helpers

- Add and make use of drm_of_active_endpoint helpers
- Silence a noisy dev_info into a dev_dbg
- Stop touching primary fb on pageflips
- Track flip state explicitly
- Keep GEM buffer objects referenced while scanout is active
- Implement fence sync by deferring flips to a workqueue for
  dma-bufs with pending fences
- Actually disable vblank IRQs while they are not needed

* tag 'imx-drm-next-20160301' of git://git.pengutronix.de/git/pza/linux:
  drm/imx: only enable vblank IRQs when needed
  drm/imx: implement fence sync
  drm/imx: keep GEM object referenced as long as scanout is active
  drm/imx: track flip state explicitly
  drm/imx: don't touch primary fb on pageflip
  drm/imx: ipuv3 plane: Replace dev_info with dev_dbg if a plane's CRTC changes
  gpu: ipu-v3: ipu-dc: Simplify display controller microcode setup
  drm/rockchip: remove rockchip_drm_encoder_get_mux_id
  drm/imx: remove imx_drm_encoder_get_mux_id
  drm: add drm_of_encoder_active_endpoint helpers
parents 4b59d591 411b0336

drivers/gpu/drm/drm_of.c

+34 −0
Original line number Diff line number Diff line
@@ -149,3 +149,37 @@ int drm_of_component_probe(struct device *dev, 
	return component_master_add_with_match(dev, m_ops, match);

}

EXPORT_SYMBOL(drm_of_component_probe);



/*

 * drm_of_encoder_active_endpoint - return the active encoder endpoint

 * @node: device tree node containing encoder input ports

 * @encoder: drm_encoder

 *

 * Given an encoder device node and a drm_encoder with a connected crtc,

 * parse the encoder endpoint connecting to the crtc port.

 */

int drm_of_encoder_active_endpoint(struct device_node *node,

				   struct drm_encoder *encoder,

				   struct of_endpoint *endpoint)

{

	struct device_node *ep;

	struct drm_crtc *crtc = encoder->crtc;

	struct device_node *port;

	int ret;



	if (!node || !crtc)

		return -EINVAL;



	for_each_endpoint_of_node(node, ep) {

		port = of_graph_get_remote_port(ep);

		of_node_put(port);

		if (port == crtc->port) {

			ret = of_graph_parse_endpoint(ep, endpoint);

			of_node_put(ep);

			return ret;

		}

	}



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint);

drivers/gpu/drm/imx/dw_hdmi-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void dw_hdmi_imx_encoder_mode_set(struct drm_encoder *encoder, 
static void dw_hdmi_imx_encoder_commit(struct drm_encoder *encoder)

{

	struct imx_hdmi *hdmi = container_of(encoder, struct imx_hdmi, encoder);

	int mux = imx_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder);

	int mux = drm_of_encoder_active_port_id(hdmi->dev->of_node, encoder);



	regmap_update_bits(hdmi->regmap, IOMUXC_GPR3,

			   IMX6Q_GPR3_HDMI_MUX_CTL_MASK,

drivers/gpu/drm/imx/imx-drm-core.c

+0 −31
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/device.h>

#include <linux/fb.h>

#include <linux/module.h>

#include <linux/of_graph.h>

#include <linux/platform_device.h>

#include <drm/drmP.h>

#include <drm/drm_fb_helper.h>
@@ -412,36 +411,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm, 
}

EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of);



/*

 * @node: device tree node containing encoder input ports

 * @encoder: drm_encoder

 */

int imx_drm_encoder_get_mux_id(struct device_node *node,

			       struct drm_encoder *encoder)

{

	struct imx_drm_crtc *imx_crtc = imx_drm_find_crtc(encoder->crtc);

	struct device_node *ep;

	struct of_endpoint endpoint;

	struct device_node *port;

	int ret;



	if (!node || !imx_crtc)

		return -EINVAL;



	for_each_endpoint_of_node(node, ep) {

		port = of_graph_get_remote_port(ep);

		of_node_put(port);

		if (port == imx_crtc->crtc->port) {

			ret = of_graph_parse_endpoint(ep, &endpoint);

			of_node_put(ep);

			return ret ? ret : endpoint.port;

		}

	}



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id);



static const struct drm_ioctl_desc imx_drm_ioctls[] = {

	/* none so far */

};

drivers/gpu/drm/imx/imx-drm.h

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, 
int imx_drm_set_bus_format(struct drm_encoder *encoder,

		u32 bus_format);



int imx_drm_encoder_get_mux_id(struct device_node *node,

		struct drm_encoder *encoder);

int imx_drm_encoder_parse_of(struct drm_device *drm,

	struct drm_encoder *encoder, struct device_node *np);

drivers/gpu/drm/imx/imx-ldb.c

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
@@ -208,7 +209,7 @@ static void imx_ldb_encoder_commit(struct drm_encoder *encoder) 
	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);

	struct imx_ldb *ldb = imx_ldb_ch->ldb;

	int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;

	int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);

	int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder);



	drm_panel_prepare(imx_ldb_ch->panel);
@@ -258,7 +259,7 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, 
	int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;

	unsigned long serial_clk;

	unsigned long di_clk = mode->clock * 1000;

	int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);

	int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder);



	if (mode->clock > 170000) {

		dev_warn(ldb->dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE