mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 09:56:00 +00:00
drm: Nuke ->vblank_disable_allowed
This was added in
commit 0a3e67a4ca
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Sep 30 12:14:26 2008 -0700
drm: Rework vblank-wait handling to allow interrupt reduction.
to stay backwards-compatible with old UMS code that didn't even tell
the kernel when it did a modeset, so that the kernel could
save/restore vblank counters. At worst this means vblanks will be
somewhat funky on a setup that very likely no one still runs.
So let's just nuke it.
Plan B would be to set it unconditionally in drm_vblank_init for kms
drivers, instead of in each driver separately. So if this patch breaks
anything please only restore the hunks in drmP.h and drm_irq.c, plus
add a check for DRIVER_MODESET in drm_vblank_init.
Stumbled over this in a discussion on irc with Chris.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter
Dave Airlie
parent
fc7fedc20b
commit
fcee59065e
@ -219,7 +219,6 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
|
||||
if (r) {
|
||||
return r;
|
||||
}
|
||||
adev->ddev->vblank_disable_allowed = true;
|
||||
|
||||
/* enable msi */
|
||||
adev->irq.msi_enabled = false;
|
||||
|
||||
@ -379,7 +379,6 @@ static int hdlcd_drm_bind(struct device *dev)
|
||||
DRM_ERROR("failed to initialise vblank\n");
|
||||
goto err_vblank;
|
||||
}
|
||||
drm->vblank_disable_allowed = true;
|
||||
|
||||
drm_mode_config_reset(drm);
|
||||
drm_kms_helper_poll_init(drm);
|
||||
|
||||
@ -113,7 +113,6 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
|
||||
goto err_comp;
|
||||
|
||||
dev->irq_enabled = true;
|
||||
dev->vblank_disable_allowed = 1;
|
||||
|
||||
ret = armada_fbdev_init(dev);
|
||||
if (ret)
|
||||
|
||||
@ -348,9 +348,6 @@ static void vblank_disable_fn(unsigned long arg)
|
||||
unsigned int pipe = vblank->pipe;
|
||||
unsigned long irqflags;
|
||||
|
||||
if (!dev->vblank_disable_allowed)
|
||||
return;
|
||||
|
||||
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
||||
if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
|
||||
DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
|
||||
@ -437,8 +434,6 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
|
||||
"get_vblank_timestamp == NULL\n");
|
||||
}
|
||||
|
||||
dev->vblank_disable_allowed = false;
|
||||
|
||||
return 0;
|
||||
|
||||
err:
|
||||
@ -1585,7 +1580,6 @@ void drm_vblank_post_modeset(struct drm_device *dev, unsigned int pipe)
|
||||
|
||||
if (vblank->inmodeset) {
|
||||
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
||||
dev->vblank_disable_allowed = true;
|
||||
drm_reset_vblank_timestamp(dev, pipe);
|
||||
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
|
||||
|
||||
|
||||
@ -212,13 +212,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
|
||||
*/
|
||||
dev->irq_enabled = true;
|
||||
|
||||
/*
|
||||
* with vblank_disable_allowed = true, vblank interrupt will be disabled
|
||||
* by drm timer once a current process gives up ownership of
|
||||
* vblank event.(after drm_vblank_put function is called)
|
||||
*/
|
||||
dev->vblank_disable_allowed = true;
|
||||
|
||||
/* init kms poll for handling hpd */
|
||||
drm_kms_helper_poll_init(dev);
|
||||
|
||||
|
||||
@ -80,7 +80,6 @@ static int fsl_dcu_load(struct drm_device *dev, unsigned long flags)
|
||||
dev_err(dev->dev, "failed to initialize vblank\n");
|
||||
goto done;
|
||||
}
|
||||
dev->vblank_disable_allowed = true;
|
||||
|
||||
ret = fsl_dcu_drm_irq_init(dev);
|
||||
if (ret < 0)
|
||||
|
||||
@ -374,7 +374,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
|
||||
|
||||
drm_irq_install(dev, dev->pdev->irq);
|
||||
|
||||
dev->vblank_disable_allowed = true;
|
||||
dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
|
||||
dev->driver->get_vblank_counter = psb_get_vblank_counter;
|
||||
|
||||
|
||||
@ -476,9 +476,6 @@ static int i915_load_modeset_init(struct drm_device *dev)
|
||||
|
||||
intel_modeset_gem_init(dev);
|
||||
|
||||
/* Always safe in the mode setting case. */
|
||||
/* FIXME: do pre/post-mode set stuff in core KMS code */
|
||||
dev->vblank_disable_allowed = true;
|
||||
if (INTEL_INFO(dev)->num_pipes == 0)
|
||||
return 0;
|
||||
|
||||
|
||||
@ -252,13 +252,6 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
|
||||
if (ret)
|
||||
goto err_kms;
|
||||
|
||||
/*
|
||||
* with vblank_disable_allowed = true, vblank interrupt will be
|
||||
* disabled by drm timer once a current process gives up ownership
|
||||
* of vblank event. (after drm_vblank_put function is called)
|
||||
*/
|
||||
drm->vblank_disable_allowed = true;
|
||||
|
||||
platform_set_drvdata(drm->platformdev, drm);
|
||||
|
||||
/* Now try and bind all our sub-components */
|
||||
|
||||
@ -291,7 +291,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
|
||||
if (r) {
|
||||
return r;
|
||||
}
|
||||
rdev->ddev->vblank_disable_allowed = true;
|
||||
|
||||
/* enable msi */
|
||||
rdev->msi_enabled = 0;
|
||||
|
||||
@ -216,13 +216,6 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
|
||||
if (ret)
|
||||
goto err_kms_helper_poll_fini;
|
||||
|
||||
/*
|
||||
* with vblank_disable_allowed = true, vblank interrupt will be disabled
|
||||
* by drm timer once a current process gives up ownership of
|
||||
* vblank event.(after drm_vblank_put function is called)
|
||||
*/
|
||||
drm_dev->vblank_disable_allowed = true;
|
||||
|
||||
drm_mode_config_reset(drm_dev);
|
||||
|
||||
ret = rockchip_drm_fbdev_init(drm_dev);
|
||||
|
||||
@ -180,7 +180,6 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
|
||||
|
||||
/* syncpoints are used for full 32-bit hardware VBLANK counters */
|
||||
drm->max_vblank_count = 0xffffffff;
|
||||
drm->vblank_disable_allowed = true;
|
||||
|
||||
err = drm_vblank_init(drm, drm->mode_config.num_crtc);
|
||||
if (err < 0)
|
||||
|
||||
@ -207,8 +207,6 @@ int vc4_kms_load(struct drm_device *dev)
|
||||
dev->mode_config.preferred_depth = 24;
|
||||
dev->mode_config.async_page_flip = true;
|
||||
|
||||
dev->vblank_disable_allowed = true;
|
||||
|
||||
drm_mode_config_reset(dev);
|
||||
|
||||
vc4->fbdev = drm_fbdev_cma_init(dev, 32,
|
||||
|
||||
@ -814,14 +814,6 @@ struct drm_device {
|
||||
bool irq_enabled;
|
||||
int irq;
|
||||
|
||||
/*
|
||||
* At load time, disabling the vblank interrupt won't be allowed since
|
||||
* old clients may not call the modeset ioctl and therefore misbehave.
|
||||
* Once the modeset ioctl *has* been called though, we can safely
|
||||
* disable them when unused.
|
||||
*/
|
||||
bool vblank_disable_allowed;
|
||||
|
||||
/*
|
||||
* If true, vblank interrupt will be disabled immediately when the
|
||||
* refcount drops to zero, as opposed to via the vblank disable
|
||||
|
||||
Loading…
Reference in New Issue
Block a user