From: Thomas Zimmermann <tzimmermann@suse.de>
To: daniel@ffwll.ch, airlied@linux.ie, alexander.deucher@amd.com,
christian.koenig@amd.com, Xinhui.Pan@amd.com,
james.qian.wang@arm.com, liviu.dudau@arm.com,
mihail.atanassov@arm.com, brian.starkey@arm.com,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
inki.dae@samsung.com, jy0922.shim@samsung.com,
sw0312.kim@samsung.com, kyungmin.park@samsung.com,
krzysztof.kozlowski@canonical.com, xinliang.liu@linaro.org,
tiantao6@hisilicon.com, john.stultz@linaro.org,
kong.kongxinwei@hisilicon.com, puck.chen@hisilicon.com,
laurentiu.palcu@oss.nxp.com, l.stach@pengutronix.de,
p.zabel@pengutronix.de, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-imx@nxp.com, chunkuang.hu@kernel.org,
matthias.bgg@gmail.com, bskeggs@redhat.com, tomba@kernel.org,
hjc@rock-chips.com, heiko@sntech.de,
benjamin.gaignard@linaro.org, yannick.fertre@foss.st.com,
philippe.cornu@foss.st.com, mcoquelin.stm32@gmail.com,
alexandre.torgue@foss.st.com, wens@csie.org,
jernej.skrabec@gmail.com, thierry.reding@gmail.com,
jonathanh@nvidia.com, jyri.sarha@iki.fi, emma@anholt.net,
linux-graphics-maintainer@vmware.com, zackr@vmware.com,
hyun.kwon@xilinx.com, laurent.pinchart@ideasonboard.com,
michal.simek@xilinx.com
Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
linux-mediatek@lists.infradead.org,
nouveau@lists.freedesktop.org,
linux-rockchip@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH v2 04/22] drm: Don't test for IRQ support in VBLANK ioctls
Date: Tue, 22 Jun 2021 16:09:44 +0200 [thread overview]
Message-ID: <20210622141002.11590-5-tzimmermann@suse.de> (raw)
In-Reply-To: <20210622141002.11590-1-tzimmermann@suse.de>
For KMS drivers, replace the IRQ check in VBLANK ioctls with a check for
vblank support. IRQs might be enabled wthout vblanking being supported.
This change also removes the DRM framework's only dependency on IRQ state
for non-legacy drivers. For legacy drivers with userspace modesetting,
the original test remains in drm_wait_vblank_ioctl().
v2:
* keep the old test for legacy drivers in
drm_wait_vblank_ioctl() (Daniel)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/drm_irq.c | 10 +++-------
drivers/gpu/drm/drm_vblank.c | 13 +++++++++----
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index c3bd664ea733..1d7785721323 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -74,10 +74,8 @@
* only supports devices with a single interrupt on the main device stored in
* &drm_device.dev and set as the device paramter in drm_dev_alloc().
*
- * These IRQ helpers are strictly optional. Drivers which roll their own only
- * need to set &drm_device.irq_enabled to signal the DRM core that vblank
- * interrupts are working. Since these helpers don't automatically clean up the
- * requested interrupt like e.g. devm_request_irq() they're not really
+ * 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.
*/
@@ -91,9 +89,7 @@
* and after the installation.
*
* This is the simplified helper interface provided for drivers with no special
- * needs. Drivers which need to install interrupt handlers for multiple
- * interrupts must instead set &drm_device.irq_enabled to signal the DRM core
- * that vblank interrupts are available.
+ * needs.
*
* @irq must match the interrupt number that would be passed to request_irq(),
* if called directly instead of using this helper function.
diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 3417e1ac7918..a98a4aad5037 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -1748,8 +1748,13 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,
unsigned int pipe_index;
unsigned int flags, pipe, high_pipe;
- if (!dev->irq_enabled)
- return -EOPNOTSUPP;
+ if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+ if (!drm_dev_has_vblank(dev))
+ return -EOPNOTSUPP;
+ } else {
+ if (!dev->irq_enabled)
+ return -EOPNOTSUPP;
+ }
if (vblwait->request.type & _DRM_VBLANK_SIGNAL)
return -EINVAL;
@@ -2023,7 +2028,7 @@ int drm_crtc_get_sequence_ioctl(struct drm_device *dev, void *data,
if (!drm_core_check_feature(dev, DRIVER_MODESET))
return -EOPNOTSUPP;
- if (!dev->irq_enabled)
+ if (!drm_dev_has_vblank(dev))
return -EOPNOTSUPP;
crtc = drm_crtc_find(dev, file_priv, get_seq->crtc_id);
@@ -2082,7 +2087,7 @@ int drm_crtc_queue_sequence_ioctl(struct drm_device *dev, void *data,
if (!drm_core_check_feature(dev, DRIVER_MODESET))
return -EOPNOTSUPP;
- if (!dev->irq_enabled)
+ if (!drm_dev_has_vblank(dev))
return -EOPNOTSUPP;
crtc = drm_crtc_find(dev, file_priv, queue_seq->crtc_id);
--
2.32.0
next prev parent reply other threads:[~2021-06-22 14:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 14:09 [PATCH v2 00/22] Deprecate struct drm_device.irq_enabled Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 01/22] drm/amdgpu: Track IRQ state in local device state Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 02/22] drm/hibmc: Call drm_irq_uninstall() unconditionally Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 03/22] drm/radeon: Track IRQ state in local device state Thomas Zimmermann
2021-06-22 14:09 ` Thomas Zimmermann [this message]
2021-06-22 15:25 ` [PATCH v2 04/22] drm: Don't test for IRQ support in VBLANK ioctls Liviu Dudau
2021-06-23 6:43 ` Thomas Zimmermann
2021-06-23 12:15 ` Liviu Dudau
2021-06-22 14:09 ` [PATCH v2 05/22] drm/komeda: Don't set struct drm_device.irq_enabled Thomas Zimmermann
2021-06-22 15:25 ` Liviu Dudau
2021-06-22 14:09 ` [PATCH v2 06/22] drm/malidp: " Thomas Zimmermann
2021-06-22 15:26 ` Liviu Dudau
2021-06-22 14:09 ` [PATCH v2 07/22] drm/exynos: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 08/22] drm/kirin: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 09/22] drm/imx: " Thomas Zimmermann
2021-06-23 6:43 ` Laurentiu Palcu
2021-06-22 14:09 ` [PATCH v2 10/22] drm/mediatek: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 11/22] drm/nouveau: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 12/22] drm/omapdrm: Track IRQ state in local device state Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 13/22] drm/rockchip: Don't set struct drm_device.irq_enabled Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 14/22] drm/sti: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 15/22] drm/stm: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 16/22] drm/sun4i: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 17/22] drm/tegra: " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 18/22] drm/tidss: Don't use " Thomas Zimmermann
2021-06-22 14:09 ` [PATCH v2 19/22] drm/vc4: Don't set " Thomas Zimmermann
2021-06-22 14:10 ` [PATCH v2 20/22] drm/vmwgfx: " Thomas Zimmermann
2021-06-22 14:10 ` [PATCH v2 21/22] drm/xlnx: " Thomas Zimmermann
2021-06-22 14:10 ` [PATCH v2 22/22] drm/zte: " Thomas Zimmermann
2021-06-22 15:24 ` [PATCH v2 00/22] Deprecate " Daniel Vetter
2021-06-22 16:11 ` Laurent Pinchart
2021-06-22 16:17 ` Laurent Pinchart
2021-06-23 6:46 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210622141002.11590-5-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=alexandre.torgue@foss.st.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=benjamin.gaignard@linaro.org \
--cc=brian.starkey@arm.com \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=chunkuang.hu@kernel.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=festevam@gmail.com \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hyun.kwon@xilinx.com \
--cc=inki.dae@samsung.com \
--cc=james.qian.wang@arm.com \
--cc=jernej.skrabec@gmail.com \
--cc=john.stultz@linaro.org \
--cc=jonathanh@nvidia.com \
--cc=jy0922.shim@samsung.com \
--cc=jyri.sarha@iki.fi \
--cc=kernel@pengutronix.de \
--cc=kong.kongxinwei@hisilicon.com \
--cc=krzysztof.kozlowski@canonical.com \
--cc=kyungmin.park@samsung.com \
--cc=l.stach@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=laurentiu.palcu@oss.nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-imx@nxp.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthias.bgg@gmail.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=michal.simek@xilinx.com \
--cc=mihail.atanassov@arm.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=p.zabel@pengutronix.de \
--cc=philippe.cornu@foss.st.com \
--cc=puck.chen@hisilicon.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=sw0312.kim@samsung.com \
--cc=thierry.reding@gmail.com \
--cc=tiantao6@hisilicon.com \
--cc=tomba@kernel.org \
--cc=wens@csie.org \
--cc=xinliang.liu@linaro.org \
--cc=yannick.fertre@foss.st.com \
--cc=zackr@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).