cdf00968de
drm_fb_helper_is_bound() is used to check if DRM userspace is in control.
This is done by looking at the fb on the primary plane. By the time
fb-helper gets around to committing, it's possible that the facts have
changed.
Avoid this race by holding the drm_device->master_mutex lock while
committing. When DRM userspace does its first open, it will now wait
until fb-helper is done. The helper will stay away if there's a master.
Two igt tests fail with the new 'bail out if master' rule. Work around
this by relaxing this rule for drm_fb_helper_restore_fbdev_mode_unlocked()
until the tests have been fixed. Add todo entry for this.
Locking rule: Always take the fb-helper lock first.
v5: drm_fb_helper_restore_fbdev_mode_unlocked(): Use
restore_fbdev_mode_force()
v2:
- Remove drm_fb_helper_is_bound() (Daniel Vetter)
- No need to check fb_helper->dev->master in
drm_fb_helper_single_fb_probe(), restore_fbdev_mode() has the check.
Patch-mainline: 20190506180139.6913-3-noralf@tronnes.org @ 06/05/19, 06:01 p.m.
Link: https://patchwork.freedesktop.org/patch/msgid/20190506180139.6913-3-noralf@tronnes.org
Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[stalek@codeaurora.org: Drop changes for drm_fb_helper.c due to conflicts.].
Change-Id: Iee3a478c273e3c00eda779ff6551ea1261b7b1f9
Signed-off-by: Shubham Talekar <stalek@codeaurora.org>
179 lines
6.4 KiB
C
179 lines
6.4 KiB
C
/*
|
|
* Copyright © 2014 Intel Corporation
|
|
* Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
*
|
|
* 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 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
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
|
|
*/
|
|
|
|
#define DRM_IF_MAJOR 1
|
|
#define DRM_IF_MINOR 4
|
|
|
|
/* drm_file.c */
|
|
extern struct mutex drm_global_mutex;
|
|
struct drm_file *drm_file_alloc(struct drm_minor *minor);
|
|
void drm_file_free(struct drm_file *file);
|
|
void drm_lastclose(struct drm_device *dev);
|
|
|
|
/* drm_pci.c */
|
|
int drm_irq_by_busid(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
void drm_pci_agp_destroy(struct drm_device *dev);
|
|
int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master);
|
|
|
|
/* drm_prime.c */
|
|
int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv);
|
|
void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv);
|
|
void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
|
|
struct dma_buf *dma_buf);
|
|
|
|
/* drm_drv.c */
|
|
struct drm_minor *drm_minor_acquire(unsigned int minor_id);
|
|
void drm_minor_release(struct drm_minor *minor);
|
|
|
|
/* drm_info.c */
|
|
int drm_name_info(struct seq_file *m, void *data);
|
|
int drm_clients_info(struct seq_file *m, void* data);
|
|
int drm_gem_name_info(struct seq_file *m, void *data);
|
|
|
|
/* drm_vblank.c */
|
|
extern unsigned int drm_timestamp_monotonic;
|
|
void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe);
|
|
void drm_vblank_cleanup(struct drm_device *dev);
|
|
|
|
/* IOCTLS */
|
|
int drm_wait_vblank_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *filp);
|
|
int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
/* drm_irq.c */
|
|
|
|
/* IOCTLS */
|
|
int drm_legacy_irq_control(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
/* drm_auth.c */
|
|
int drm_getmagic(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_authmagic(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_setmaster_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_master_open(struct drm_file *file_priv);
|
|
void drm_master_release(struct drm_file *file_priv);
|
|
bool drm_master_internal_acquire(struct drm_device *dev);
|
|
void drm_master_internal_release(struct drm_device *dev);
|
|
/* drm_sysfs.c */
|
|
extern struct class *drm_class;
|
|
|
|
int drm_sysfs_init(void);
|
|
void drm_sysfs_destroy(void);
|
|
struct device *drm_sysfs_minor_alloc(struct drm_minor *minor);
|
|
int drm_sysfs_connector_add(struct drm_connector *connector);
|
|
void drm_sysfs_connector_remove(struct drm_connector *connector);
|
|
|
|
/* drm_gem.c */
|
|
int drm_gem_init(struct drm_device *dev);
|
|
void drm_gem_destroy(struct drm_device *dev);
|
|
int drm_gem_handle_create_tail(struct drm_file *file_priv,
|
|
struct drm_gem_object *obj,
|
|
u32 *handlep);
|
|
int drm_gem_close_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_gem_flink_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
int drm_gem_open_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
void drm_gem_open(struct drm_device *dev, struct drm_file *file_private);
|
|
void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
|
|
|
|
/* drm_debugfs.c drm_debugfs_crc.c */
|
|
#if defined(CONFIG_DEBUG_FS)
|
|
int drm_debugfs_init(struct drm_minor *minor, int minor_id,
|
|
struct dentry *root);
|
|
int drm_debugfs_cleanup(struct drm_minor *minor);
|
|
int drm_debugfs_connector_add(struct drm_connector *connector);
|
|
void drm_debugfs_connector_remove(struct drm_connector *connector);
|
|
int drm_debugfs_crtc_add(struct drm_crtc *crtc);
|
|
void drm_debugfs_crtc_remove(struct drm_crtc *crtc);
|
|
int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc);
|
|
#else
|
|
static inline int drm_debugfs_init(struct drm_minor *minor, int minor_id,
|
|
struct dentry *root)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int drm_debugfs_cleanup(struct drm_minor *minor)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int drm_debugfs_connector_add(struct drm_connector *connector)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void drm_debugfs_connector_remove(struct drm_connector *connector)
|
|
{
|
|
}
|
|
|
|
static inline int drm_debugfs_crtc_add(struct drm_crtc *crtc)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void drm_debugfs_crtc_remove(struct drm_crtc *crtc)
|
|
{
|
|
}
|
|
|
|
static inline int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
drm_ioctl_t drm_version;
|
|
drm_ioctl_t drm_getunique;
|
|
drm_ioctl_t drm_getclient;
|
|
|
|
/* drm_syncobj.c */
|
|
void drm_syncobj_open(struct drm_file *file_private);
|
|
void drm_syncobj_release(struct drm_file *file_private);
|
|
int drm_syncobj_create_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|
|
int drm_syncobj_destroy_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|
|
int drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|
|
int drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|
|
int drm_syncobj_wait_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|
|
int drm_syncobj_reset_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|
|
int drm_syncobj_signal_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_private);
|