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

Commit ffc26740 authored by Eric Anholt's avatar Eric Anholt
Browse files

drm/vc4: Disable V3D interactions if the v3d component didn't probe. 



One might want to use the VC4 display stack without using Mesa.
Similar to the debugfs fixes for not having all of the possible
display bits enabled, make sure you can't oops in vc4 if v3d isn't
enabled.

v2: Fix matching against other v3d variants (review by Paul), don't
    forget to set irq_enabled so that the vblank uapi works
v3: Use -ENODEV instead of -EINVAL on Paul's suggestion.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401183559.3823-2-eric@anholt.net


Reviewed-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
parent c9be804c

drivers/gpu/drm/vc4/vc4_drv.c

+10 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ static int vc4_get_param_ioctl(struct drm_device *dev, void *data, 
	if (args->pad != 0)

		return -EINVAL;



	if (!vc4->v3d)

		return -ENODEV;



	switch (args->param) {

	case DRM_VC4_PARAM_V3D_IDENT0:

		ret = vc4_v3d_pm_get(vc4);
@@ -248,6 +251,7 @@ static int vc4_drm_bind(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct drm_device *drm;

	struct vc4_dev *vc4;

	struct device_node *node;

	int ret = 0;



	dev->coherent_dma_mask = DMA_BIT_MASK(32);
@@ -256,6 +260,12 @@ static int vc4_drm_bind(struct device *dev) 
	if (!vc4)

		return -ENOMEM;



	/* If VC4 V3D is missing, don't advertise render nodes. */

	node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL);

	if (!node || !of_device_is_available(node))

		vc4_drm_driver.driver_features &= ~DRIVER_RENDER;

	of_node_put(node);



	drm = drm_dev_alloc(&vc4_drm_driver, dev);

	if (IS_ERR(drm))

		return PTR_ERR(drm);

drivers/gpu/drm/vc4/vc4_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, 


/* vc4_v3d.c */

extern struct platform_driver vc4_v3d_driver;

extern const struct of_device_id vc4_v3d_dt_match[];

int vc4_v3d_get_bin_slot(struct vc4_dev *vc4);

int vc4_v3d_pm_get(struct vc4_dev *vc4);

void vc4_v3d_pm_put(struct vc4_dev *vc4);

drivers/gpu/drm/vc4/vc4_gem.c

+10 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ vc4_get_hang_state_ioctl(struct drm_device *dev, void *data, 
	u32 i;

	int ret = 0;



	if (!vc4->v3d) {

		DRM_DEBUG("VC4_GET_HANG_STATE with no VC4 V3D probed\n");

		return -ENODEV;

	}



	spin_lock_irqsave(&vc4->job_lock, irqflags);

	kernel_state = vc4->hang_state;

	if (!kernel_state) {
@@ -1119,6 +1124,11 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data, 
	struct dma_fence *in_fence;

	int ret = 0;



	if (!vc4->v3d) {

		DRM_DEBUG("VC4_SUBMIT_CL with no VC4 V3D probed\n");

		return -ENODEV;

	}



	if ((args->flags & ~(VC4_SUBMIT_CL_USE_CLEAR_COLOR |

			     VC4_SUBMIT_CL_FIXED_RCL_ORDER |

			     VC4_SUBMIT_CL_RCL_ORDER_INCREASING_X |

drivers/gpu/drm/vc4/vc4_irq.c

+9 −0
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ vc4_irq_preinstall(struct drm_device *dev) 
{

	struct vc4_dev *vc4 = to_vc4_dev(dev);



	if (!vc4->v3d)

		return;



	init_waitqueue_head(&vc4->job_wait_queue);

	INIT_WORK(&vc4->overflow_mem_work, vc4_overflow_mem_work);
@@ -243,6 +246,9 @@ vc4_irq_postinstall(struct drm_device *dev) 
{

	struct vc4_dev *vc4 = to_vc4_dev(dev);



	if (!vc4->v3d)

		return 0;



	/* Enable both the render done and out of memory interrupts. */

	V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS);
@@ -254,6 +260,9 @@ vc4_irq_uninstall(struct drm_device *dev) 
{

	struct vc4_dev *vc4 = to_vc4_dev(dev);



	if (!vc4->v3d)

		return;



	/* Disable sending interrupts for our driver's IRQs. */

	V3D_WRITE(V3D_INTDIS, V3D_DRIVER_IRQS);

drivers/gpu/drm/vc4/vc4_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ int vc4_kms_load(struct drm_device *dev) 
	/* Set support for vblank irq fast disable, before drm_vblank_init() */

	dev->vblank_disable_immediate = true;



	dev->irq_enabled = true;

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

	if (ret < 0) {

		dev_err(dev->dev, "failed to initialize vblank\n");