system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 11:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/client: Rename _force to _locked

Browse source 
Plus extend the kerneldoc a bit to explain how this should be used.
With the previous patch to drop the force restore the main user of
this function is not emphasis on the "I hold the internal master lock
already" aspect, so rename the function to match.

Suggested by Noralf.

Cc: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Tested-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200204150146.2006481-4-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2020-02-04 16:01:44 +01:00
parent 64914da24e
commit c368ec194d
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/drm_client_modeset.c
View file

@ -1022,15 +1022,17 @@ static int drm_client_modeset_commit_legacy(struct drm_client_dev *client)
} }
/** /**
* drm_client_modeset_commit_force() - Force commit CRTC configuration * drm_client_modeset_commit_locked() - Force commit CRTC configuration
* @client: DRM client * @client: DRM client
* *
* Commit modeset configuration to crtcs without checking if there is a DRM master. * Commit modeset configuration to crtcs without checking if there is a DRM
* master. The assumption is that the caller already holds an internal DRM
* master reference acquired with drm_master_internal_acquire().
* *
* Returns: * Returns:
* Zero on success or negative error code on failure. * Zero on success or negative error code on failure.
*/ */
int drm_client_modeset_commit_force(struct drm_client_dev *client) int drm_client_modeset_commit_locked(struct drm_client_dev *client)
{ {
struct drm_device *dev = client->dev; struct drm_device *dev = client->dev;
int ret; int ret;
@ -1044,7 +1046,7 @@ int drm_client_modeset_commit_force(struct drm_client_dev *client)
return ret; return ret;
} }
EXPORT_SYMBOL(drm_client_modeset_commit_force); EXPORT_SYMBOL(drm_client_modeset_commit_locked);
/** /**
* drm_client_modeset_commit() - Commit CRTC configuration * drm_client_modeset_commit() - Commit CRTC configuration
@ -1063,7 +1065,7 @@ int drm_client_modeset_commit(struct drm_client_dev *client)
if (!drm_master_internal_acquire(dev)) if (!drm_master_internal_acquire(dev))
return -EBUSY; return -EBUSY;
ret = drm_client_modeset_commit_force(client); ret = drm_client_modeset_commit_locked(client);
drm_master_internal_release(dev); drm_master_internal_release(dev);

4
drivers/gpu/drm/drm_fb_helper.c
View file

@ -284,7 +284,7 @@ static bool drm_fb_helper_force_kernel_mode(void)
continue; continue;
mutex_lock(&helper->lock); mutex_lock(&helper->lock);
ret = drm_client_modeset_commit_force(&helper->client); ret = drm_client_modeset_commit_locked(&helper->client);
if (ret) if (ret)
error = true; error = true;
mutex_unlock(&helper->lock); mutex_unlock(&helper->lock);
@ -1342,7 +1342,7 @@ static int pan_display_atomic(struct fb_var_screeninfo *var,
pan_set(fb_helper, var->xoffset, var->yoffset); pan_set(fb_helper, var->xoffset, var->yoffset);
ret = drm_client_modeset_commit_force(&fb_helper->client); ret = drm_client_modeset_commit_locked(&fb_helper->client);
if (!ret) { if (!ret) {
info->var.xoffset = var->xoffset; info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset; info->var.yoffset = var->yoffset;

2
include/drm/drm_client.h
View file

@ -161,7 +161,7 @@ int drm_client_modeset_create(struct drm_client_dev *client);
void drm_client_modeset_free(struct drm_client_dev *client); void drm_client_modeset_free(struct drm_client_dev *client);
int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, unsigned int height); int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, unsigned int height);
bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation); bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation);
int drm_client_modeset_commit_force(struct drm_client_dev *client); int drm_client_modeset_commit_locked(struct drm_client_dev *client);
int drm_client_modeset_commit(struct drm_client_dev *client); int drm_client_modeset_commit(struct drm_client_dev *client);
int drm_client_modeset_dpms(struct drm_client_dev *client, int mode); int drm_client_modeset_dpms(struct drm_client_dev *client, int mode);