diff options
author | Jani Nikula <jani.nikula@intel.com> | 2022-08-29 14:44:38 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2022-08-29 15:14:59 +0300 |
commit | 917bda9ab155032a02be1a57ebd4d949ae9e1528 (patch) | |
tree | 7758d62783f5fb81777c37d0ad4e26eea6312c0f /drivers/gpu/drm/drm_file.c | |
parent | 95086cb969b2cb8abe4984457f219ec70d24052e (diff) | |
parent | 2c2d7a67defa198a8b8148dbaddc9e5554efebc8 (diff) | |
download | linux-917bda9ab155032a02be1a57ebd4d949ae9e1528.tar.bz2 |
Merge drm/drm-next into drm-intel-next
Sync drm-intel-next with v6.0-rc as well as recent drm-intel-gt-next.
Since drm-next does not have commit f0c70d41e4e8 ("drm/i915/guc: remove
runtime info printing from time stamp logging") yet, only
drm-intel-gt-next, will need to do that as part of the merge here to
build.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_file.c')
-rw-r--r-- | drivers/gpu/drm/drm_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index ed25168619fc..dc7d2e5b16c8 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -552,8 +552,7 @@ EXPORT_SYMBOL(drm_release_noglobal); * Since events are used by the KMS API for vblank and page flip completion this * means all modern display drivers must use it. * - * @offset is ignored, DRM events are read like a pipe. Therefore drivers also - * must set the &file_operation.llseek to no_llseek(). Polling support is + * @offset is ignored, DRM events are read like a pipe. Polling support is * provided by drm_poll(). * * This function will only ever read a full event. Therefore userspace must |