Commit c1736b90 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm: IRQ midlayer is now legacy 



Hide the DRM midlayer behind CONFIG_DRM_LEGACY, make functions use
the prefix drm_legacy_, and move declarations to drm_legacy.h.
In struct drm_device, move the fields irq and irq_enabled behind
CONFIG_DRM_LEGACY.

All callers have been updated.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210803090704.32152-15-tzimmermann@suse.de
parent 0b05dd6b

drivers/gpu/drm/drm_irq.c

+7 −56
Original line number Diff line number Diff line
@@ -60,46 +60,14 @@ 
#include <drm/drm.h>

#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_irq.h>

#include <drm/drm_legacy.h>

#include <drm/drm_print.h>

#include <drm/drm_vblank.h>



#include "drm_internal.h"



/**

 * DOC: irq helpers

 *

 * The DRM core provides very simple support helpers to enable IRQ handling on a

 * device through the drm_irq_install() and drm_irq_uninstall() functions. This

 * only supports devices with a single interrupt on the main device stored in

 * &drm_device.dev and set as the device parameter in drm_dev_alloc().

 *

 * These IRQ helpers are strictly optional. Since these helpers don't automatically

 * clean up the requested interrupt like e.g. devm_request_irq() they're not really

 * recommended.

 */



/**

 * drm_irq_install - install IRQ handler

 * @dev: DRM device

 * @irq: IRQ number to install the handler for

 *

 * Initializes the IRQ related data. Installs the handler, calling the driver

 * &drm_driver.irq_preinstall and &drm_driver.irq_postinstall functions before

 * and after the installation.

 *

 * This is the simplified helper interface provided for drivers with no special

 * needs.

 *

 * @irq must match the interrupt number that would be passed to request_irq(),

 * if called directly instead of using this helper function.

 *

 * &drm_driver.irq_handler is called to handle the registered interrupt.

 *

 * Returns:

 * Zero on success or a negative error code on failure.

 */

int drm_irq_install(struct drm_device *dev, int irq)

#if IS_ENABLED(CONFIG_DRM_LEGACY)

static int drm_legacy_irq_install(struct drm_device *dev, int irq)

{

	int ret;

	unsigned long sh_flags = 0;
@@ -144,24 +112,8 @@ int drm_irq_install(struct drm_device *dev, int irq) 


	return ret;

}

EXPORT_SYMBOL(drm_irq_install);



/**

 * drm_irq_uninstall - uninstall the IRQ handler

 * @dev: DRM device

 *

 * Calls the driver's &drm_driver.irq_uninstall function and unregisters the IRQ

 * handler.  This should only be called by drivers which used drm_irq_install()

 * to set up their interrupt handler.

 *

 * Note that for kernel modesetting drivers it is a bug if this function fails.

 * The sanity checks are only to catch buggy user modesetting drivers which call

 * the same function through an ioctl.

 *

 * Returns:

 * Zero on success or a negative error code on failure.

 */

int drm_irq_uninstall(struct drm_device *dev)

int drm_legacy_irq_uninstall(struct drm_device *dev)

{

	unsigned long irqflags;

	bool irq_enabled;
@@ -207,9 +159,8 @@ int drm_irq_uninstall(struct drm_device *dev) 


	return 0;

}

EXPORT_SYMBOL(drm_irq_uninstall);

EXPORT_SYMBOL(drm_legacy_irq_uninstall);



#if IS_ENABLED(CONFIG_DRM_LEGACY)

int drm_legacy_irq_control(struct drm_device *dev, void *data,

			   struct drm_file *file_priv)

{
@@ -238,13 +189,13 @@ int drm_legacy_irq_control(struct drm_device *dev, void *data, 
		    ctl->irq != irq)

			return -EINVAL;

		mutex_lock(&dev->struct_mutex);

		ret = drm_irq_install(dev, irq);

		ret = drm_legacy_irq_install(dev, irq);

		mutex_unlock(&dev->struct_mutex);



		return ret;

	case DRM_UNINST_HANDLER:

		mutex_lock(&dev->struct_mutex);

		ret = drm_irq_uninstall(dev);

		ret = drm_legacy_irq_uninstall(dev);

		mutex_unlock(&dev->struct_mutex);



		return ret;

drivers/gpu/drm/drm_legacy_misc.c

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_irq.h>

#include <drm/drm_print.h>



#include "drm_internal.h"
@@ -78,7 +77,7 @@ int drm_legacy_setup(struct drm_device * dev) 
void drm_legacy_dev_reinit(struct drm_device *dev)

{

	if (dev->irq_enabled)

		drm_irq_uninstall(dev);

		drm_legacy_irq_uninstall(dev);



	mutex_lock(&dev->struct_mutex);

drivers/gpu/drm/drm_vblank.c

+4 −4
Original line number Diff line number Diff line
@@ -1739,10 +1739,10 @@ static void drm_wait_vblank_reply(struct drm_device *dev, unsigned int pipe, 


static bool drm_wait_vblank_supported(struct drm_device *dev)

{

	if  (IS_ENABLED(CONFIG_DRM_LEGACY)) {

#if IS_ENABLED(CONFIG_DRM_LEGACY)

	if (unlikely(drm_core_check_feature(dev, DRIVER_LEGACY)))

		return dev->irq_enabled;

	}

#endif

	return drm_dev_has_vblank(dev);

}

drivers/gpu/drm/i810/i810_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <drm/drm_drv.h>

#include <drm/drm_file.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_irq.h>

#include <drm/drm_print.h>

#include <drm/i810_drm.h>
@@ -209,7 +208,7 @@ static int i810_dma_cleanup(struct drm_device *dev) 
	 * is freed, it's too late.

	 */

	if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ) && dev->irq_enabled)

		drm_irq_uninstall(dev);

		drm_legacy_irq_uninstall(dev);



	if (dev->dev_private) {

		int i;

drivers/gpu/drm/mga/mga_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ static int mga_do_cleanup_dma(struct drm_device *dev, int full_cleanup) 
	 * is freed, it's too late.

	 */

	if (dev->irq_enabled)

		drm_irq_uninstall(dev);

		drm_legacy_irq_uninstall(dev);



	if (dev->dev_private) {

		drm_mga_private_t *dev_priv = dev->dev_private;