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

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

Merge branch 'drm-rockchip-next-2015-12-28' of... 

Merge branch 'drm-rockchip-next-2015-12-28' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

These patches convert drm/rockchip to atomic API and add rk3036 vop support.

* 'drm-rockchip-next-2015-12-28' of https://github.com/markyzq/kernel-drm-rockchip:
  dt-bindings: add document for rk3036-vop
  drm/rockchip: vop: add rk3036 vop support
  drm/rockchip: vop: spilt scale regsters
  drm/rockchip: vop: spilt register related into rockchip_reg_vop.c
  drm/rockchip: vop: move interrupt registers into vop_data
  drm/rockchip: vop: merge vop cfg_done into vop_data
  drm/rockchip: dw_hdmi: use encoder enable function
  drm: bridge/dw_hdmi: add atomic API support
  drm/rockchip: direct config connecter gate and out_mode
  drm/rockchip: support atomic asynchronous commit
  drm/rockchip: Optimization vop mode set
  drm/rockchip: Convert to support atomic API
  drm/rockchip: vop: replace dpms with enable/disable
  drm/rockchip: Use new vblank api drm_crtc_vblank_*
parents 20f8e032 d4d3c6cb

Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ buffer to an external LCD interface. 
Required properties:

- compatible: value should be one of the following

		"rockchip,rk3288-vop";

		"rockchip,rk3036-vop";



- interrupts: should contain a list of all VOP IP block interrupts in the

		 order: VSYNC, LCD_SYSTEM. The interrupt specifier

drivers/gpu/drm/bridge/dw-hdmi.c

+21 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <drm/drm_of.h>

#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_encoder_slave.h>
@@ -1522,6 +1523,17 @@ static const struct drm_connector_funcs dw_hdmi_connector_funcs = { 
	.force = dw_hdmi_connector_force,

};



static const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = {

	.dpms = drm_atomic_helper_connector_dpms,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.detect = dw_hdmi_connector_detect,

	.destroy = dw_hdmi_connector_destroy,

	.force = dw_hdmi_connector_force,

	.reset = drm_atomic_helper_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = {

	.get_modes = dw_hdmi_connector_get_modes,

	.mode_valid = dw_hdmi_connector_mode_valid,
@@ -1645,7 +1657,14 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) 


	drm_connector_helper_add(&hdmi->connector,

				 &dw_hdmi_connector_helper_funcs);

	drm_connector_init(drm, &hdmi->connector, &dw_hdmi_connector_funcs,



	if (drm_core_check_feature(drm, DRIVER_ATOMIC))

		drm_connector_init(drm, &hdmi->connector,

				   &dw_hdmi_atomic_connector_funcs,

				   DRM_MODE_CONNECTOR_HDMIA);

	else

		drm_connector_init(drm, &hdmi->connector,

				   &dw_hdmi_connector_funcs,

				   DRM_MODE_CONNECTOR_HDMIA);



	hdmi->connector.encoder = encoder;

drivers/gpu/drm/rockchip/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,4 +7,5 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o rockchip_drm_fbdev.o \ 


obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o



obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o
 
obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o \

				rockchip_vop_reg.o

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

+5 −9
Original line number Diff line number Diff line
@@ -195,12 +195,15 @@ static void dw_hdmi_rockchip_encoder_mode_set(struct drm_encoder *encoder, 
{

}



static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder)

static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder)

{

	struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);

	u32 val;

	int mux;



	rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA,

				      ROCKCHIP_OUT_MODE_AAAA);



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

	if (mux)

		val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16);
@@ -212,17 +215,10 @@ static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder) 
		(mux) ? "LIT" : "BIG");

}



static void dw_hdmi_rockchip_encoder_prepare(struct drm_encoder *encoder)

{

	rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA,

				      ROCKCHIP_OUT_MODE_AAAA);

}



static const struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = {

	.mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup,

	.mode_set   = dw_hdmi_rockchip_encoder_mode_set,

	.prepare    = dw_hdmi_rockchip_encoder_prepare,

	.commit     = dw_hdmi_rockchip_encoder_commit,

	.enable     = dw_hdmi_rockchip_encoder_enable,

	.disable    = dw_hdmi_rockchip_encoder_disable,

};

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+14 −7
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, 
}

EXPORT_SYMBOL_GPL(rockchip_drm_dma_detach_device);



int rockchip_register_crtc_funcs(struct drm_device *dev,

				 const struct rockchip_crtc_funcs *crtc_funcs,

				 int pipe)

int rockchip_register_crtc_funcs(struct drm_crtc *crtc,

				 const struct rockchip_crtc_funcs *crtc_funcs)

{

	struct rockchip_drm_private *priv = dev->dev_private;

	int pipe = drm_crtc_index(crtc);

	struct rockchip_drm_private *priv = crtc->dev->dev_private;



	if (pipe > ROCKCHIP_MAX_CRTC)

		return -EINVAL;
@@ -79,9 +79,10 @@ int rockchip_register_crtc_funcs(struct drm_device *dev, 
}

EXPORT_SYMBOL_GPL(rockchip_register_crtc_funcs);



void rockchip_unregister_crtc_funcs(struct drm_device *dev, int pipe)

void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc)

{

	struct rockchip_drm_private *priv = dev->dev_private;

	int pipe = drm_crtc_index(crtc);

	struct rockchip_drm_private *priv = crtc->dev->dev_private;



	if (pipe > ROCKCHIP_MAX_CRTC)

		return;
@@ -139,6 +140,9 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) 
	if (!private)

		return -ENOMEM;



	mutex_init(&private->commit.lock);

	INIT_WORK(&private->commit.work, rockchip_drm_atomic_work);



	drm_dev->dev_private = private;



	drm_mode_config_init(drm_dev);
@@ -212,6 +216,8 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) 
	 */

	drm_dev->vblank_disable_allowed = true;



	drm_mode_config_reset(drm_dev);



	ret = rockchip_drm_fbdev_init(drm_dev);

	if (ret)

		goto err_vblank_cleanup;
@@ -275,7 +281,8 @@ const struct vm_operations_struct rockchip_drm_vm_ops = { 
};



static struct drm_driver rockchip_drm_driver = {

	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,

	.driver_features	= DRIVER_MODESET | DRIVER_GEM |

				  DRIVER_PRIME | DRIVER_ATOMIC,

	.load			= rockchip_drm_load,

	.unload			= rockchip_drm_unload,

	.lastclose		= rockchip_drm_lastclose,