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

Commit bc4611e8 authored by Xinliang Liu's avatar Xinliang Liu
Browse files

drm/hisilicon: Add vblank driver for ADE 



Add vblank irq handle.

v8: None.
v7:
- Fix irq flag "DRIVER_IRQF_SHARED" to "IRQF_SHARED".
v6: None.
v5: None.
v4: None.
v3:
- Remove hisi_get_crtc_from_index func.
- A few cleanup.
v2:
- Remove abtraction layer.

Signed-off-by: default avatarXinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: default avatarXinwei Kong <kong.kongxinwei@hisilicon.com>
parent d3c9a738

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

+62 −0
Original line number Diff line number Diff line
@@ -302,6 +302,59 @@ static void ade_set_medianoc_qos(struct ade_crtc *acrtc) 
			   SOCKET_QOS_EN, SOCKET_QOS_EN);

}



static int ade_enable_vblank(struct drm_device *dev, unsigned int pipe)

{

	struct kirin_drm_private *priv = dev->dev_private;

	struct ade_crtc *acrtc = to_ade_crtc(priv->crtc[pipe]);

	struct ade_hw_ctx *ctx = acrtc->ctx;

	void __iomem *base = ctx->base;



	if (!ctx->power_on)

		(void)ade_power_up(ctx);



	ade_update_bits(base + LDI_INT_EN, FRAME_END_INT_EN_OFST,

			MASK(1), 1);



	return 0;

}



static void ade_disable_vblank(struct drm_device *dev, unsigned int pipe)

{

	struct kirin_drm_private *priv = dev->dev_private;

	struct ade_crtc *acrtc = to_ade_crtc(priv->crtc[pipe]);

	struct ade_hw_ctx *ctx = acrtc->ctx;

	void __iomem *base = ctx->base;



	if (!ctx->power_on) {

		DRM_ERROR("power is down! vblank disable fail\n");

		return;

	}



	ade_update_bits(base + LDI_INT_EN, FRAME_END_INT_EN_OFST,

			MASK(1), 0);

}



static irqreturn_t ade_irq_handler(int irq, void *data)

{

	struct ade_crtc *acrtc = data;

	struct ade_hw_ctx *ctx = acrtc->ctx;

	struct drm_crtc *crtc = &acrtc->base;

	void __iomem *base = ctx->base;

	u32 status;



	status = readl(base + LDI_MSK_INT);

	DRM_DEBUG_VBL("LDI IRQ: status=0x%X\n", status);



	/* vblank irq */

	if (status & BIT(FRAME_END_INT_EN_OFST)) {

		ade_update_bits(base + LDI_INT_CLR, FRAME_END_INT_EN_OFST,

				MASK(1), 1);

		drm_crtc_handle_vblank(crtc);

	}



	return IRQ_HANDLED;

}



static void ade_display_enable(struct ade_crtc *acrtc)

{

	struct ade_hw_ctx *ctx = acrtc->ctx;
@@ -977,6 +1030,15 @@ static int ade_drm_init(struct drm_device *dev) 
	if (ret)

		return ret;



	/* vblank irq init */

	ret = devm_request_irq(dev->dev, ctx->irq, ade_irq_handler,

			       IRQF_SHARED, dev->driver->name, acrtc);

	if (ret)

		return ret;

	dev->driver->get_vblank_counter = drm_vblank_no_hw_counter;

	dev->driver->enable_vblank = ade_enable_vblank;

	dev->driver->disable_vblank = ade_disable_vblank;



	return 0;

}

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c

+13 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) 
{

	struct kirin_drm_private *priv = dev->dev_private;



	drm_vblank_cleanup(dev);

	dc_ops->cleanup(dev);

	drm_mode_config_cleanup(dev);

	devm_kfree(dev->dev, priv);
@@ -85,11 +86,22 @@ static int kirin_drm_kms_init(struct drm_device *dev) 
		goto err_dc_cleanup;

	}



	/* vblank init */

	ret = drm_vblank_init(dev, dev->mode_config.num_crtc);

	if (ret) {

		DRM_ERROR("failed to initialize vblank.\n");

		goto err_unbind_all;

	}

	/* with irq_enabled = true, we can use the vblank feature. */

	dev->irq_enabled = true;



	/* reset all the states of crtc/plane/encoder/connector */

	drm_mode_config_reset(dev);



	return 0;



err_unbind_all:

	component_unbind_all(dev->dev, dev);

err_dc_cleanup:

	dc_ops->cleanup(dev);

err_mode_config_cleanup:
@@ -123,7 +135,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file, 


static struct drm_driver kirin_drm_driver = {

	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME |

				  DRIVER_ATOMIC,

				  DRIVER_ATOMIC | DRIVER_HAVE_IRQ,

	.fops			= &kirin_drm_fops,

	.set_busid		= drm_platform_set_busid,