2017-05-31 16:21:46 +07:00
|
|
|
/*
|
|
|
|
* drm_irq.c IRQ and vblank support
|
|
|
|
*
|
|
|
|
* \author Rickard E. (Rik) Faith <faith@valinux.com>
|
|
|
|
* \author Gareth Hughes <gareth@valinux.com>
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/export.h>
|
2019-05-27 00:35:35 +07:00
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
|
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_drv.h>
|
|
|
|
#include <drm/drm_framebuffer.h>
|
2020-03-23 21:49:23 +07:00
|
|
|
#include <drm/drm_managed.h>
|
2020-01-23 20:59:23 +07:00
|
|
|
#include <drm/drm_modeset_helper_vtables.h>
|
2019-05-27 00:35:35 +07:00
|
|
|
#include <drm/drm_print.h>
|
|
|
|
#include <drm/drm_vblank.h>
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
#include "drm_internal.h"
|
2019-05-27 00:35:35 +07:00
|
|
|
#include "drm_trace.h"
|
2017-05-31 16:21:46 +07:00
|
|
|
|
2017-05-24 21:51:45 +07:00
|
|
|
/**
|
|
|
|
* DOC: vblank handling
|
|
|
|
*
|
2020-04-07 02:47:44 +07:00
|
|
|
* From the computer's perspective, every time the monitor displays
|
|
|
|
* a new frame the scanout engine has "scanned out" the display image
|
|
|
|
* from top to bottom, one row of pixels at a time. The current row
|
|
|
|
* of pixels is referred to as the current scanline.
|
|
|
|
*
|
|
|
|
* In addition to the display's visible area, there's usually a couple of
|
|
|
|
* extra scanlines which aren't actually displayed on the screen.
|
|
|
|
* These extra scanlines don't contain image data and are occasionally used
|
|
|
|
* for features like audio and infoframes. The region made up of these
|
|
|
|
* scanlines is referred to as the vertical blanking region, or vblank for
|
|
|
|
* short.
|
|
|
|
*
|
|
|
|
* For historical reference, the vertical blanking period was designed to
|
|
|
|
* give the electron gun (on CRTs) enough time to move back to the top of
|
|
|
|
* the screen to start scanning out the next frame. Similar for horizontal
|
|
|
|
* blanking periods. They were designed to give the electron gun enough
|
|
|
|
* time to move back to the other side of the screen to start scanning the
|
|
|
|
* next scanline.
|
|
|
|
*
|
|
|
|
* ::
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* physical → ⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽
|
|
|
|
* top of | |
|
|
|
|
* display | |
|
|
|
|
* | New frame |
|
|
|
|
* | |
|
|
|
|
* |↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓|
|
|
|
|
* |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| ← Scanline,
|
|
|
|
* |↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓| updates the
|
|
|
|
* | | frame as it
|
|
|
|
* | | travels down
|
|
|
|
* | | ("sacn out")
|
|
|
|
* | Old frame |
|
|
|
|
* | |
|
|
|
|
* | |
|
|
|
|
* | |
|
|
|
|
* | | physical
|
|
|
|
* | | bottom of
|
|
|
|
* vertical |⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽| ← display
|
|
|
|
* blanking ┆xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx┆
|
|
|
|
* region → ┆xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx┆
|
|
|
|
* ┆xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx┆
|
|
|
|
* start of → ⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽⎽
|
|
|
|
* new frame
|
|
|
|
*
|
|
|
|
* "Physical top of display" is the reference point for the high-precision/
|
|
|
|
* corrected timestamp.
|
|
|
|
*
|
|
|
|
* On a lot of display hardware, programming needs to take effect during the
|
|
|
|
* vertical blanking period so that settings like gamma, the image buffer
|
|
|
|
* buffer to be scanned out, etc. can safely be changed without showing
|
|
|
|
* any visual artifacts on the screen. In some unforgiving hardware, some of
|
|
|
|
* this programming has to both start and end in the same vblank. To help
|
|
|
|
* with the timing of the hardware programming, an interrupt is usually
|
|
|
|
* available to notify the driver when it can start the updating of registers.
|
|
|
|
* The interrupt is in this context named the vblank interrupt.
|
|
|
|
*
|
|
|
|
* The vblank interrupt may be fired at different points depending on the
|
|
|
|
* hardware. Some hardware implementations will fire the interrupt when the
|
|
|
|
* new frame start, other implementations will fire the interrupt at different
|
|
|
|
* points in time.
|
|
|
|
*
|
2017-05-24 21:51:45 +07:00
|
|
|
* Vertical blanking plays a major role in graphics rendering. To achieve
|
|
|
|
* tear-free display, users must synchronize page flips and/or rendering to
|
|
|
|
* vertical blanking. The DRM API offers ioctls to perform page flips
|
|
|
|
* synchronized to vertical blanking and wait for vertical blanking.
|
|
|
|
*
|
|
|
|
* The DRM core handles most of the vertical blanking management logic, which
|
|
|
|
* involves filtering out spurious interrupts, keeping race-free blanking
|
|
|
|
* counters, coping with counter wrap-around and resets and keeping use counts.
|
|
|
|
* It relies on the driver to generate vertical blanking interrupts and
|
|
|
|
* optionally provide a hardware vertical blanking counter.
|
|
|
|
*
|
|
|
|
* Drivers must initialize the vertical blanking handling core with a call to
|
|
|
|
* drm_vblank_init(). Minimally, a driver needs to implement
|
|
|
|
* &drm_crtc_funcs.enable_vblank and &drm_crtc_funcs.disable_vblank plus call
|
2019-02-02 08:23:26 +07:00
|
|
|
* drm_crtc_handle_vblank() in its vblank interrupt handler for working vblank
|
2017-05-24 21:51:45 +07:00
|
|
|
* support.
|
|
|
|
*
|
|
|
|
* Vertical blanking interrupts can be enabled by the DRM core or by drivers
|
|
|
|
* themselves (for instance to handle page flipping operations). The DRM core
|
|
|
|
* maintains a vertical blanking use count to ensure that the interrupts are not
|
|
|
|
* disabled while a user still needs them. To increment the use count, drivers
|
|
|
|
* call drm_crtc_vblank_get() and release the vblank reference again with
|
|
|
|
* drm_crtc_vblank_put(). In between these two calls vblank interrupts are
|
|
|
|
* guaranteed to be enabled.
|
|
|
|
*
|
|
|
|
* On many hardware disabling the vblank interrupt cannot be done in a race-free
|
|
|
|
* manner, see &drm_driver.vblank_disable_immediate and
|
|
|
|
* &drm_driver.max_vblank_count. In that case the vblank core only disables the
|
|
|
|
* vblanks after a timer has expired, which can be configured through the
|
|
|
|
* ``vblankoffdelay`` module parameter.
|
2020-01-29 19:05:17 +07:00
|
|
|
*
|
|
|
|
* Drivers for hardware without support for vertical-blanking interrupts
|
|
|
|
* must not call drm_vblank_init(). For such drivers, atomic helpers will
|
|
|
|
* automatically generate fake vblank events as part of the display update.
|
|
|
|
* This functionality also can be controlled by the driver by enabling and
|
|
|
|
* disabling struct drm_crtc_state.no_vblank.
|
2017-05-24 21:51:45 +07:00
|
|
|
*/
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
/* Retry timestamp calculation up to 3 times to satisfy
|
|
|
|
* drm_timestamp_precision before giving up.
|
|
|
|
*/
|
|
|
|
#define DRM_TIMESTAMP_MAXRETRIES 3
|
|
|
|
|
|
|
|
/* Threshold in nanoseconds for detection of redundant
|
|
|
|
* vblank irq in drm_handle_vblank(). 1 msec should be ok.
|
|
|
|
*/
|
|
|
|
#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000
|
|
|
|
|
|
|
|
static bool
|
|
|
|
drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t *tvblank, bool in_vblank_irq);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
static unsigned int drm_timestamp_precision = 20; /* Default to 20 usecs. */
|
|
|
|
|
|
|
|
static int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */
|
|
|
|
|
|
|
|
module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);
|
|
|
|
module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
|
|
|
|
MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs] (0: never disable, <0: disable immediately)");
|
|
|
|
MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]");
|
|
|
|
|
|
|
|
static void store_vblank(struct drm_device *dev, unsigned int pipe,
|
|
|
|
u32 vblank_count_inc,
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t t_vblank, u32 last)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
assert_spin_locked(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
vblank->last = last;
|
|
|
|
|
|
|
|
write_seqlock(&vblank->seqlock);
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
vblank->time = t_vblank;
|
2019-07-23 20:13:37 +07:00
|
|
|
atomic64_add(vblank_count_inc, &vblank->count);
|
2017-05-31 16:21:46 +07:00
|
|
|
write_sequnlock(&vblank->seqlock);
|
|
|
|
}
|
|
|
|
|
2018-11-28 01:20:04 +07:00
|
|
|
static u32 drm_max_vblank_count(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
return vblank->max_vblank_count ?: dev->max_vblank_count;
|
|
|
|
}
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
/*
|
|
|
|
* "No hw counter" fallback implementation of .get_vblank_counter() hook,
|
|
|
|
* if there is no useable hardware frame counter available.
|
|
|
|
*/
|
|
|
|
static u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
2018-11-28 01:20:04 +07:00
|
|
|
WARN_ON_ONCE(drm_max_vblank_count(dev, pipe) != 0);
|
2017-05-31 16:21:46 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u32 __get_vblank_counter(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
|
2018-02-21 02:11:56 +07:00
|
|
|
if (WARN_ON(!crtc))
|
|
|
|
return 0;
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
if (crtc->funcs->get_vblank_counter)
|
|
|
|
return crtc->funcs->get_vblank_counter(crtc);
|
2020-01-23 20:59:42 +07:00
|
|
|
} else if (dev->driver->get_vblank_counter) {
|
2017-05-31 16:21:46 +07:00
|
|
|
return dev->driver->get_vblank_counter(dev, pipe);
|
2020-01-23 20:59:42 +07:00
|
|
|
}
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
return drm_vblank_no_hw_counter(dev, pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reset the stored timestamp for the current vblank count to correspond
|
|
|
|
* to the last vblank occurred.
|
|
|
|
*
|
|
|
|
* Only to be called from drm_crtc_vblank_on().
|
|
|
|
*
|
|
|
|
* Note: caller must hold &drm_device.vbl_lock since this reads & writes
|
|
|
|
* device vblank fields.
|
|
|
|
*/
|
|
|
|
static void drm_reset_vblank_timestamp(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
u32 cur_vblank;
|
|
|
|
bool rc;
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t t_vblank;
|
2017-05-31 16:21:46 +07:00
|
|
|
int count = DRM_TIMESTAMP_MAXRETRIES;
|
|
|
|
|
|
|
|
spin_lock(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* sample the current counter to avoid random jumps
|
|
|
|
* when drm_vblank_enable() applies the diff
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
cur_vblank = __get_vblank_counter(dev, pipe);
|
|
|
|
rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, false);
|
|
|
|
} while (cur_vblank != __get_vblank_counter(dev, pipe) && --count > 0);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Only reinitialize corresponding vblank timestamp if high-precision query
|
|
|
|
* available and didn't fail. Otherwise reinitialize delayed at next vblank
|
|
|
|
* interrupt and assign 0 for now, to mark the vblanktimestamp as invalid.
|
|
|
|
*/
|
|
|
|
if (!rc)
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
t_vblank = 0;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* +1 to make sure user will never see the same
|
|
|
|
* vblank counter value before and after a modeset
|
|
|
|
*/
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
store_vblank(dev, pipe, 1, t_vblank, cur_vblank);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
spin_unlock(&dev->vblank_time_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Call back into the driver to update the appropriate vblank counter
|
|
|
|
* (specified by @pipe). Deal with wraparound, if it occurred, and
|
|
|
|
* update the last read value so we can deal with wraparound on the next
|
|
|
|
* call if necessary.
|
|
|
|
*
|
|
|
|
* Only necessary when going from off->on, to account for frames we
|
|
|
|
* didn't get an interrupt for.
|
|
|
|
*
|
|
|
|
* Note: caller must hold &drm_device.vbl_lock since this reads & writes
|
|
|
|
* device vblank fields.
|
|
|
|
*/
|
|
|
|
static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe,
|
|
|
|
bool in_vblank_irq)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
u32 cur_vblank, diff;
|
|
|
|
bool rc;
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t t_vblank;
|
2017-05-31 16:21:46 +07:00
|
|
|
int count = DRM_TIMESTAMP_MAXRETRIES;
|
|
|
|
int framedur_ns = vblank->framedur_ns;
|
2018-11-28 01:20:04 +07:00
|
|
|
u32 max_vblank_count = drm_max_vblank_count(dev, pipe);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Interrupts were disabled prior to this call, so deal with counter
|
|
|
|
* wrap if needed.
|
|
|
|
* NOTE! It's possible we lost a full dev->max_vblank_count + 1 events
|
|
|
|
* here if the register is small or we had vblank interrupts off for
|
|
|
|
* a long time.
|
|
|
|
*
|
|
|
|
* We repeat the hardware vblank counter & timestamp query until
|
|
|
|
* we get consistent results. This to prevent races between gpu
|
|
|
|
* updating its hardware counter while we are retrieving the
|
|
|
|
* corresponding vblank timestamp.
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
cur_vblank = __get_vblank_counter(dev, pipe);
|
|
|
|
rc = drm_get_last_vbltimestamp(dev, pipe, &t_vblank, in_vblank_irq);
|
|
|
|
} while (cur_vblank != __get_vblank_counter(dev, pipe) && --count > 0);
|
|
|
|
|
2018-11-28 01:20:04 +07:00
|
|
|
if (max_vblank_count) {
|
2017-05-31 16:21:46 +07:00
|
|
|
/* trust the hw counter when it's around */
|
2018-11-28 01:20:04 +07:00
|
|
|
diff = (cur_vblank - vblank->last) & max_vblank_count;
|
2017-05-31 16:21:46 +07:00
|
|
|
} else if (rc && framedur_ns) {
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
u64 diff_ns = ktime_to_ns(ktime_sub(t_vblank, vblank->time));
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Figure out how many vblanks we've missed based
|
|
|
|
* on the difference in the timestamps and the
|
|
|
|
* frame/field duration.
|
|
|
|
*/
|
2019-06-13 19:18:00 +07:00
|
|
|
|
|
|
|
DRM_DEBUG_VBL("crtc %u: Calculating number of vblanks."
|
|
|
|
" diff_ns = %lld, framedur_ns = %d)\n",
|
|
|
|
pipe, (long long) diff_ns, framedur_ns);
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
diff = DIV_ROUND_CLOSEST_ULL(diff_ns, framedur_ns);
|
|
|
|
|
|
|
|
if (diff == 0 && in_vblank_irq)
|
2019-06-13 19:18:00 +07:00
|
|
|
DRM_DEBUG_VBL("crtc %u: Redundant vblirq ignored\n",
|
|
|
|
pipe);
|
2017-05-31 16:21:46 +07:00
|
|
|
} else {
|
|
|
|
/* some kind of default for drivers w/o accurate vbl timestamping */
|
|
|
|
diff = in_vblank_irq ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Within a drm_vblank_pre_modeset - drm_vblank_post_modeset
|
|
|
|
* interval? If so then vblank irqs keep running and it will likely
|
|
|
|
* happen that the hardware vblank counter is not trustworthy as it
|
|
|
|
* might reset at some point in that interval and vblank timestamps
|
|
|
|
* are not trustworthy either in that interval. Iow. this can result
|
|
|
|
* in a bogus diff >> 1 which must be avoided as it would cause
|
|
|
|
* random large forward jumps of the software vblank counter.
|
|
|
|
*/
|
|
|
|
if (diff > 1 && (vblank->inmodeset & 0x2)) {
|
|
|
|
DRM_DEBUG_VBL("clamping vblank bump to 1 on crtc %u: diffr=%u"
|
|
|
|
" due to pre-modeset.\n", pipe, diff);
|
|
|
|
diff = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
DRM_DEBUG_VBL("updating vblank count on crtc %u:"
|
2017-10-13 01:57:49 +07:00
|
|
|
" current=%llu, diff=%u, hw=%u hw_last=%u\n",
|
2019-07-23 20:13:37 +07:00
|
|
|
pipe, atomic64_read(&vblank->count), diff,
|
|
|
|
cur_vblank, vblank->last);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (diff == 0) {
|
|
|
|
WARN_ON_ONCE(cur_vblank != vblank->last);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Only reinitialize corresponding vblank timestamp if high-precision query
|
|
|
|
* available and didn't fail, or we were called from the vblank interrupt.
|
|
|
|
* Otherwise reinitialize delayed at next vblank interrupt and assign 0
|
|
|
|
* for now, to mark the vblanktimestamp as invalid.
|
|
|
|
*/
|
2017-06-29 19:37:20 +07:00
|
|
|
if (!rc && !in_vblank_irq)
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
t_vblank = 0;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
store_vblank(dev, pipe, diff, t_vblank, cur_vblank);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
2018-02-03 12:12:53 +07:00
|
|
|
static u64 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
2019-07-23 20:13:37 +07:00
|
|
|
u64 count;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return 0;
|
|
|
|
|
2019-07-23 20:13:37 +07:00
|
|
|
count = atomic64_read(&vblank->count);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This read barrier corresponds to the implicit write barrier of the
|
|
|
|
* write seqlock in store_vblank(). Note that this is the only place
|
|
|
|
* where we need an explicit barrier, since all other access goes
|
|
|
|
* through drm_vblank_count_and_time(), which already has the required
|
|
|
|
* read barrier curtesy of the read seqlock.
|
|
|
|
*/
|
|
|
|
smp_rmb();
|
|
|
|
|
|
|
|
return count;
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2017-05-24 21:51:47 +07:00
|
|
|
* drm_crtc_accurate_vblank_count - retrieve the master vblank counter
|
2017-05-31 16:21:46 +07:00
|
|
|
* @crtc: which counter to retrieve
|
|
|
|
*
|
2017-05-24 21:51:45 +07:00
|
|
|
* This function is similar to drm_crtc_vblank_count() but this function
|
|
|
|
* interpolates to handle a race with vblank interrupts using the high precision
|
|
|
|
* timestamping support.
|
2017-05-31 16:21:46 +07:00
|
|
|
*
|
2017-05-24 21:51:45 +07:00
|
|
|
* This is mostly useful for hardware that can obtain the scanout position, but
|
|
|
|
* doesn't have a hardware frame counter.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
2018-02-03 12:12:53 +07:00
|
|
|
u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
2018-02-03 12:12:53 +07:00
|
|
|
u64 vblank;
|
2017-05-31 16:21:46 +07:00
|
|
|
unsigned long flags;
|
|
|
|
|
2020-01-23 20:59:24 +07:00
|
|
|
WARN_ONCE(drm_debug_enabled(DRM_UT_VBL) &&
|
2020-01-23 20:59:42 +07:00
|
|
|
!crtc->funcs->get_vblank_timestamp,
|
2017-10-23 22:25:40 +07:00
|
|
|
"This function requires support for accurate vblank timestamps.");
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->vblank_time_lock, flags);
|
|
|
|
|
|
|
|
drm_update_vblank_count(dev, pipe, false);
|
|
|
|
vblank = drm_vblank_count(dev, pipe);
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev->vblank_time_lock, flags);
|
|
|
|
|
|
|
|
return vblank;
|
|
|
|
}
|
2017-05-24 21:51:47 +07:00
|
|
|
EXPORT_SYMBOL(drm_crtc_accurate_vblank_count);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
static void __disable_vblank(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
|
2018-02-21 02:11:56 +07:00
|
|
|
if (WARN_ON(!crtc))
|
|
|
|
return;
|
|
|
|
|
2020-01-23 20:59:42 +07:00
|
|
|
if (crtc->funcs->disable_vblank)
|
2017-05-31 16:21:46 +07:00
|
|
|
crtc->funcs->disable_vblank(crtc);
|
2020-01-23 20:59:42 +07:00
|
|
|
} else {
|
|
|
|
dev->driver->disable_vblank(dev, pipe);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable vblank irq's on crtc, make sure that last vblank count
|
|
|
|
* of hardware and corresponding consistent software vblank counter
|
|
|
|
* are preserved, even if there are any spurious vblank irq's after
|
|
|
|
* disable.
|
|
|
|
*/
|
|
|
|
void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
assert_spin_locked(&dev->vbl_lock);
|
|
|
|
|
|
|
|
/* Prevent vblank irq processing while disabling vblank irqs,
|
|
|
|
* so no updates of timestamps or count can happen after we've
|
|
|
|
* disabled. Needed to prevent races in case of delayed irq's.
|
|
|
|
*/
|
|
|
|
spin_lock_irqsave(&dev->vblank_time_lock, irqflags);
|
|
|
|
|
|
|
|
/*
|
2018-02-03 12:13:00 +07:00
|
|
|
* Update vblank count and disable vblank interrupts only if the
|
|
|
|
* interrupts were enabled. This avoids calling the ->disable_vblank()
|
|
|
|
* operation in atomic context with the hardware potentially runtime
|
|
|
|
* suspended.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
2018-02-03 12:13:00 +07:00
|
|
|
if (!vblank->enabled)
|
|
|
|
goto out;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
/*
|
2018-02-03 12:13:00 +07:00
|
|
|
* Update the count and timestamp to maintain the
|
2017-05-31 16:21:46 +07:00
|
|
|
* appearance that the counter has been ticking all along until
|
|
|
|
* this time. This makes the count account for the entire time
|
|
|
|
* between drm_crtc_vblank_on() and drm_crtc_vblank_off().
|
|
|
|
*/
|
|
|
|
drm_update_vblank_count(dev, pipe, false);
|
2018-02-03 12:13:00 +07:00
|
|
|
__disable_vblank(dev, pipe);
|
|
|
|
vblank->enabled = false;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
2018-02-03 12:13:00 +07:00
|
|
|
out:
|
2017-05-31 16:21:46 +07:00
|
|
|
spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
|
|
|
|
}
|
|
|
|
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-17 04:43:17 +07:00
|
|
|
static void vblank_disable_fn(struct timer_list *t)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-17 04:43:17 +07:00
|
|
|
struct drm_vblank_crtc *vblank = from_timer(vblank, t, disable_timer);
|
2017-05-31 16:21:46 +07:00
|
|
|
struct drm_device *dev = vblank->dev;
|
|
|
|
unsigned int pipe = vblank->pipe;
|
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
|
|
if (atomic_read(&vblank->refcount) == 0 && vblank->enabled) {
|
|
|
|
DRM_DEBUG("disabling vblank on crtc %u\n", pipe);
|
|
|
|
drm_vblank_disable_and_save(dev, pipe);
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
|
|
|
|
}
|
|
|
|
|
2020-03-23 21:49:23 +07:00
|
|
|
static void drm_vblank_init_release(struct drm_device *dev, void *ptr)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
unsigned int pipe;
|
|
|
|
|
|
|
|
for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
WARN_ON(READ_ONCE(vblank->enabled) &&
|
|
|
|
drm_core_check_feature(dev, DRIVER_MODESET));
|
|
|
|
|
|
|
|
del_timer_sync(&vblank->disable_timer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_vblank_init - initialize vblank support
|
|
|
|
* @dev: DRM device
|
|
|
|
* @num_crtcs: number of CRTCs supported by @dev
|
|
|
|
*
|
|
|
|
* This function initializes vblank support for @num_crtcs display pipelines.
|
2020-03-23 21:49:23 +07:00
|
|
|
* Cleanup is handled automatically through a cleanup function added with
|
|
|
|
* drmm_add_action().
|
2017-05-31 16:21:46 +07:00
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* Zero on success or a negative error code on failure.
|
|
|
|
*/
|
|
|
|
int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs)
|
|
|
|
{
|
2020-03-23 21:49:23 +07:00
|
|
|
int ret;
|
2017-05-31 16:21:46 +07:00
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
spin_lock_init(&dev->vbl_lock);
|
|
|
|
spin_lock_init(&dev->vblank_time_lock);
|
|
|
|
|
2020-03-23 21:49:23 +07:00
|
|
|
dev->vblank = drmm_kcalloc(dev, num_crtcs, sizeof(*dev->vblank), GFP_KERNEL);
|
|
|
|
if (!dev->vblank)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
dev->num_crtcs = num_crtcs;
|
|
|
|
|
2020-03-23 21:49:23 +07:00
|
|
|
ret = drmm_add_action(dev, drm_vblank_init_release, NULL);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
for (i = 0; i < num_crtcs; i++) {
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[i];
|
|
|
|
|
|
|
|
vblank->dev = dev;
|
|
|
|
vblank->pipe = i;
|
|
|
|
init_waitqueue_head(&vblank->queue);
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-17 04:43:17 +07:00
|
|
|
timer_setup(&vblank->disable_timer, vblank_disable_fn, 0);
|
2017-05-31 16:21:46 +07:00
|
|
|
seqlock_init(&vblank->seqlock);
|
|
|
|
}
|
|
|
|
|
|
|
|
DRM_INFO("Supports vblank timestamp caching Rev 2 (21.10.2013).\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_vblank_init);
|
|
|
|
|
2020-01-29 19:05:17 +07:00
|
|
|
/**
|
|
|
|
* drm_dev_has_vblank - test if vblanking has been initialized for
|
|
|
|
* a device
|
|
|
|
* @dev: the device
|
|
|
|
*
|
|
|
|
* Drivers may call this function to test if vblank support is
|
|
|
|
* initialized for a device. For most hardware this means that vblanking
|
|
|
|
* can also be enabled.
|
|
|
|
*
|
|
|
|
* Atomic helpers use this function to initialize
|
|
|
|
* &drm_crtc_state.no_vblank. See also drm_atomic_helper_check_modeset().
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* True if vblanking has been initialized for the given device, false
|
|
|
|
* otherwise.
|
|
|
|
*/
|
|
|
|
bool drm_dev_has_vblank(const struct drm_device *dev)
|
|
|
|
{
|
|
|
|
return dev->num_crtcs != 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_dev_has_vblank);
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_waitqueue - get vblank waitqueue for the CRTC
|
|
|
|
* @crtc: which CRTC's vblank waitqueue to retrieve
|
|
|
|
*
|
|
|
|
* This function returns a pointer to the vblank waitqueue for the CRTC.
|
|
|
|
* Drivers can use this to implement vblank waits using wait_event() and related
|
|
|
|
* functions.
|
|
|
|
*/
|
|
|
|
wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
return &crtc->dev->vblank[drm_crtc_index(crtc)].queue;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_waitqueue);
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_calc_timestamping_constants - calculate vblank timestamp constants
|
|
|
|
* @crtc: drm_crtc whose timestamp constants should be updated.
|
|
|
|
* @mode: display mode containing the scanout timings
|
|
|
|
*
|
2017-05-24 21:51:45 +07:00
|
|
|
* Calculate and store various constants which are later needed by vblank and
|
|
|
|
* swap-completion timestamping, e.g, by
|
2020-01-23 20:59:24 +07:00
|
|
|
* drm_crtc_vblank_helper_get_vblank_timestamp(). They are derived from
|
|
|
|
* CRTC's true scanout timing, so they take things like panel scaling or
|
|
|
|
* other adjustments into account.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
|
|
|
void drm_calc_timestamping_constants(struct drm_crtc *crtc,
|
|
|
|
const struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
int linedur_ns = 0, framedur_ns = 0;
|
|
|
|
int dotclock = mode->crtc_clock;
|
|
|
|
|
|
|
|
if (!dev->num_crtcs)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Valid dotclock? */
|
|
|
|
if (dotclock > 0) {
|
|
|
|
int frame_size = mode->crtc_htotal * mode->crtc_vtotal;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert scanline length in pixels and video
|
|
|
|
* dot clock to line duration and frame duration
|
|
|
|
* in nanoseconds:
|
|
|
|
*/
|
|
|
|
linedur_ns = div_u64((u64) mode->crtc_htotal * 1000000, dotclock);
|
|
|
|
framedur_ns = div_u64((u64) frame_size * 1000000, dotclock);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fields of interlaced scanout modes are only half a frame duration.
|
|
|
|
*/
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
framedur_ns /= 2;
|
|
|
|
} else
|
|
|
|
DRM_ERROR("crtc %u: Can't calculate constants, dotclock = 0!\n",
|
|
|
|
crtc->base.id);
|
|
|
|
|
|
|
|
vblank->linedur_ns = linedur_ns;
|
|
|
|
vblank->framedur_ns = framedur_ns;
|
|
|
|
vblank->hwmode = *mode;
|
|
|
|
|
|
|
|
DRM_DEBUG("crtc %u: hwmode: htotal %d, vtotal %d, vdisplay %d\n",
|
|
|
|
crtc->base.id, mode->crtc_htotal,
|
|
|
|
mode->crtc_vtotal, mode->crtc_vdisplay);
|
|
|
|
DRM_DEBUG("crtc %u: clock %d kHz framedur %d linedur %d\n",
|
|
|
|
crtc->base.id, dotclock, framedur_ns, linedur_ns);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_calc_timestamping_constants);
|
|
|
|
|
2020-01-23 20:59:23 +07:00
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_helper_get_vblank_timestamp_internal - precise vblank
|
|
|
|
* timestamp helper
|
2020-03-03 14:31:35 +07:00
|
|
|
* @crtc: CRTC whose vblank timestamp to retrieve
|
2020-01-23 20:59:23 +07:00
|
|
|
* @max_error: Desired maximum allowable error in timestamps (nanosecs)
|
|
|
|
* On return contains true maximum error of timestamp
|
|
|
|
* @vblank_time: Pointer to time which should receive the timestamp
|
|
|
|
* @in_vblank_irq:
|
|
|
|
* True when called from drm_crtc_handle_vblank(). Some drivers
|
|
|
|
* need to apply some workarounds for gpu-specific vblank irq quirks
|
|
|
|
* if flag is set.
|
|
|
|
* @get_scanout_position:
|
|
|
|
* Callback function to retrieve the scanout position. See
|
|
|
|
* @struct drm_crtc_helper_funcs.get_scanout_position.
|
|
|
|
*
|
|
|
|
* Implements calculation of exact vblank timestamps from given drm_display_mode
|
|
|
|
* timings and current video scanout position of a CRTC.
|
|
|
|
*
|
|
|
|
* The current implementation only handles standard video modes. For double scan
|
|
|
|
* and interlaced modes the driver is supposed to adjust the hardware mode
|
|
|
|
* (taken from &drm_crtc_state.adjusted mode for atomic modeset drivers) to
|
|
|
|
* match the scanout position reported.
|
|
|
|
*
|
|
|
|
* Note that atomic drivers must call drm_calc_timestamping_constants() before
|
|
|
|
* enabling a CRTC. The atomic helpers already take care of that in
|
|
|
|
* drm_atomic_helper_update_legacy_modeset_state().
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
*
|
|
|
|
* Returns true on success, and false on failure, i.e. when no accurate
|
|
|
|
* timestamp could be acquired.
|
|
|
|
*/
|
|
|
|
bool
|
|
|
|
drm_crtc_vblank_helper_get_vblank_timestamp_internal(
|
|
|
|
struct drm_crtc *crtc, int *max_error, ktime_t *vblank_time,
|
|
|
|
bool in_vblank_irq,
|
2020-01-23 20:59:43 +07:00
|
|
|
drm_vblank_get_scanout_position_func get_scanout_position)
|
2020-01-23 20:59:23 +07:00
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = crtc->index;
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
struct timespec64 ts_etime, ts_vblank_time;
|
|
|
|
ktime_t stime, etime;
|
|
|
|
bool vbl_status;
|
|
|
|
const struct drm_display_mode *mode;
|
|
|
|
int vpos, hpos, i;
|
|
|
|
int delta_ns, duration_ns;
|
|
|
|
|
|
|
|
if (pipe >= dev->num_crtcs) {
|
2017-05-31 16:21:46 +07:00
|
|
|
DRM_ERROR("Invalid crtc %u\n", pipe);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Scanout position query not supported? Should not happen. */
|
2020-01-23 20:59:43 +07:00
|
|
|
if (!get_scanout_position) {
|
2020-01-23 20:59:23 +07:00
|
|
|
DRM_ERROR("Called from CRTC w/o get_scanout_position()!?\n");
|
2017-05-31 16:21:46 +07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (drm_drv_uses_atomic_modeset(dev))
|
|
|
|
mode = &vblank->hwmode;
|
|
|
|
else
|
|
|
|
mode = &crtc->hwmode;
|
|
|
|
|
|
|
|
/* If mode timing undefined, just return as no-op:
|
|
|
|
* Happens during initial modesetting of a crtc.
|
|
|
|
*/
|
|
|
|
if (mode->crtc_clock == 0) {
|
|
|
|
DRM_DEBUG("crtc %u: Noop due to uninitialized mode.\n", pipe);
|
|
|
|
WARN_ON_ONCE(drm_drv_uses_atomic_modeset(dev));
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get current scanout position with system timestamp.
|
|
|
|
* Repeat query up to DRM_TIMESTAMP_MAXRETRIES times
|
|
|
|
* if single query takes longer than max_error nanoseconds.
|
|
|
|
*
|
|
|
|
* This guarantees a tight bound on maximum error if
|
|
|
|
* code gets preempted or delayed for some reason.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < DRM_TIMESTAMP_MAXRETRIES; i++) {
|
|
|
|
/*
|
|
|
|
* Get vertical and horizontal scanout position vpos, hpos,
|
|
|
|
* and bounding timestamps stime, etime, pre/post query.
|
|
|
|
*/
|
2020-01-23 20:59:43 +07:00
|
|
|
vbl_status = get_scanout_position(crtc, in_vblank_irq,
|
|
|
|
&vpos, &hpos,
|
|
|
|
&stime, &etime,
|
|
|
|
mode);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
/* Return as no-op if scanout query unsupported or failed. */
|
|
|
|
if (!vbl_status) {
|
|
|
|
DRM_DEBUG("crtc %u : scanoutpos query failed.\n",
|
|
|
|
pipe);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute uncertainty in timestamp of scanout position query. */
|
|
|
|
duration_ns = ktime_to_ns(etime) - ktime_to_ns(stime);
|
|
|
|
|
|
|
|
/* Accept result with < max_error nsecs timing uncertainty. */
|
|
|
|
if (duration_ns <= *max_error)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Noisy system timing? */
|
|
|
|
if (i == DRM_TIMESTAMP_MAXRETRIES) {
|
|
|
|
DRM_DEBUG("crtc %u: Noisy timestamp %d us > %d us [%d reps].\n",
|
|
|
|
pipe, duration_ns/1000, *max_error/1000, i);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return upper bound of timestamp precision error. */
|
|
|
|
*max_error = duration_ns;
|
|
|
|
|
|
|
|
/* Convert scanout position into elapsed time at raw_time query
|
|
|
|
* since start of scanout at first display scanline. delta_ns
|
|
|
|
* can be negative if start of scanout hasn't happened yet.
|
|
|
|
*/
|
|
|
|
delta_ns = div_s64(1000000LL * (vpos * mode->crtc_htotal + hpos),
|
|
|
|
mode->crtc_clock);
|
|
|
|
|
|
|
|
/* Subtract time delta from raw timestamp to get final
|
|
|
|
* vblank_time timestamp for end of vblank.
|
|
|
|
*/
|
2017-11-13 22:02:10 +07:00
|
|
|
*vblank_time = ktime_sub_ns(etime, delta_ns);
|
|
|
|
|
2019-10-01 21:06:14 +07:00
|
|
|
if (!drm_debug_enabled(DRM_UT_VBL))
|
2017-11-13 22:02:10 +07:00
|
|
|
return true;
|
|
|
|
|
|
|
|
ts_etime = ktime_to_timespec64(etime);
|
|
|
|
ts_vblank_time = ktime_to_timespec64(*vblank_time);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
DRM_DEBUG_VBL("crtc %u : v p(%d,%d)@ %lld.%06ld -> %lld.%06ld [e %d us, %d rep]\n",
|
2017-05-31 16:21:46 +07:00
|
|
|
pipe, hpos, vpos,
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
(u64)ts_etime.tv_sec, ts_etime.tv_nsec / 1000,
|
|
|
|
(u64)ts_vblank_time.tv_sec, ts_vblank_time.tv_nsec / 1000,
|
|
|
|
duration_ns / 1000, i);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2020-01-23 20:59:23 +07:00
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_helper_get_vblank_timestamp_internal);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
2020-01-23 20:59:24 +07:00
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_helper_get_vblank_timestamp - precise vblank timestamp
|
|
|
|
* helper
|
|
|
|
* @crtc: CRTC whose vblank timestamp to retrieve
|
|
|
|
* @max_error: Desired maximum allowable error in timestamps (nanosecs)
|
|
|
|
* On return contains true maximum error of timestamp
|
|
|
|
* @vblank_time: Pointer to time which should receive the timestamp
|
|
|
|
* @in_vblank_irq:
|
|
|
|
* True when called from drm_crtc_handle_vblank(). Some drivers
|
|
|
|
* need to apply some workarounds for gpu-specific vblank irq quirks
|
|
|
|
* if flag is set.
|
|
|
|
*
|
|
|
|
* Implements calculation of exact vblank timestamps from given drm_display_mode
|
|
|
|
* timings and current video scanout position of a CRTC. This can be directly
|
|
|
|
* used as the &drm_crtc_funcs.get_vblank_timestamp implementation of a kms
|
|
|
|
* driver if &drm_crtc_helper_funcs.get_scanout_position is implemented.
|
|
|
|
*
|
|
|
|
* The current implementation only handles standard video modes. For double scan
|
|
|
|
* and interlaced modes the driver is supposed to adjust the hardware mode
|
|
|
|
* (taken from &drm_crtc_state.adjusted mode for atomic modeset drivers) to
|
|
|
|
* match the scanout position reported.
|
|
|
|
*
|
|
|
|
* Note that atomic drivers must call drm_calc_timestamping_constants() before
|
|
|
|
* enabling a CRTC. The atomic helpers already take care of that in
|
|
|
|
* drm_atomic_helper_update_legacy_modeset_state().
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
*
|
|
|
|
* Returns true on success, and false on failure, i.e. when no accurate
|
|
|
|
* timestamp could be acquired.
|
|
|
|
*/
|
|
|
|
bool drm_crtc_vblank_helper_get_vblank_timestamp(struct drm_crtc *crtc,
|
|
|
|
int *max_error,
|
|
|
|
ktime_t *vblank_time,
|
|
|
|
bool in_vblank_irq)
|
|
|
|
{
|
|
|
|
return drm_crtc_vblank_helper_get_vblank_timestamp_internal(
|
|
|
|
crtc, max_error, vblank_time, in_vblank_irq,
|
2020-01-23 20:59:43 +07:00
|
|
|
crtc->helper_private->get_scanout_position);
|
2020-01-23 20:59:24 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_helper_get_vblank_timestamp);
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
/**
|
|
|
|
* drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
|
|
|
|
* vblank interval
|
|
|
|
* @dev: DRM device
|
|
|
|
* @pipe: index of CRTC whose vblank timestamp to retrieve
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
* @tvblank: Pointer to target time which should receive the timestamp
|
2017-05-31 16:21:46 +07:00
|
|
|
* @in_vblank_irq:
|
|
|
|
* True when called from drm_crtc_handle_vblank(). Some drivers
|
|
|
|
* need to apply some workarounds for gpu-specific vblank irq quirks
|
|
|
|
* if flag is set.
|
|
|
|
*
|
|
|
|
* Fetches the system timestamp corresponding to the time of the most recent
|
|
|
|
* vblank interval on specified CRTC. May call into kms-driver to
|
|
|
|
* compute the timestamp with a high-precision GPU specific method.
|
|
|
|
*
|
|
|
|
* Returns zero if timestamp originates from uncorrected do_gettimeofday()
|
|
|
|
* call, i.e., it isn't very precisely locked to the true vblank.
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* True if timestamp is considered to be very precise, false otherwise.
|
|
|
|
*/
|
|
|
|
static bool
|
|
|
|
drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t *tvblank, bool in_vblank_irq)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
2020-01-23 20:59:24 +07:00
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
2017-05-31 16:21:46 +07:00
|
|
|
bool ret = false;
|
|
|
|
|
|
|
|
/* Define requested maximum error on timestamps (nanoseconds). */
|
|
|
|
int max_error = (int) drm_timestamp_precision * 1000;
|
|
|
|
|
|
|
|
/* Query driver if possible and precision timestamping enabled. */
|
2020-01-23 20:59:24 +07:00
|
|
|
if (crtc && crtc->funcs->get_vblank_timestamp && max_error > 0) {
|
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
|
|
|
|
ret = crtc->funcs->get_vblank_timestamp(crtc, &max_error,
|
|
|
|
tvblank, in_vblank_irq);
|
|
|
|
}
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
/* GPU high precision timestamp query unsupported or failed.
|
|
|
|
* Return current monotonic/gettimeofday timestamp as best estimate.
|
|
|
|
*/
|
|
|
|
if (!ret)
|
2017-10-11 22:20:13 +07:00
|
|
|
*tvblank = ktime_get();
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_count - retrieve "cooked" vblank counter value
|
|
|
|
* @crtc: which counter to retrieve
|
|
|
|
*
|
|
|
|
* Fetches the "cooked" vblank count value that represents the number of
|
|
|
|
* vblank events since the system was booted, including lost events due to
|
2017-05-24 21:51:45 +07:00
|
|
|
* modesetting activity. Note that this timer isn't correct against a racing
|
|
|
|
* vblank interrupt (since it only reports the software vblank counter), see
|
2017-05-24 21:51:47 +07:00
|
|
|
* drm_crtc_accurate_vblank_count() for such use-cases.
|
2017-05-31 16:21:46 +07:00
|
|
|
*
|
2019-07-23 20:13:37 +07:00
|
|
|
* Note that for a given vblank counter value drm_crtc_handle_vblank()
|
|
|
|
* and drm_crtc_vblank_count() or drm_crtc_vblank_count_and_time()
|
|
|
|
* provide a barrier: Any writes done before calling
|
|
|
|
* drm_crtc_handle_vblank() will be visible to callers of the later
|
|
|
|
* functions, iff the vblank count is the same or a later one.
|
|
|
|
*
|
|
|
|
* See also &drm_vblank_crtc.count.
|
|
|
|
*
|
2017-05-31 16:21:46 +07:00
|
|
|
* Returns:
|
|
|
|
* The software vblank counter.
|
|
|
|
*/
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 drm_crtc_vblank_count(struct drm_crtc *crtc)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
return drm_vblank_count(crtc->dev, drm_crtc_index(crtc));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_count);
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
/**
|
|
|
|
* drm_vblank_count_and_time - retrieve "cooked" vblank counter value and the
|
|
|
|
* system timestamp corresponding to that vblank counter value.
|
|
|
|
* @dev: DRM device
|
|
|
|
* @pipe: index of CRTC whose counter to retrieve
|
|
|
|
* @vblanktime: Pointer to ktime_t to receive the vblank timestamp.
|
|
|
|
*
|
|
|
|
* Fetches the "cooked" vblank count value that represents the number of
|
|
|
|
* vblank events since the system was booted, including lost events due to
|
|
|
|
* modesetting activity. Returns corresponding system timestamp of the time
|
|
|
|
* of the vblank interval that corresponds to the current vblank counter value.
|
|
|
|
*
|
|
|
|
* This is the legacy version of drm_crtc_vblank_count_and_time().
|
|
|
|
*/
|
|
|
|
static u64 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t *vblanktime)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 vblank_count;
|
2017-05-31 16:21:46 +07:00
|
|
|
unsigned int seq;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs)) {
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
*vblanktime = 0;
|
2017-05-31 16:21:46 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
|
|
|
seq = read_seqbegin(&vblank->seqlock);
|
2019-07-23 20:13:37 +07:00
|
|
|
vblank_count = atomic64_read(&vblank->count);
|
2017-05-31 16:21:46 +07:00
|
|
|
*vblanktime = vblank->time;
|
|
|
|
} while (read_seqretry(&vblank->seqlock, seq));
|
|
|
|
|
|
|
|
return vblank_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_count_and_time - retrieve "cooked" vblank counter value
|
|
|
|
* and the system timestamp corresponding to that vblank counter value
|
|
|
|
* @crtc: which counter to retrieve
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
* @vblanktime: Pointer to time to receive the vblank timestamp.
|
2017-05-31 16:21:46 +07:00
|
|
|
*
|
|
|
|
* Fetches the "cooked" vblank count value that represents the number of
|
|
|
|
* vblank events since the system was booted, including lost events due to
|
|
|
|
* modesetting activity. Returns corresponding system timestamp of the time
|
|
|
|
* of the vblank interval that corresponds to the current vblank counter value.
|
2019-07-23 20:13:37 +07:00
|
|
|
*
|
|
|
|
* Note that for a given vblank counter value drm_crtc_handle_vblank()
|
|
|
|
* and drm_crtc_vblank_count() or drm_crtc_vblank_count_and_time()
|
|
|
|
* provide a barrier: Any writes done before calling
|
|
|
|
* drm_crtc_handle_vblank() will be visible to callers of the later
|
|
|
|
* functions, iff the vblank count is the same or a later one.
|
|
|
|
*
|
|
|
|
* See also &drm_vblank_crtc.count.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t *vblanktime)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
return drm_vblank_count_and_time(crtc->dev, drm_crtc_index(crtc),
|
|
|
|
vblanktime);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_count_and_time);
|
|
|
|
|
|
|
|
static void send_vblank_event(struct drm_device *dev,
|
|
|
|
struct drm_pending_vblank_event *e,
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 seq, ktime_t now)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
2017-07-06 04:34:23 +07:00
|
|
|
struct timespec64 tv;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
2017-07-06 04:34:23 +07:00
|
|
|
switch (e->event.base.type) {
|
|
|
|
case DRM_EVENT_VBLANK:
|
|
|
|
case DRM_EVENT_FLIP_COMPLETE:
|
|
|
|
tv = ktime_to_timespec64(now);
|
|
|
|
e->event.vbl.sequence = seq;
|
|
|
|
/*
|
|
|
|
* e->event is a user space structure, with hardcoded unsigned
|
|
|
|
* 32-bit seconds/microseconds. This is safe as we always use
|
|
|
|
* monotonic timestamps since linux-4.15
|
|
|
|
*/
|
|
|
|
e->event.vbl.tv_sec = tv.tv_sec;
|
|
|
|
e->event.vbl.tv_usec = tv.tv_nsec / 1000;
|
|
|
|
break;
|
2017-06-30 12:49:31 +07:00
|
|
|
case DRM_EVENT_CRTC_SEQUENCE:
|
|
|
|
if (seq)
|
|
|
|
e->event.seq.sequence = seq;
|
|
|
|
e->event.seq.time_ns = ktime_to_ns(now);
|
|
|
|
break;
|
2017-07-06 04:34:23 +07:00
|
|
|
}
|
|
|
|
trace_drm_vblank_event_delivered(e->base.file_priv, e->pipe, seq);
|
2017-05-31 16:21:46 +07:00
|
|
|
drm_send_event_locked(dev, &e->base);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_arm_vblank_event - arm vblank event after pageflip
|
|
|
|
* @crtc: the source CRTC of the vblank event
|
|
|
|
* @e: the event to send
|
|
|
|
*
|
|
|
|
* A lot of drivers need to generate vblank events for the very next vblank
|
|
|
|
* interrupt. For example when the page flip interrupt happens when the page
|
|
|
|
* flip gets armed, but not when it actually executes within the next vblank
|
|
|
|
* period. This helper function implements exactly the required vblank arming
|
|
|
|
* behaviour.
|
|
|
|
*
|
|
|
|
* NOTE: Drivers using this to send out the &drm_crtc_state.event as part of an
|
|
|
|
* atomic commit must ensure that the next vblank happens at exactly the same
|
|
|
|
* time as the atomic commit is committed to the hardware. This function itself
|
2017-07-05 11:56:29 +07:00
|
|
|
* does **not** protect against the next vblank interrupt racing with either this
|
2017-05-31 16:21:46 +07:00
|
|
|
* function call or the atomic commit operation. A possible sequence could be:
|
|
|
|
*
|
|
|
|
* 1. Driver commits new hardware state into vblank-synchronized registers.
|
|
|
|
* 2. A vblank happens, committing the hardware state. Also the corresponding
|
|
|
|
* vblank interrupt is fired off and fully processed by the interrupt
|
|
|
|
* handler.
|
|
|
|
* 3. The atomic commit operation proceeds to call drm_crtc_arm_vblank_event().
|
|
|
|
* 4. The event is only send out for the next vblank, which is wrong.
|
|
|
|
*
|
|
|
|
* An equivalent race can happen when the driver calls
|
|
|
|
* drm_crtc_arm_vblank_event() before writing out the new hardware state.
|
|
|
|
*
|
|
|
|
* The only way to make this work safely is to prevent the vblank from firing
|
|
|
|
* (and the hardware from committing anything else) until the entire atomic
|
|
|
|
* commit sequence has run to completion. If the hardware does not have such a
|
|
|
|
* feature (e.g. using a "go" bit), then it is unsafe to use this functions.
|
|
|
|
* Instead drivers need to manually send out the event from their interrupt
|
|
|
|
* handler by calling drm_crtc_send_vblank_event() and make sure that there's no
|
|
|
|
* possible race with the hardware committing the atomic update.
|
|
|
|
*
|
2018-08-08 03:11:43 +07:00
|
|
|
* Caller must hold a vblank reference for the event @e acquired by a
|
|
|
|
* drm_crtc_vblank_get(), which will be dropped when the next vblank arrives.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
|
|
|
void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
|
|
|
|
struct drm_pending_vblank_event *e)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
|
|
|
|
|
|
|
assert_spin_locked(&dev->event_lock);
|
|
|
|
|
|
|
|
e->pipe = pipe;
|
2017-10-13 01:57:49 +07:00
|
|
|
e->sequence = drm_crtc_accurate_vblank_count(crtc) + 1;
|
2017-05-31 16:21:46 +07:00
|
|
|
list_add_tail(&e->base.link, &dev->vblank_event_list);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_arm_vblank_event);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_send_vblank_event - helper to send vblank event after pageflip
|
|
|
|
* @crtc: the source CRTC of the vblank event
|
|
|
|
* @e: the event to send
|
|
|
|
*
|
|
|
|
* Updates sequence # and timestamp on event for the most recently processed
|
|
|
|
* vblank, and sends it to userspace. Caller must hold event lock.
|
|
|
|
*
|
|
|
|
* See drm_crtc_arm_vblank_event() for a helper which can be used in certain
|
|
|
|
* situation, especially to send out events for atomic commit operations.
|
|
|
|
*/
|
|
|
|
void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
|
|
|
|
struct drm_pending_vblank_event *e)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 seq;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t now;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (dev->num_crtcs > 0) {
|
|
|
|
seq = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
} else {
|
|
|
|
seq = 0;
|
|
|
|
|
2017-10-11 22:20:13 +07:00
|
|
|
now = ktime_get();
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
e->pipe = pipe;
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
send_vblank_event(dev, e, seq, now);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_send_vblank_event);
|
|
|
|
|
|
|
|
static int __enable_vblank(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
|
2018-02-21 02:11:56 +07:00
|
|
|
if (WARN_ON(!crtc))
|
|
|
|
return 0;
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
if (crtc->funcs->enable_vblank)
|
|
|
|
return crtc->funcs->enable_vblank(crtc);
|
2020-01-23 20:59:42 +07:00
|
|
|
} else if (dev->driver->enable_vblank) {
|
|
|
|
return dev->driver->enable_vblank(dev, pipe);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
2020-01-23 20:59:42 +07:00
|
|
|
return -EINVAL;
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
assert_spin_locked(&dev->vbl_lock);
|
|
|
|
|
|
|
|
spin_lock(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
if (!vblank->enabled) {
|
|
|
|
/*
|
|
|
|
* Enable vblank irqs under vblank_time_lock protection.
|
|
|
|
* All vblank count & timestamp updates are held off
|
|
|
|
* until we are done reinitializing master counter and
|
|
|
|
* timestamps. Filtercode in drm_handle_vblank() will
|
|
|
|
* prevent double-accounting of same vblank interval.
|
|
|
|
*/
|
|
|
|
ret = __enable_vblank(dev, pipe);
|
|
|
|
DRM_DEBUG("enabling vblank on crtc %u, ret: %d\n", pipe, ret);
|
|
|
|
if (ret) {
|
|
|
|
atomic_dec(&vblank->refcount);
|
|
|
|
} else {
|
|
|
|
drm_update_vblank_count(dev, pipe, 0);
|
|
|
|
/* drm_update_vblank_count() includes a wmb so we just
|
|
|
|
* need to ensure that the compiler emits the write
|
|
|
|
* to mark the vblank as enabled after the call
|
|
|
|
* to drm_update_vblank_count().
|
|
|
|
*/
|
|
|
|
WRITE_ONCE(vblank->enabled, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
unsigned long irqflags;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (!dev->num_crtcs)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
|
|
/* Going from 0->1 means we have to enable interrupts again */
|
|
|
|
if (atomic_add_return(1, &vblank->refcount) == 1) {
|
|
|
|
ret = drm_vblank_enable(dev, pipe);
|
|
|
|
} else {
|
|
|
|
if (!vblank->enabled) {
|
|
|
|
atomic_dec(&vblank->refcount);
|
|
|
|
ret = -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_get - get a reference count on vblank events
|
|
|
|
* @crtc: which CRTC to own
|
|
|
|
*
|
|
|
|
* Acquire a reference count on vblank events to avoid having them disabled
|
|
|
|
* while in use.
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* Zero on success or a negative error code on failure.
|
|
|
|
*/
|
|
|
|
int drm_crtc_vblank_get(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
return drm_vblank_get(crtc->dev, drm_crtc_index(crtc));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_get);
|
|
|
|
|
|
|
|
static void drm_vblank_put(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (WARN_ON(atomic_read(&vblank->refcount) == 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Last user schedules interrupt disable */
|
|
|
|
if (atomic_dec_and_test(&vblank->refcount)) {
|
|
|
|
if (drm_vblank_offdelay == 0)
|
|
|
|
return;
|
|
|
|
else if (drm_vblank_offdelay < 0)
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-17 04:43:17 +07:00
|
|
|
vblank_disable_fn(&vblank->disable_timer);
|
2017-05-31 16:21:46 +07:00
|
|
|
else if (!dev->vblank_disable_immediate)
|
|
|
|
mod_timer(&vblank->disable_timer,
|
|
|
|
jiffies + ((drm_vblank_offdelay * HZ)/1000));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_put - give up ownership of vblank events
|
|
|
|
* @crtc: which counter to give up
|
|
|
|
*
|
|
|
|
* Release ownership of a given vblank counter, turning off interrupts
|
|
|
|
* if possible. Disable interrupts after drm_vblank_offdelay milliseconds.
|
|
|
|
*/
|
|
|
|
void drm_crtc_vblank_put(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
drm_vblank_put(crtc->dev, drm_crtc_index(crtc));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_put);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_wait_one_vblank - wait for one vblank
|
|
|
|
* @dev: DRM device
|
|
|
|
* @pipe: CRTC index
|
|
|
|
*
|
|
|
|
* This waits for one vblank to pass on @pipe, using the irq driver interfaces.
|
|
|
|
* It is a failure to call this when the vblank irq for @pipe is disabled, e.g.
|
|
|
|
* due to lack of driver support or because the crtc is off.
|
2017-05-24 21:51:45 +07:00
|
|
|
*
|
|
|
|
* This is the legacy version of drm_crtc_wait_one_vblank().
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
|
|
|
void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
int ret;
|
2018-02-03 12:12:53 +07:00
|
|
|
u64 last;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
ret = drm_vblank_get(dev, pipe);
|
|
|
|
if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", pipe, ret))
|
|
|
|
return;
|
|
|
|
|
|
|
|
last = drm_vblank_count(dev, pipe);
|
|
|
|
|
|
|
|
ret = wait_event_timeout(vblank->queue,
|
|
|
|
last != drm_vblank_count(dev, pipe),
|
|
|
|
msecs_to_jiffies(100));
|
|
|
|
|
|
|
|
WARN(ret == 0, "vblank wait timed out on crtc %i\n", pipe);
|
|
|
|
|
|
|
|
drm_vblank_put(dev, pipe);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_wait_one_vblank);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_wait_one_vblank - wait for one vblank
|
|
|
|
* @crtc: DRM crtc
|
|
|
|
*
|
|
|
|
* This waits for one vblank to pass on @crtc, using the irq driver interfaces.
|
|
|
|
* It is a failure to call this when the vblank irq for @crtc is disabled, e.g.
|
|
|
|
* due to lack of driver support or because the crtc is off.
|
|
|
|
*/
|
|
|
|
void drm_crtc_wait_one_vblank(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
drm_wait_one_vblank(crtc->dev, drm_crtc_index(crtc));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_wait_one_vblank);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_off - disable vblank events on a CRTC
|
|
|
|
* @crtc: CRTC in question
|
|
|
|
*
|
|
|
|
* Drivers can use this function to shut down the vblank interrupt handling when
|
|
|
|
* disabling a crtc. This function ensures that the latest vblank frame count is
|
|
|
|
* stored so that drm_vblank_on can restore it again.
|
|
|
|
*
|
|
|
|
* Drivers must use this function when the hardware vblank counter can get
|
2017-05-24 21:51:45 +07:00
|
|
|
* reset, e.g. when suspending or disabling the @crtc in general.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
|
|
|
void drm_crtc_vblank_off(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
struct drm_pending_vblank_event *e, *t;
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
|
|
|
|
ktime_t now;
|
2017-05-31 16:21:46 +07:00
|
|
|
unsigned long irqflags;
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 seq;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->event_lock, irqflags);
|
|
|
|
|
|
|
|
spin_lock(&dev->vbl_lock);
|
|
|
|
DRM_DEBUG_VBL("crtc %d, vblank enabled %d, inmodeset %d\n",
|
|
|
|
pipe, vblank->enabled, vblank->inmodeset);
|
|
|
|
|
|
|
|
/* Avoid redundant vblank disables without previous
|
|
|
|
* drm_crtc_vblank_on(). */
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_ATOMIC) || !vblank->inmodeset)
|
|
|
|
drm_vblank_disable_and_save(dev, pipe);
|
|
|
|
|
|
|
|
wake_up(&vblank->queue);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Prevent subsequent drm_vblank_get() from re-enabling
|
|
|
|
* the vblank interrupt by bumping the refcount.
|
|
|
|
*/
|
|
|
|
if (!vblank->inmodeset) {
|
|
|
|
atomic_inc(&vblank->refcount);
|
|
|
|
vblank->inmodeset = 1;
|
|
|
|
}
|
|
|
|
spin_unlock(&dev->vbl_lock);
|
|
|
|
|
|
|
|
/* Send any queued vblank events, lest the natives grow disquiet */
|
|
|
|
seq = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
|
|
|
|
if (e->pipe != pipe)
|
|
|
|
continue;
|
|
|
|
DRM_DEBUG("Sending premature vblank event on disable: "
|
2017-10-13 01:57:49 +07:00
|
|
|
"wanted %llu, current %llu\n",
|
|
|
|
e->sequence, seq);
|
2017-05-31 16:21:46 +07:00
|
|
|
list_del(&e->base.link);
|
|
|
|
drm_vblank_put(dev, pipe);
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
send_vblank_event(dev, e, seq, now);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, irqflags);
|
|
|
|
|
|
|
|
/* Will be reset by the modeset helpers when re-enabling the crtc by
|
|
|
|
* calling drm_calc_timestamping_constants(). */
|
|
|
|
vblank->hwmode.crtc_clock = 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_off);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_reset - reset vblank state to off on a CRTC
|
|
|
|
* @crtc: CRTC in question
|
|
|
|
*
|
|
|
|
* Drivers can use this function to reset the vblank state to off at load time.
|
|
|
|
* Drivers should use this together with the drm_crtc_vblank_off() and
|
|
|
|
* drm_crtc_vblank_on() functions. The difference compared to
|
|
|
|
* drm_crtc_vblank_off() is that this function doesn't save the vblank counter
|
|
|
|
* and hence doesn't need to call any driver hooks.
|
2017-05-24 21:51:45 +07:00
|
|
|
*
|
|
|
|
* This is useful for recovering driver state e.g. on driver load, or on resume.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
|
|
|
void drm_crtc_vblank_reset(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned long irqflags;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
|
|
/*
|
|
|
|
* Prevent subsequent drm_vblank_get() from enabling the vblank
|
|
|
|
* interrupt by bumping the refcount.
|
|
|
|
*/
|
|
|
|
if (!vblank->inmodeset) {
|
|
|
|
atomic_inc(&vblank->refcount);
|
|
|
|
vblank->inmodeset = 1;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
|
|
|
|
|
|
|
|
WARN_ON(!list_empty(&dev->vblank_event_list));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_reset);
|
|
|
|
|
2018-11-28 01:20:04 +07:00
|
|
|
/**
|
|
|
|
* drm_crtc_set_max_vblank_count - configure the hw max vblank counter value
|
|
|
|
* @crtc: CRTC in question
|
|
|
|
* @max_vblank_count: max hardware vblank counter value
|
|
|
|
*
|
|
|
|
* Update the maximum hardware vblank counter value for @crtc
|
|
|
|
* at runtime. Useful for hardware where the operation of the
|
|
|
|
* hardware vblank counter depends on the currently active
|
|
|
|
* display configuration.
|
|
|
|
*
|
|
|
|
* For example, if the hardware vblank counter does not work
|
|
|
|
* when a specific connector is active the maximum can be set
|
|
|
|
* to zero. And when that specific connector isn't active the
|
|
|
|
* maximum can again be set to the appropriate non-zero value.
|
|
|
|
*
|
|
|
|
* If used, must be called before drm_vblank_on().
|
|
|
|
*/
|
|
|
|
void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc,
|
|
|
|
u32 max_vblank_count)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
WARN_ON(dev->max_vblank_count);
|
|
|
|
WARN_ON(!READ_ONCE(vblank->inmodeset));
|
|
|
|
|
|
|
|
vblank->max_vblank_count = max_vblank_count;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_set_max_vblank_count);
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
/**
|
|
|
|
* drm_crtc_vblank_on - enable vblank events on a CRTC
|
|
|
|
* @crtc: CRTC in question
|
|
|
|
*
|
|
|
|
* This functions restores the vblank interrupt state captured with
|
2017-05-24 21:51:45 +07:00
|
|
|
* drm_crtc_vblank_off() again and is generally called when enabling @crtc. Note
|
|
|
|
* that calls to drm_crtc_vblank_on() and drm_crtc_vblank_off() can be
|
|
|
|
* unbalanced and so can also be unconditionally called in driver load code to
|
|
|
|
* reflect the current hardware state of the crtc.
|
2017-05-31 16:21:46 +07:00
|
|
|
*/
|
|
|
|
void drm_crtc_vblank_on(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
unsigned int pipe = drm_crtc_index(crtc);
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
|
|
DRM_DEBUG_VBL("crtc %d, vblank enabled %d, inmodeset %d\n",
|
|
|
|
pipe, vblank->enabled, vblank->inmodeset);
|
|
|
|
|
|
|
|
/* Drop our private "prevent drm_vblank_get" refcount */
|
|
|
|
if (vblank->inmodeset) {
|
|
|
|
atomic_dec(&vblank->refcount);
|
|
|
|
vblank->inmodeset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
drm_reset_vblank_timestamp(dev, pipe);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* re-enable interrupts if there are users left, or the
|
|
|
|
* user wishes vblank interrupts to be enabled all the time.
|
|
|
|
*/
|
|
|
|
if (atomic_read(&vblank->refcount) != 0 || drm_vblank_offdelay == 0)
|
|
|
|
WARN_ON(drm_vblank_enable(dev, pipe));
|
|
|
|
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_on);
|
|
|
|
|
2018-02-03 12:13:01 +07:00
|
|
|
/**
|
2018-02-21 14:39:08 +07:00
|
|
|
* drm_vblank_restore - estimate missed vblanks and update vblank count.
|
|
|
|
* @dev: DRM device
|
|
|
|
* @pipe: CRTC index
|
2018-02-03 12:13:01 +07:00
|
|
|
*
|
|
|
|
* Power manamement features can cause frame counter resets between vblank
|
2018-02-21 14:39:08 +07:00
|
|
|
* disable and enable. Drivers can use this function in their
|
|
|
|
* &drm_crtc_funcs.enable_vblank implementation to estimate missed vblanks since
|
|
|
|
* the last &drm_crtc_funcs.disable_vblank using timestamps and update the
|
|
|
|
* vblank counter.
|
2018-02-03 12:13:01 +07:00
|
|
|
*
|
|
|
|
* This function is the legacy version of drm_crtc_vblank_restore().
|
|
|
|
*/
|
|
|
|
void drm_vblank_restore(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
ktime_t t_vblank;
|
|
|
|
struct drm_vblank_crtc *vblank;
|
|
|
|
int framedur_ns;
|
|
|
|
u64 diff_ns;
|
|
|
|
u32 cur_vblank, diff = 1;
|
|
|
|
int count = DRM_TIMESTAMP_MAXRETRIES;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
assert_spin_locked(&dev->vbl_lock);
|
|
|
|
assert_spin_locked(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
vblank = &dev->vblank[pipe];
|
2019-10-01 21:06:14 +07:00
|
|
|
WARN_ONCE(drm_debug_enabled(DRM_UT_VBL) && !vblank->framedur_ns,
|
2018-02-03 12:13:01 +07:00
|
|
|
"Cannot compute missed vblanks without frame duration\n");
|
|
|
|
framedur_ns = vblank->framedur_ns;
|
|
|
|
|
|
|
|
do {
|
|
|
|
cur_vblank = __get_vblank_counter(dev, pipe);
|
|
|
|
drm_get_last_vbltimestamp(dev, pipe, &t_vblank, false);
|
|
|
|
} while (cur_vblank != __get_vblank_counter(dev, pipe) && --count > 0);
|
|
|
|
|
|
|
|
diff_ns = ktime_to_ns(ktime_sub(t_vblank, vblank->time));
|
|
|
|
if (framedur_ns)
|
|
|
|
diff = DIV_ROUND_CLOSEST_ULL(diff_ns, framedur_ns);
|
|
|
|
|
|
|
|
|
|
|
|
DRM_DEBUG_VBL("missed %d vblanks in %lld ns, frame duration=%d ns, hw_diff=%d\n",
|
|
|
|
diff, diff_ns, framedur_ns, cur_vblank - vblank->last);
|
|
|
|
store_vblank(dev, pipe, diff, t_vblank, cur_vblank);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_vblank_restore);
|
|
|
|
|
|
|
|
/**
|
2018-02-21 14:39:08 +07:00
|
|
|
* drm_crtc_vblank_restore - estimate missed vblanks and update vblank count.
|
|
|
|
* @crtc: CRTC in question
|
|
|
|
*
|
2018-02-03 12:13:01 +07:00
|
|
|
* Power manamement features can cause frame counter resets between vblank
|
2018-02-21 14:39:08 +07:00
|
|
|
* disable and enable. Drivers can use this function in their
|
|
|
|
* &drm_crtc_funcs.enable_vblank implementation to estimate missed vblanks since
|
|
|
|
* the last &drm_crtc_funcs.disable_vblank using timestamps and update the
|
|
|
|
* vblank counter.
|
2018-02-03 12:13:01 +07:00
|
|
|
*/
|
|
|
|
void drm_crtc_vblank_restore(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
drm_vblank_restore(crtc->dev, drm_crtc_index(crtc));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_vblank_restore);
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,
|
|
|
|
unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
/* vblank is not initialized (IRQ not installed ?), or has been freed */
|
|
|
|
if (!dev->num_crtcs)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To avoid all the problems that might happen if interrupts
|
|
|
|
* were enabled/disabled around or between these calls, we just
|
|
|
|
* have the kernel take a reference on the CRTC (just once though
|
|
|
|
* to avoid corrupting the count if multiple, mismatch calls occur),
|
|
|
|
* so that interrupts remain enabled in the interim.
|
|
|
|
*/
|
|
|
|
if (!vblank->inmodeset) {
|
|
|
|
vblank->inmodeset = 0x1;
|
|
|
|
if (drm_vblank_get(dev, pipe) == 0)
|
|
|
|
vblank->inmodeset |= 0x2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_legacy_vblank_post_modeset(struct drm_device *dev,
|
|
|
|
unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
/* vblank is not initialized (IRQ not installed ?), or has been freed */
|
|
|
|
if (!dev->num_crtcs)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (vblank->inmodeset) {
|
|
|
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
|
|
|
drm_reset_vblank_timestamp(dev, pipe);
|
|
|
|
spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
|
|
|
|
|
|
|
|
if (vblank->inmodeset & 0x2)
|
|
|
|
drm_vblank_put(dev, pipe);
|
|
|
|
|
|
|
|
vblank->inmodeset = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-24 21:51:46 +07:00
|
|
|
int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
struct drm_modeset_ctl *modeset = data;
|
|
|
|
unsigned int pipe;
|
|
|
|
|
|
|
|
/* If drm_vblank_init() hasn't been called yet, just no-op */
|
|
|
|
if (!dev->num_crtcs)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* KMS drivers handle this internally */
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_LEGACY))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pipe = modeset->crtc;
|
|
|
|
if (pipe >= dev->num_crtcs)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (modeset->cmd) {
|
|
|
|
case _DRM_PRE_MODESET:
|
|
|
|
drm_legacy_vblank_pre_modeset(dev, pipe);
|
|
|
|
break;
|
|
|
|
case _DRM_POST_MODESET:
|
|
|
|
drm_legacy_vblank_post_modeset(dev, pipe);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
static inline bool vblank_passed(u64 seq, u64 ref)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
|
|
|
return (seq - ref) <= (1 << 23);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 req_seq,
|
2017-05-31 16:21:46 +07:00
|
|
|
union drm_wait_vblank *vblwait,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
struct drm_pending_vblank_event *e;
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t now;
|
2017-05-31 16:21:46 +07:00
|
|
|
unsigned long flags;
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 seq;
|
2017-05-31 16:21:46 +07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
e = kzalloc(sizeof(*e), GFP_KERNEL);
|
|
|
|
if (e == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto err_put;
|
|
|
|
}
|
|
|
|
|
|
|
|
e->pipe = pipe;
|
|
|
|
e->event.base.type = DRM_EVENT_VBLANK;
|
2017-07-06 04:34:23 +07:00
|
|
|
e->event.base.length = sizeof(e->event.vbl);
|
|
|
|
e->event.vbl.user_data = vblwait->request.signal;
|
|
|
|
e->event.vbl.crtc_id = 0;
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
if (crtc)
|
|
|
|
e->event.vbl.crtc_id = crtc->base.id;
|
|
|
|
}
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->event_lock, flags);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* drm_crtc_vblank_off() might have been called after we called
|
|
|
|
* drm_vblank_get(). drm_crtc_vblank_off() holds event_lock around the
|
|
|
|
* vblank disable, so no need for further locking. The reference from
|
|
|
|
* drm_vblank_get() protects against vblank disable from another source.
|
|
|
|
*/
|
|
|
|
if (!READ_ONCE(vblank->enabled)) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = drm_event_reserve_init_locked(dev, file_priv, &e->base,
|
|
|
|
&e->event.base);
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
goto err_unlock;
|
|
|
|
|
|
|
|
seq = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
DRM_DEBUG("event on vblank count %llu, current %llu, crtc %u\n",
|
|
|
|
req_seq, seq, pipe);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
trace_drm_vblank_event_queued(file_priv, pipe, req_seq);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
e->sequence = req_seq;
|
|
|
|
if (vblank_passed(seq, req_seq)) {
|
2017-05-31 16:21:46 +07:00
|
|
|
drm_vblank_put(dev, pipe);
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
send_vblank_event(dev, e, seq, now);
|
2017-05-31 16:21:46 +07:00
|
|
|
vblwait->reply.sequence = seq;
|
|
|
|
} else {
|
|
|
|
/* drm_handle_vblank_events will call drm_vblank_put */
|
|
|
|
list_add_tail(&e->base.link, &dev->vblank_event_list);
|
2017-10-13 01:57:49 +07:00
|
|
|
vblwait->reply.sequence = req_seq;
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_unlock:
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
|
|
|
kfree(e);
|
|
|
|
err_put:
|
|
|
|
drm_vblank_put(dev, pipe);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool drm_wait_vblank_is_query(union drm_wait_vblank *vblwait)
|
|
|
|
{
|
|
|
|
if (vblwait->request.sequence)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return _DRM_VBLANK_RELATIVE ==
|
|
|
|
(vblwait->request.type & (_DRM_VBLANK_TYPES_MASK |
|
|
|
|
_DRM_VBLANK_EVENT |
|
|
|
|
_DRM_VBLANK_NEXTONMISS));
|
|
|
|
}
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
/*
|
|
|
|
* Widen a 32-bit param to 64-bits.
|
|
|
|
*
|
|
|
|
* \param narrow 32-bit value (missing upper 32 bits)
|
|
|
|
* \param near 64-bit value that should be 'close' to near
|
|
|
|
*
|
|
|
|
* This function returns a 64-bit value using the lower 32-bits from
|
|
|
|
* 'narrow' and constructing the upper 32-bits so that the result is
|
|
|
|
* as close as possible to 'near'.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static u64 widen_32_to_64(u32 narrow, u64 near)
|
|
|
|
{
|
|
|
|
return near + (s32) (narrow - near);
|
|
|
|
}
|
|
|
|
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
static void drm_wait_vblank_reply(struct drm_device *dev, unsigned int pipe,
|
|
|
|
struct drm_wait_vblank_reply *reply)
|
|
|
|
{
|
|
|
|
ktime_t now;
|
|
|
|
struct timespec64 ts;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* drm_wait_vblank_reply is a UAPI structure that uses 'long'
|
2017-10-11 22:20:13 +07:00
|
|
|
* to store the seconds. This is safe as we always use monotonic
|
|
|
|
* timestamps since linux-4.15.
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
*/
|
|
|
|
reply->sequence = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
ts = ktime_to_timespec64(now);
|
|
|
|
reply->tval_sec = (u32)ts.tv_sec;
|
|
|
|
reply->tval_usec = ts.tv_nsec / 1000;
|
|
|
|
}
|
|
|
|
|
2017-05-24 21:51:46 +07:00
|
|
|
int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
2017-05-31 16:21:46 +07:00
|
|
|
{
|
2017-04-10 11:35:34 +07:00
|
|
|
struct drm_crtc *crtc;
|
2017-05-31 16:21:46 +07:00
|
|
|
struct drm_vblank_crtc *vblank;
|
|
|
|
union drm_wait_vblank *vblwait = data;
|
|
|
|
int ret;
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 req_seq, seq;
|
2017-04-10 11:35:34 +07:00
|
|
|
unsigned int pipe_index;
|
2017-10-13 01:57:49 +07:00
|
|
|
unsigned int flags, pipe, high_pipe;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (!dev->irq_enabled)
|
drm/drm_vblank: Change EINVAL by the correct errno
For historical reasons, the function drm_wait_vblank_ioctl always return
-EINVAL if something gets wrong. This scenario limits the flexibility
for the userspace to make detailed verification of any problem and take
some action. In particular, the validation of “if (!dev->irq_enabled)”
in the drm_wait_vblank_ioctl is responsible for checking if the driver
support vblank or not. If the driver does not support VBlank, the
function drm_wait_vblank_ioctl returns EINVAL, which does not represent
the real issue; this patch changes this behavior by return EOPNOTSUPP.
Additionally, drm_crtc_get_sequence_ioctl and
drm_crtc_queue_sequence_ioctl, also returns EINVAL if vblank is not
supported; this patch also changes the return value to EOPNOTSUPP in
these functions. Lastly, these functions are invoked by libdrm, which is
used by many compositors; because of this, it is important to check if
this change breaks any compositor. In this sense, the following projects
were examined:
* Drm-hwcomposer
* Kwin
* Sway
* Wlroots
* Wayland
* Weston
* Mutter
* Xorg (67 different drivers)
For each repository the verification happened in three steps:
* Update the main branch
* Look for any occurrence of "drmCrtcQueueSequence",
"drmCrtcGetSequence", and "drmWaitVBlank" with the command git grep -n
"STRING".
* Look in the git history of the project with the command
git log -S<STRING>
None of the above projects validate the use of EINVAL when using
drmWaitVBlank(), which make safe, at least for these projects, to change
the return values. On the other hand, mesa and xserver project uses
drmCrtcQueueSequence() and drmCrtcGetSequence(); this change is harmless
for both projects.
Change since V5 (Pekka Paalanen):
- Check if the change also affects Mutter
Change since V4 (Daniel):
- Also return EOPNOTSUPP in drm_crtc_[get|queue]_sequence_ioctl
Change since V3:
- Return EINVAL for _DRM_VBLANK_SIGNAL (Daniel)
Change since V2:
Daniel Vetter and Chris Wilson
- Replace ENOTTY by EOPNOTSUPP
- Return EINVAL if the parameters are wrong
Cc: Keith Packard <keithp@keithp.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191002140516.adeyj3htylimmlmg@smtp.gmail.com
2019-10-02 21:05:16 +07:00
|
|
|
return -EOPNOTSUPP;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (vblwait->request.type & _DRM_VBLANK_SIGNAL)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (vblwait->request.type &
|
|
|
|
~(_DRM_VBLANK_TYPES_MASK | _DRM_VBLANK_FLAGS_MASK |
|
|
|
|
_DRM_VBLANK_HIGH_CRTC_MASK)) {
|
2018-09-04 18:57:19 +07:00
|
|
|
DRM_DEBUG("Unsupported type value 0x%x, supported mask 0x%x\n",
|
2017-05-31 16:21:46 +07:00
|
|
|
vblwait->request.type,
|
|
|
|
(_DRM_VBLANK_TYPES_MASK | _DRM_VBLANK_FLAGS_MASK |
|
|
|
|
_DRM_VBLANK_HIGH_CRTC_MASK));
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
flags = vblwait->request.type & _DRM_VBLANK_FLAGS_MASK;
|
|
|
|
high_pipe = (vblwait->request.type & _DRM_VBLANK_HIGH_CRTC_MASK);
|
|
|
|
if (high_pipe)
|
2017-04-10 11:35:34 +07:00
|
|
|
pipe_index = high_pipe >> _DRM_VBLANK_HIGH_CRTC_SHIFT;
|
2017-05-31 16:21:46 +07:00
|
|
|
else
|
2017-04-10 11:35:34 +07:00
|
|
|
pipe_index = flags & _DRM_VBLANK_SECONDARY ? 1 : 0;
|
|
|
|
|
|
|
|
/* Convert lease-relative crtc index into global crtc index */
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
|
|
pipe = 0;
|
|
|
|
drm_for_each_crtc(crtc, dev) {
|
|
|
|
if (drm_lease_held(file_priv, crtc->base.id)) {
|
|
|
|
if (pipe_index == 0)
|
|
|
|
break;
|
|
|
|
pipe_index--;
|
|
|
|
}
|
|
|
|
pipe++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
pipe = pipe_index;
|
|
|
|
}
|
|
|
|
|
2017-05-31 16:21:46 +07:00
|
|
|
if (pipe >= dev->num_crtcs)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
/* If the counter is currently enabled and accurate, short-circuit
|
|
|
|
* queries to return the cached timestamp of the last vblank.
|
|
|
|
*/
|
|
|
|
if (dev->vblank_disable_immediate &&
|
|
|
|
drm_wait_vblank_is_query(vblwait) &&
|
|
|
|
READ_ONCE(vblank->enabled)) {
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
drm_wait_vblank_reply(dev, pipe, &vblwait->reply);
|
2017-05-31 16:21:46 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = drm_vblank_get(dev, pipe);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG("crtc %d failed to acquire vblank counter, %d\n", pipe, ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
seq = drm_vblank_count(dev, pipe);
|
|
|
|
|
|
|
|
switch (vblwait->request.type & _DRM_VBLANK_TYPES_MASK) {
|
|
|
|
case _DRM_VBLANK_RELATIVE:
|
2017-10-13 01:57:49 +07:00
|
|
|
req_seq = seq + vblwait->request.sequence;
|
|
|
|
vblwait->request.sequence = req_seq;
|
2017-05-31 16:21:46 +07:00
|
|
|
vblwait->request.type &= ~_DRM_VBLANK_RELATIVE;
|
2017-10-13 01:57:49 +07:00
|
|
|
break;
|
2017-05-31 16:21:46 +07:00
|
|
|
case _DRM_VBLANK_ABSOLUTE:
|
2017-10-13 01:57:49 +07:00
|
|
|
req_seq = widen_32_to_64(vblwait->request.sequence, seq);
|
2017-05-31 16:21:46 +07:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((flags & _DRM_VBLANK_NEXTONMISS) &&
|
2017-10-13 01:57:49 +07:00
|
|
|
vblank_passed(seq, req_seq)) {
|
|
|
|
req_seq = seq + 1;
|
|
|
|
vblwait->request.type &= ~_DRM_VBLANK_NEXTONMISS;
|
|
|
|
vblwait->request.sequence = req_seq;
|
|
|
|
}
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
if (flags & _DRM_VBLANK_EVENT) {
|
|
|
|
/* must hold on to the vblank ref until the event fires
|
|
|
|
* drm_vblank_put will be called asynchronously
|
|
|
|
*/
|
2017-10-13 01:57:49 +07:00
|
|
|
return drm_queue_vblank_event(dev, pipe, req_seq, vblwait, file_priv);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
if (req_seq != seq) {
|
2019-07-27 04:06:58 +07:00
|
|
|
int wait;
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
DRM_DEBUG("waiting on vblank count %llu, crtc %u\n",
|
|
|
|
req_seq, pipe);
|
2019-07-27 04:06:58 +07:00
|
|
|
wait = wait_event_interruptible_timeout(vblank->queue,
|
|
|
|
vblank_passed(drm_vblank_count(dev, pipe), req_seq) ||
|
|
|
|
!READ_ONCE(vblank->enabled),
|
|
|
|
msecs_to_jiffies(3000));
|
|
|
|
|
|
|
|
switch (wait) {
|
|
|
|
case 0:
|
|
|
|
/* timeout */
|
|
|
|
ret = -EBUSY;
|
|
|
|
break;
|
|
|
|
case -ERESTARTSYS:
|
|
|
|
/* interrupted by signal */
|
|
|
|
ret = -EINTR;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ret != -EINTR) {
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
drm_wait_vblank_reply(dev, pipe, &vblwait->reply);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
DRM_DEBUG("crtc %d returning %u to client\n",
|
|
|
|
pipe, vblwait->reply.sequence);
|
|
|
|
} else {
|
|
|
|
DRM_DEBUG("crtc %d vblank wait interrupted by signal\n", pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
drm_vblank_put(dev, pipe);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_handle_vblank_events(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
2020-01-23 20:59:24 +07:00
|
|
|
struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);
|
|
|
|
bool high_prec = false;
|
2017-05-31 16:21:46 +07:00
|
|
|
struct drm_pending_vblank_event *e, *t;
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
ktime_t now;
|
2017-10-13 01:57:49 +07:00
|
|
|
u64 seq;
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
assert_spin_locked(&dev->event_lock);
|
|
|
|
|
|
|
|
seq = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) {
|
|
|
|
if (e->pipe != pipe)
|
|
|
|
continue;
|
2017-10-13 01:57:49 +07:00
|
|
|
if (!vblank_passed(seq, e->sequence))
|
2017-05-31 16:21:46 +07:00
|
|
|
continue;
|
|
|
|
|
2017-10-13 01:57:49 +07:00
|
|
|
DRM_DEBUG("vblank event on %llu, current %llu\n",
|
|
|
|
e->sequence, seq);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
list_del(&e->base.link);
|
|
|
|
drm_vblank_put(dev, pipe);
|
drm: vblank: use ktime_t instead of timeval
The drm vblank handling uses 'timeval' to store timestamps in either
monotonic or wall-clock time base. In either case, it reads the current
time as a ktime_t in get_drm_timestamp() and converts it from there.
This is a bit suspicious, as users of 'timeval' often suffer from
the time_t overflow in y2038. I have gone through this code and
found that it is unlikely to cause problems here:
- The user space ABI does not use time_t or timeval, but uses
'u32' and 'long' as the types. This means at least that rebuilding
user programs against a new libc with 64-bit time_t does not
change the ABI.
- As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps") in linux-3.8, the monotonic timestamp is the default
and can only get reverted to wall-clock through a module-parameter.
- With the default monotonic timestamps, there is no problem at all.
- The drm_wait_vblank_ioctl() interface is alway safe on 64-bit
architectures, on 32-bit it might overflow the 'long' timestamps
in 2038 with wall-clock timestamps.
- The event handling uses 'u32' seconds, which overflow in 2106
on both 32-bit and 64-bit machines, when wall-clock timestamps
are used.
- The effect of overflowing either of the two is only temporary
(during the overflow, and is likely to keep working again
afterwards. It is likely the same problem as observing a
'settimeofday()' call, which was the reason for moving to the
monotonic timestamps in the first place.
Overall, this seems good enough, so my patch removes the use of
'timeval' from the vblank handling altogether and uses ktime_t
consistently, except for the part where we copy the data to user
space structures in the existing format.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-10-11 22:20:12 +07:00
|
|
|
send_vblank_event(dev, e, seq, now);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
2020-01-23 20:59:24 +07:00
|
|
|
if (crtc && crtc->funcs->get_vblank_timestamp)
|
|
|
|
high_prec = true;
|
|
|
|
|
|
|
|
trace_drm_vblank_event(pipe, seq, now, high_prec);
|
2017-05-31 16:21:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_handle_vblank - handle a vblank event
|
|
|
|
* @dev: DRM device
|
|
|
|
* @pipe: index of CRTC where this event occurred
|
|
|
|
*
|
|
|
|
* Drivers should call this routine in their vblank interrupt handlers to
|
|
|
|
* update the vblank counter and send any signals that may be pending.
|
|
|
|
*
|
|
|
|
* This is the legacy version of drm_crtc_handle_vblank().
|
|
|
|
*/
|
|
|
|
bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
|
|
|
|
{
|
|
|
|
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
|
|
|
|
unsigned long irqflags;
|
|
|
|
bool disable_irq;
|
|
|
|
|
|
|
|
if (WARN_ON_ONCE(!dev->num_crtcs))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (WARN_ON(pipe >= dev->num_crtcs))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->event_lock, irqflags);
|
|
|
|
|
|
|
|
/* Need timestamp lock to prevent concurrent execution with
|
|
|
|
* vblank enable/disable, as this would cause inconsistent
|
|
|
|
* or corrupted timestamps and vblank counts.
|
|
|
|
*/
|
|
|
|
spin_lock(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
/* Vblank irq handling disabled. Nothing to do. */
|
|
|
|
if (!vblank->enabled) {
|
|
|
|
spin_unlock(&dev->vblank_time_lock);
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, irqflags);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
drm_update_vblank_count(dev, pipe, true);
|
|
|
|
|
|
|
|
spin_unlock(&dev->vblank_time_lock);
|
|
|
|
|
|
|
|
wake_up(&vblank->queue);
|
|
|
|
|
|
|
|
/* With instant-off, we defer disabling the interrupt until after
|
|
|
|
* we finish processing the following vblank after all events have
|
|
|
|
* been signaled. The disable has to be last (after
|
|
|
|
* drm_handle_vblank_events) so that the timestamp is always accurate.
|
|
|
|
*/
|
|
|
|
disable_irq = (dev->vblank_disable_immediate &&
|
|
|
|
drm_vblank_offdelay > 0 &&
|
|
|
|
!atomic_read(&vblank->refcount));
|
|
|
|
|
|
|
|
drm_handle_vblank_events(dev, pipe);
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, irqflags);
|
|
|
|
|
|
|
|
if (disable_irq)
|
treewide: setup_timer() -> timer_setup()
This converts all remaining cases of the old setup_timer() API into using
timer_setup(), where the callback argument is the structure already
holding the struct timer_list. These should have no behavioral changes,
since they just change which pointer is passed into the callback with
the same available pointers after conversion. It handles the following
examples, in addition to some other variations.
Casting from unsigned long:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
setup_timer(&ptr->my_timer, my_callback, ptr);
and forced object casts:
void my_callback(struct something *ptr)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr);
become:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
Direct function assignments:
void my_callback(unsigned long data)
{
struct something *ptr = (struct something *)data;
...
}
...
ptr->my_timer.function = my_callback;
have a temporary cast added, along with converting the args:
void my_callback(struct timer_list *t)
{
struct something *ptr = from_timer(ptr, t, my_timer);
...
}
...
ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback;
And finally, callbacks without a data assignment:
void my_callback(unsigned long data)
{
...
}
...
setup_timer(&ptr->my_timer, my_callback, 0);
have their argument renamed to verify they're unused during conversion:
void my_callback(struct timer_list *unused)
{
...
}
...
timer_setup(&ptr->my_timer, my_callback, 0);
The conversion is done with the following Coccinelle script:
spatch --very-quiet --all-includes --include-headers \
-I ./arch/x86/include -I ./arch/x86/include/generated \
-I ./include -I ./arch/x86/include/uapi \
-I ./arch/x86/include/generated/uapi -I ./include/uapi \
-I ./include/generated/uapi --include ./include/linux/kconfig.h \
--dir . \
--cocci-file ~/src/data/timer_setup.cocci
@fix_address_of@
expression e;
@@
setup_timer(
-&(e)
+&e
, ...)
// Update any raw setup_timer() usages that have a NULL callback, but
// would otherwise match change_timer_function_usage, since the latter
// will update all function assignments done in the face of a NULL
// function initialization in setup_timer().
@change_timer_function_usage_NULL@
expression _E;
identifier _timer;
type _cast_data;
@@
(
-setup_timer(&_E->_timer, NULL, _E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E->_timer, NULL, (_cast_data)_E);
+timer_setup(&_E->_timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, &_E);
+timer_setup(&_E._timer, NULL, 0);
|
-setup_timer(&_E._timer, NULL, (_cast_data)&_E);
+timer_setup(&_E._timer, NULL, 0);
)
@change_timer_function_usage@
expression _E;
identifier _timer;
struct timer_list _stl;
identifier _callback;
type _cast_func, _cast_data;
@@
(
-setup_timer(&_E->_timer, _callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, &_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, _E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, &_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E);
+timer_setup(&_E._timer, _callback, 0);
|
_E->_timer@_stl.function = _callback;
|
_E->_timer@_stl.function = &_callback;
|
_E->_timer@_stl.function = (_cast_func)_callback;
|
_E->_timer@_stl.function = (_cast_func)&_callback;
|
_E._timer@_stl.function = _callback;
|
_E._timer@_stl.function = &_callback;
|
_E._timer@_stl.function = (_cast_func)_callback;
|
_E._timer@_stl.function = (_cast_func)&_callback;
)
// callback(unsigned long arg)
@change_callback_handle_cast
depends on change_timer_function_usage@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
identifier _handle;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
(
... when != _origarg
_handletype *_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(_handletype *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
|
... when != _origarg
_handletype *_handle;
... when != _handle
_handle =
-(void *)_origarg;
+from_timer(_handle, t, _timer);
... when != _origarg
)
}
// callback(unsigned long arg) without existing variable
@change_callback_handle_cast_no_arg
depends on change_timer_function_usage &&
!change_callback_handle_cast@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _origtype;
identifier _origarg;
type _handletype;
@@
void _callback(
-_origtype _origarg
+struct timer_list *t
)
{
+ _handletype *_origarg = from_timer(_origarg, t, _timer);
+
... when != _origarg
- (_handletype *)_origarg
+ _origarg
... when != _origarg
}
// Avoid already converted callbacks.
@match_callback_converted
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier t;
@@
void _callback(struct timer_list *t)
{ ... }
// callback(struct something *handle)
@change_callback_handle_arg
depends on change_timer_function_usage &&
!match_callback_converted &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
@@
void _callback(
-_handletype *_handle
+struct timer_list *t
)
{
+ _handletype *_handle = from_timer(_handle, t, _timer);
...
}
// If change_callback_handle_arg ran on an empty function, remove
// the added handler.
@unchange_callback_handle_arg
depends on change_timer_function_usage &&
change_callback_handle_arg@
identifier change_timer_function_usage._callback;
identifier change_timer_function_usage._timer;
type _handletype;
identifier _handle;
identifier t;
@@
void _callback(struct timer_list *t)
{
- _handletype *_handle = from_timer(_handle, t, _timer);
}
// We only want to refactor the setup_timer() data argument if we've found
// the matching callback. This undoes changes in change_timer_function_usage.
@unchange_timer_function_usage
depends on change_timer_function_usage &&
!change_callback_handle_cast &&
!change_callback_handle_cast_no_arg &&
!change_callback_handle_arg@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type change_timer_function_usage._cast_data;
@@
(
-timer_setup(&_E->_timer, _callback, 0);
+setup_timer(&_E->_timer, _callback, (_cast_data)_E);
|
-timer_setup(&_E._timer, _callback, 0);
+setup_timer(&_E._timer, _callback, (_cast_data)&_E);
)
// If we fixed a callback from a .function assignment, fix the
// assignment cast now.
@change_timer_function_assignment
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression change_timer_function_usage._E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_func;
typedef TIMER_FUNC_TYPE;
@@
(
_E->_timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E->_timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-&_callback;
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)_callback
+(TIMER_FUNC_TYPE)_callback
;
|
_E._timer.function =
-(_cast_func)&_callback
+(TIMER_FUNC_TYPE)_callback
;
)
// Sometimes timer functions are called directly. Replace matched args.
@change_timer_function_calls
depends on change_timer_function_usage &&
(change_callback_handle_cast ||
change_callback_handle_cast_no_arg ||
change_callback_handle_arg)@
expression _E;
identifier change_timer_function_usage._timer;
identifier change_timer_function_usage._callback;
type _cast_data;
@@
_callback(
(
-(_cast_data)_E
+&_E->_timer
|
-(_cast_data)&_E
+&_E._timer
|
-_E
+&_E->_timer
)
)
// If a timer has been configured without a data argument, it can be
// converted without regard to the callback argument, since it is unused.
@match_timer_function_unused_data@
expression _E;
identifier _timer;
identifier _callback;
@@
(
-setup_timer(&_E->_timer, _callback, 0);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0L);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E->_timer, _callback, 0UL);
+timer_setup(&_E->_timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0L);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_E._timer, _callback, 0UL);
+timer_setup(&_E._timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0L);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(&_timer, _callback, 0UL);
+timer_setup(&_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0L);
+timer_setup(_timer, _callback, 0);
|
-setup_timer(_timer, _callback, 0UL);
+timer_setup(_timer, _callback, 0);
)
@change_callback_unused_data
depends on match_timer_function_unused_data@
identifier match_timer_function_unused_data._callback;
type _origtype;
identifier _origarg;
@@
void _callback(
-_origtype _origarg
+struct timer_list *unused
)
{
... when != _origarg
}
Signed-off-by: Kees Cook <keescook@chromium.org>
2017-10-17 04:43:17 +07:00
|
|
|
vblank_disable_fn(&vblank->disable_timer);
|
2017-05-31 16:21:46 +07:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_handle_vblank);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_handle_vblank - handle a vblank event
|
|
|
|
* @crtc: where this event occurred
|
|
|
|
*
|
|
|
|
* Drivers should call this routine in their vblank interrupt handlers to
|
|
|
|
* update the vblank counter and send any signals that may be pending.
|
|
|
|
*
|
|
|
|
* This is the native KMS version of drm_handle_vblank().
|
|
|
|
*
|
2019-07-23 20:13:37 +07:00
|
|
|
* Note that for a given vblank counter value drm_crtc_handle_vblank()
|
|
|
|
* and drm_crtc_vblank_count() or drm_crtc_vblank_count_and_time()
|
|
|
|
* provide a barrier: Any writes done before calling
|
|
|
|
* drm_crtc_handle_vblank() will be visible to callers of the later
|
|
|
|
* functions, iff the vblank count is the same or a later one.
|
|
|
|
*
|
|
|
|
* See also &drm_vblank_crtc.count.
|
|
|
|
*
|
2017-05-31 16:21:46 +07:00
|
|
|
* Returns:
|
|
|
|
* True if the event was successfully handled, false on failure.
|
|
|
|
*/
|
|
|
|
bool drm_crtc_handle_vblank(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
return drm_handle_vblank(crtc->dev, drm_crtc_index(crtc));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_handle_vblank);
|
2017-06-30 12:49:31 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Get crtc VBLANK count.
|
|
|
|
*
|
|
|
|
* \param dev DRM device
|
|
|
|
* \param data user arguement, pointing to a drm_crtc_get_sequence structure.
|
|
|
|
* \param file_priv drm file private for the user's open file descriptor
|
|
|
|
*/
|
|
|
|
|
|
|
|
int drm_crtc_get_sequence_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
struct drm_vblank_crtc *vblank;
|
|
|
|
int pipe;
|
|
|
|
struct drm_crtc_get_sequence *get_seq = data;
|
|
|
|
ktime_t now;
|
|
|
|
bool vblank_enabled;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
2018-09-14 02:20:50 +07:00
|
|
|
return -EOPNOTSUPP;
|
2017-06-30 12:49:31 +07:00
|
|
|
|
|
|
|
if (!dev->irq_enabled)
|
drm/drm_vblank: Change EINVAL by the correct errno
For historical reasons, the function drm_wait_vblank_ioctl always return
-EINVAL if something gets wrong. This scenario limits the flexibility
for the userspace to make detailed verification of any problem and take
some action. In particular, the validation of “if (!dev->irq_enabled)”
in the drm_wait_vblank_ioctl is responsible for checking if the driver
support vblank or not. If the driver does not support VBlank, the
function drm_wait_vblank_ioctl returns EINVAL, which does not represent
the real issue; this patch changes this behavior by return EOPNOTSUPP.
Additionally, drm_crtc_get_sequence_ioctl and
drm_crtc_queue_sequence_ioctl, also returns EINVAL if vblank is not
supported; this patch also changes the return value to EOPNOTSUPP in
these functions. Lastly, these functions are invoked by libdrm, which is
used by many compositors; because of this, it is important to check if
this change breaks any compositor. In this sense, the following projects
were examined:
* Drm-hwcomposer
* Kwin
* Sway
* Wlroots
* Wayland
* Weston
* Mutter
* Xorg (67 different drivers)
For each repository the verification happened in three steps:
* Update the main branch
* Look for any occurrence of "drmCrtcQueueSequence",
"drmCrtcGetSequence", and "drmWaitVBlank" with the command git grep -n
"STRING".
* Look in the git history of the project with the command
git log -S<STRING>
None of the above projects validate the use of EINVAL when using
drmWaitVBlank(), which make safe, at least for these projects, to change
the return values. On the other hand, mesa and xserver project uses
drmCrtcQueueSequence() and drmCrtcGetSequence(); this change is harmless
for both projects.
Change since V5 (Pekka Paalanen):
- Check if the change also affects Mutter
Change since V4 (Daniel):
- Also return EOPNOTSUPP in drm_crtc_[get|queue]_sequence_ioctl
Change since V3:
- Return EINVAL for _DRM_VBLANK_SIGNAL (Daniel)
Change since V2:
Daniel Vetter and Chris Wilson
- Replace ENOTTY by EOPNOTSUPP
- Return EINVAL if the parameters are wrong
Cc: Keith Packard <keithp@keithp.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191002140516.adeyj3htylimmlmg@smtp.gmail.com
2019-10-02 21:05:16 +07:00
|
|
|
return -EOPNOTSUPP;
|
2017-06-30 12:49:31 +07:00
|
|
|
|
|
|
|
crtc = drm_crtc_find(dev, file_priv, get_seq->crtc_id);
|
|
|
|
if (!crtc)
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
pipe = drm_crtc_index(crtc);
|
|
|
|
|
|
|
|
vblank = &dev->vblank[pipe];
|
|
|
|
vblank_enabled = dev->vblank_disable_immediate && READ_ONCE(vblank->enabled);
|
|
|
|
|
|
|
|
if (!vblank_enabled) {
|
|
|
|
ret = drm_crtc_vblank_get(crtc);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG("crtc %d failed to acquire vblank counter, %d\n", pipe, ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
drm_modeset_lock(&crtc->mutex, NULL);
|
|
|
|
if (crtc->state)
|
|
|
|
get_seq->active = crtc->state->enable;
|
|
|
|
else
|
|
|
|
get_seq->active = crtc->enabled;
|
|
|
|
drm_modeset_unlock(&crtc->mutex);
|
|
|
|
get_seq->sequence = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
get_seq->sequence_ns = ktime_to_ns(now);
|
|
|
|
if (!vblank_enabled)
|
|
|
|
drm_crtc_vblank_put(crtc);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Queue a event for VBLANK sequence
|
|
|
|
*
|
|
|
|
* \param dev DRM device
|
|
|
|
* \param data user arguement, pointing to a drm_crtc_queue_sequence structure.
|
|
|
|
* \param file_priv drm file private for the user's open file descriptor
|
|
|
|
*/
|
|
|
|
|
|
|
|
int drm_crtc_queue_sequence_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
struct drm_vblank_crtc *vblank;
|
|
|
|
int pipe;
|
|
|
|
struct drm_crtc_queue_sequence *queue_seq = data;
|
|
|
|
ktime_t now;
|
|
|
|
struct drm_pending_vblank_event *e;
|
|
|
|
u32 flags;
|
|
|
|
u64 seq;
|
|
|
|
u64 req_seq;
|
|
|
|
int ret;
|
|
|
|
unsigned long spin_flags;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
2018-09-14 02:20:50 +07:00
|
|
|
return -EOPNOTSUPP;
|
2017-06-30 12:49:31 +07:00
|
|
|
|
|
|
|
if (!dev->irq_enabled)
|
drm/drm_vblank: Change EINVAL by the correct errno
For historical reasons, the function drm_wait_vblank_ioctl always return
-EINVAL if something gets wrong. This scenario limits the flexibility
for the userspace to make detailed verification of any problem and take
some action. In particular, the validation of “if (!dev->irq_enabled)”
in the drm_wait_vblank_ioctl is responsible for checking if the driver
support vblank or not. If the driver does not support VBlank, the
function drm_wait_vblank_ioctl returns EINVAL, which does not represent
the real issue; this patch changes this behavior by return EOPNOTSUPP.
Additionally, drm_crtc_get_sequence_ioctl and
drm_crtc_queue_sequence_ioctl, also returns EINVAL if vblank is not
supported; this patch also changes the return value to EOPNOTSUPP in
these functions. Lastly, these functions are invoked by libdrm, which is
used by many compositors; because of this, it is important to check if
this change breaks any compositor. In this sense, the following projects
were examined:
* Drm-hwcomposer
* Kwin
* Sway
* Wlroots
* Wayland
* Weston
* Mutter
* Xorg (67 different drivers)
For each repository the verification happened in three steps:
* Update the main branch
* Look for any occurrence of "drmCrtcQueueSequence",
"drmCrtcGetSequence", and "drmWaitVBlank" with the command git grep -n
"STRING".
* Look in the git history of the project with the command
git log -S<STRING>
None of the above projects validate the use of EINVAL when using
drmWaitVBlank(), which make safe, at least for these projects, to change
the return values. On the other hand, mesa and xserver project uses
drmCrtcQueueSequence() and drmCrtcGetSequence(); this change is harmless
for both projects.
Change since V5 (Pekka Paalanen):
- Check if the change also affects Mutter
Change since V4 (Daniel):
- Also return EOPNOTSUPP in drm_crtc_[get|queue]_sequence_ioctl
Change since V3:
- Return EINVAL for _DRM_VBLANK_SIGNAL (Daniel)
Change since V2:
Daniel Vetter and Chris Wilson
- Replace ENOTTY by EOPNOTSUPP
- Return EINVAL if the parameters are wrong
Cc: Keith Packard <keithp@keithp.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191002140516.adeyj3htylimmlmg@smtp.gmail.com
2019-10-02 21:05:16 +07:00
|
|
|
return -EOPNOTSUPP;
|
2017-06-30 12:49:31 +07:00
|
|
|
|
|
|
|
crtc = drm_crtc_find(dev, file_priv, queue_seq->crtc_id);
|
|
|
|
if (!crtc)
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
flags = queue_seq->flags;
|
|
|
|
/* Check valid flag bits */
|
|
|
|
if (flags & ~(DRM_CRTC_SEQUENCE_RELATIVE|
|
|
|
|
DRM_CRTC_SEQUENCE_NEXT_ON_MISS))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pipe = drm_crtc_index(crtc);
|
|
|
|
|
|
|
|
vblank = &dev->vblank[pipe];
|
|
|
|
|
|
|
|
e = kzalloc(sizeof(*e), GFP_KERNEL);
|
|
|
|
if (e == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ret = drm_crtc_vblank_get(crtc);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG("crtc %d failed to acquire vblank counter, %d\n", pipe, ret);
|
|
|
|
goto err_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
seq = drm_vblank_count_and_time(dev, pipe, &now);
|
|
|
|
req_seq = queue_seq->sequence;
|
|
|
|
|
|
|
|
if (flags & DRM_CRTC_SEQUENCE_RELATIVE)
|
|
|
|
req_seq += seq;
|
|
|
|
|
|
|
|
if ((flags & DRM_CRTC_SEQUENCE_NEXT_ON_MISS) && vblank_passed(seq, req_seq))
|
|
|
|
req_seq = seq + 1;
|
|
|
|
|
|
|
|
e->pipe = pipe;
|
|
|
|
e->event.base.type = DRM_EVENT_CRTC_SEQUENCE;
|
|
|
|
e->event.base.length = sizeof(e->event.seq);
|
|
|
|
e->event.seq.user_data = queue_seq->user_data;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev->event_lock, spin_flags);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* drm_crtc_vblank_off() might have been called after we called
|
|
|
|
* drm_crtc_vblank_get(). drm_crtc_vblank_off() holds event_lock around the
|
|
|
|
* vblank disable, so no need for further locking. The reference from
|
|
|
|
* drm_crtc_vblank_get() protects against vblank disable from another source.
|
|
|
|
*/
|
|
|
|
if (!READ_ONCE(vblank->enabled)) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = drm_event_reserve_init_locked(dev, file_priv, &e->base,
|
|
|
|
&e->event.base);
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
goto err_unlock;
|
|
|
|
|
|
|
|
e->sequence = req_seq;
|
|
|
|
|
|
|
|
if (vblank_passed(seq, req_seq)) {
|
|
|
|
drm_crtc_vblank_put(crtc);
|
|
|
|
send_vblank_event(dev, e, seq, now);
|
|
|
|
queue_seq->sequence = seq;
|
|
|
|
} else {
|
|
|
|
/* drm_handle_vblank_events will call drm_vblank_put */
|
|
|
|
list_add_tail(&e->base.link, &dev->vblank_event_list);
|
|
|
|
queue_seq->sequence = req_seq;
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, spin_flags);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_unlock:
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, spin_flags);
|
|
|
|
drm_crtc_vblank_put(crtc);
|
|
|
|
err_free:
|
|
|
|
kfree(e);
|
|
|
|
return ret;
|
|
|
|
}
|