Commit 2819cf0e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2021-08-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.15:

UAPI Changes:

Cross-subsystem Changes:
- Add lockdep_assert(once) helpers.

Core Changes:
- Add lockdep assert to drm_is_current_master_locked.
- Fix typos in dma-buf documentation.
- Mark drm irq midlayer as legacy only.
- Fix GPF in udmabuf_create.
- Rename member to correct value in drm_edid.h

Driver Changes:
- Build fix to make nouveau build with NOUVEAU_BACKLIGHT.
- Add MI101AIT-ICP1, LTTD800480070-L6WWH-RT panels.
- Assorted fixes to bridge/it66121, anx7625.
- Add custom crtc_state to simple helpers, and use it to
  convert pll handling in mgag200 to atomic.
- Convert drivers to use offset-adjusted framebuffer bo mappings.
- Assorted small fixes and fix for a use-after-free in vmwgfx.
- Convert remaining callers of non-legacy drivers to use linux irqs directly.
- Small cleanup in ingenic.
- Small fixes to virtio and ti-sn65dsi86.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1cf2d7fc-402d-1852-574a-21cbbd2eaebf@linux.intel.com
parents a22c074f c7782443

drivers/dma-buf/udmabuf.c

+2 −2
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ static long udmabuf_create(struct miscdevice *device, 
				if (!hpage) {

					hpage = find_get_page_flags(mapping, pgoff,

								    FGP_ACCESSED);

					if (IS_ERR(hpage)) {

						ret = PTR_ERR(hpage);

					if (!hpage) {

						ret = -EINVAL;

						goto err;

					}

				}

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,6 @@ static const struct drm_driver amdgpu_kms_driver = { 
	.open = amdgpu_driver_open_kms,

	.postclose = amdgpu_driver_postclose_kms,

	.lastclose = amdgpu_driver_lastclose_kms,

	.irq_handler = amdgpu_irq_handler,

	.ioctls = amdgpu_ioctls_kms,

	.num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),

	.dumb_create = amdgpu_mode_dumb_create,

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

+14 −7
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <linux/pci.h>



#include <drm/drm_crtc_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_vblank.h>

#include <drm/amdgpu_drm.h>

#include <drm/drm_drv.h>
@@ -184,7 +183,7 @@ void amdgpu_irq_disable_all(struct amdgpu_device *adev) 
 * Returns:

 * result of handling the IRQ, as defined by &irqreturn_t

 */

irqreturn_t amdgpu_irq_handler(int irq, void *arg)

static irqreturn_t amdgpu_irq_handler(int irq, void *arg)

{

	struct drm_device *dev = (struct drm_device *) arg;

	struct amdgpu_device *adev = drm_to_adev(dev);
@@ -307,6 +306,7 @@ static void amdgpu_restore_msix(struct amdgpu_device *adev) 
int amdgpu_irq_init(struct amdgpu_device *adev)

{

	int r = 0;

	unsigned int irq;



	spin_lock_init(&adev->irq.lock);
@@ -349,15 +349,22 @@ int amdgpu_irq_init(struct amdgpu_device *adev) 
	INIT_WORK(&adev->irq.ih2_work, amdgpu_irq_handle_ih2);

	INIT_WORK(&adev->irq.ih_soft_work, amdgpu_irq_handle_ih_soft);



	adev->irq.installed = true;

	/* Use vector 0 for MSI-X */

	r = drm_irq_install(adev_to_drm(adev), pci_irq_vector(adev->pdev, 0));

	/* Use vector 0 for MSI-X. */

	r = pci_irq_vector(adev->pdev, 0);

	if (r < 0)

		return r;

	irq = r;



	/* PCI devices require shared interrupts. */

	r = request_irq(irq, amdgpu_irq_handler, IRQF_SHARED, adev_to_drm(adev)->driver->name,

			adev_to_drm(adev));

	if (r) {

		adev->irq.installed = false;

		if (!amdgpu_device_has_dc_support(adev))

			flush_work(&adev->hotplug_work);

		return r;

	}

	adev->irq.installed = true;

	adev->irq.irq = irq;

	adev_to_drm(adev)->max_vblank_count = 0x00ffffff;



	DRM_DEBUG("amdgpu: irq initialized.\n");
@@ -368,7 +375,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev) 
void amdgpu_irq_fini_hw(struct amdgpu_device *adev)

{

	if (adev->irq.installed) {

		drm_irq_uninstall(&adev->ddev);

		free_irq(adev->irq.irq, adev_to_drm(adev));

		adev->irq.installed = false;

		if (adev->irq.msi_enabled)

			pci_free_irq_vectors(adev->pdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct amdgpu_irq_src_funcs { 


struct amdgpu_irq {

	bool				installed;

	unsigned int			irq;

	spinlock_t			lock;

	/* interrupt sources */

	struct amdgpu_irq_client	client[AMDGPU_IRQ_CLIENTID_MAX];
@@ -100,7 +101,6 @@ struct amdgpu_irq { 
};



void amdgpu_irq_disable_all(struct amdgpu_device *adev);

irqreturn_t amdgpu_irq_handler(int irq, void *arg);



int amdgpu_irq_init(struct amdgpu_device *adev);

void amdgpu_irq_fini_sw(struct amdgpu_device *adev);

drivers/gpu/drm/arm/hdlcd_drv.c

+96 −78
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <drm/drm_fb_helper.h>

#include <drm/drm_gem_cma_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>
@@ -38,6 +37,94 @@ 
#include "hdlcd_drv.h"

#include "hdlcd_regs.h"



static irqreturn_t hdlcd_irq(int irq, void *arg)

{

	struct drm_device *drm = arg;

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	unsigned long irq_status;



	irq_status = hdlcd_read(hdlcd, HDLCD_REG_INT_STATUS);



#ifdef CONFIG_DEBUG_FS

	if (irq_status & HDLCD_INTERRUPT_UNDERRUN)

		atomic_inc(&hdlcd->buffer_underrun_count);



	if (irq_status & HDLCD_INTERRUPT_DMA_END)

		atomic_inc(&hdlcd->dma_end_count);



	if (irq_status & HDLCD_INTERRUPT_BUS_ERROR)

		atomic_inc(&hdlcd->bus_error_count);



	if (irq_status & HDLCD_INTERRUPT_VSYNC)

		atomic_inc(&hdlcd->vsync_count);



#endif

	if (irq_status & HDLCD_INTERRUPT_VSYNC)

		drm_crtc_handle_vblank(&hdlcd->crtc);



	/* acknowledge interrupt(s) */

	hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status);



	return IRQ_HANDLED;

}



static void hdlcd_irq_preinstall(struct drm_device *drm)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	/* Ensure interrupts are disabled */

	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, 0);

	hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, ~0);

}



static void hdlcd_irq_postinstall(struct drm_device *drm)

{

#ifdef CONFIG_DEBUG_FS

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	unsigned long irq_mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



	/* enable debug interrupts */

	irq_mask |= HDLCD_DEBUG_INT_MASK;



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask);

#endif

}



static int hdlcd_irq_install(struct drm_device *drm, int irq)

{

	int ret;



	if (irq == IRQ_NOTCONNECTED)

		return -ENOTCONN;



	hdlcd_irq_preinstall(drm);



	ret = request_irq(irq, hdlcd_irq, 0, drm->driver->name, drm);

	if (ret)

		return ret;



	hdlcd_irq_postinstall(drm);



	return 0;

}



static void hdlcd_irq_uninstall(struct drm_device *drm)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	/* disable all the interrupts that we might have enabled */

	unsigned long irq_mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



#ifdef CONFIG_DEBUG_FS

	/* disable debug interrupts */

	irq_mask &= ~HDLCD_DEBUG_INT_MASK;

#endif



	/* disable vsync interrupts */

	irq_mask &= ~HDLCD_INTERRUPT_VSYNC;

	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask);



	free_irq(hdlcd->irq, drm);

}



static int hdlcd_load(struct drm_device *drm, unsigned long flags)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;
@@ -90,7 +177,12 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags) 
		goto setup_fail;

	}



	ret = drm_irq_install(drm, platform_get_irq(pdev, 0));

	ret = platform_get_irq(pdev, 0);

	if (ret < 0)

		goto irq_fail;

	hdlcd->irq = ret;



	ret = hdlcd_irq_install(drm, hdlcd->irq);

	if (ret < 0) {

		DRM_ERROR("failed to install IRQ handler\n");

		goto irq_fail;
@@ -122,76 +214,6 @@ static void hdlcd_setup_mode_config(struct drm_device *drm) 
	drm->mode_config.funcs = &hdlcd_mode_config_funcs;

}



static irqreturn_t hdlcd_irq(int irq, void *arg)

{

	struct drm_device *drm = arg;

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	unsigned long irq_status;



	irq_status = hdlcd_read(hdlcd, HDLCD_REG_INT_STATUS);



#ifdef CONFIG_DEBUG_FS

	if (irq_status & HDLCD_INTERRUPT_UNDERRUN)

		atomic_inc(&hdlcd->buffer_underrun_count);



	if (irq_status & HDLCD_INTERRUPT_DMA_END)

		atomic_inc(&hdlcd->dma_end_count);



	if (irq_status & HDLCD_INTERRUPT_BUS_ERROR)

		atomic_inc(&hdlcd->bus_error_count);



	if (irq_status & HDLCD_INTERRUPT_VSYNC)

		atomic_inc(&hdlcd->vsync_count);



#endif

	if (irq_status & HDLCD_INTERRUPT_VSYNC)

		drm_crtc_handle_vblank(&hdlcd->crtc);



	/* acknowledge interrupt(s) */

	hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status);



	return IRQ_HANDLED;

}



static void hdlcd_irq_preinstall(struct drm_device *drm)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	/* Ensure interrupts are disabled */

	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, 0);

	hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, ~0);

}



static int hdlcd_irq_postinstall(struct drm_device *drm)

{

#ifdef CONFIG_DEBUG_FS

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	unsigned long irq_mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



	/* enable debug interrupts */

	irq_mask |= HDLCD_DEBUG_INT_MASK;



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask);

#endif

	return 0;

}



static void hdlcd_irq_uninstall(struct drm_device *drm)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	/* disable all the interrupts that we might have enabled */

	unsigned long irq_mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK);



#ifdef CONFIG_DEBUG_FS

	/* disable debug interrupts */

	irq_mask &= ~HDLCD_DEBUG_INT_MASK;

#endif



	/* disable vsync interrupts */

	irq_mask &= ~HDLCD_INTERRUPT_VSYNC;



	hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask);

}



#ifdef CONFIG_DEBUG_FS

static int hdlcd_show_underrun_count(struct seq_file *m, void *arg)

{
@@ -236,10 +258,6 @@ DEFINE_DRM_GEM_CMA_FOPS(fops); 


static const struct drm_driver hdlcd_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	.irq_handler = hdlcd_irq,

	.irq_preinstall = hdlcd_irq_preinstall,

	.irq_postinstall = hdlcd_irq_postinstall,

	.irq_uninstall = hdlcd_irq_uninstall,

	DRM_GEM_CMA_DRIVER_OPS,

#ifdef CONFIG_DEBUG_FS

	.debugfs_init = hdlcd_debugfs_init,
@@ -316,7 +334,7 @@ static int hdlcd_drm_bind(struct device *dev) 
err_unload:

	of_node_put(hdlcd->crtc.port);

	hdlcd->crtc.port = NULL;

	drm_irq_uninstall(drm);

	hdlcd_irq_uninstall(drm);

	of_reserved_mem_device_release(drm->dev);

err_free:

	drm_mode_config_cleanup(drm);
@@ -338,7 +356,7 @@ static void hdlcd_drm_unbind(struct device *dev) 
	hdlcd->crtc.port = NULL;

	pm_runtime_get_sync(dev);

	drm_atomic_helper_shutdown(drm);

	drm_irq_uninstall(drm);

	hdlcd_irq_uninstall(drm);

	pm_runtime_put(dev);

	if (pm_runtime_enabled(dev))

		pm_runtime_disable(dev);