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

Commit 2cfb1981 authored by Ayan Halder's avatar Ayan Halder Committed by Liviu Dudau
Browse files

drm/komeda: Make Komeda interrupts shareable 



Komeda interrupts may be shared with other hardware blocks.
One needs to use devm_request_irq() with IRQF_SHARED to create a shared
 interrupt handler.
As a result of not using drm_irq_install() api, one needs to set
"(struct drm_device *)->irq_enabled = true/false" to enable/disable
vblank interrupts.

Changes from v1:-
1. Squashed the following two patches into one (as the second patch is a
consequence of the first one):-
   drm/komeda: Avoid using DRIVER_IRQ_SHARED
   drm/komeda: Enable/Disable vblank interrupts
2. Fixed the commit message (as pointed by Daniel Vetter)
3. Removed calls to 'drm_irq_uninstall()' as we are no longer using
drm_irq_install()
4. Removed the struct member 'komeda_kms_driver.irq_handler' as it is not
used anywhere.

Signed-off-by: default avatarAyan Halder <ayan.halder@arm.com>
Signed-off-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
parent 0b044a99

drivers/gpu/drm/arm/display/komeda/komeda_kms.c

+9 −7
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static struct drm_driver komeda_kms_driver = { 
	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |

			   DRIVER_PRIME | DRIVER_HAVE_IRQ,

	.lastclose			= drm_fb_helper_lastclose,

	.irq_handler			= komeda_kms_irq_handler,

	.gem_free_object_unlocked	= drm_gem_cma_free_object,

	.gem_vm_ops			= &drm_gem_cma_vm_ops,

	.dumb_create			= komeda_gem_cma_dumb_create,
@@ -304,23 +303,26 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev) 


	drm_mode_config_reset(drm);



	err = drm_irq_install(drm, mdev->irq);

	err = devm_request_irq(drm->dev, mdev->irq,

			       komeda_kms_irq_handler, IRQF_SHARED,

			       drm->driver->name, drm);

	if (err)

		goto cleanup_mode_config;



	err = mdev->funcs->enable_irq(mdev);

	if (err)

		goto uninstall_irq;

		goto cleanup_mode_config;



	drm->irq_enabled = true;



	err = drm_dev_register(drm, 0);

	if (err)

		goto uninstall_irq;

		goto cleanup_mode_config;



	return kms;



uninstall_irq:

	drm_irq_uninstall(drm);

cleanup_mode_config:

	drm->irq_enabled = false;

	drm_mode_config_cleanup(drm);

	komeda_kms_cleanup_private_objs(kms);

free_kms:
@@ -333,9 +335,9 @@ void komeda_kms_detach(struct komeda_kms_dev *kms) 
	struct drm_device *drm = &kms->base;

	struct komeda_dev *mdev = drm->dev_private;



	drm->irq_enabled = false;

	mdev->funcs->disable_irq(mdev);

	drm_dev_unregister(drm);

	drm_irq_uninstall(drm);

	component_unbind_all(mdev->dev, drm);

	komeda_kms_cleanup_private_objs(kms);

	drm_mode_config_cleanup(drm);