Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d49473a5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Restrict drm_mode_set_config_internal to non-atomic drivers 



This is another case where we really can't reconstruct a acquire ctx
in any useful fashion because all the callers are legacy drivers. So
like drm_plane_force_disable simply restrict it to non-atomic drivers
so that it's clear we're ok with passing a NULL ctx.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-17-daniel.vetter@ffwll.ch
parent 2c77bb29

drivers/gpu/drm/drm_crtc.c

+21 −13
Original line number Diff line number Diff line
@@ -447,18 +447,7 @@ int drm_mode_getcrtc(struct drm_device *dev, 
	return 0;

}



/**

 * drm_mode_set_config_internal - helper to call &drm_mode_config_funcs.set_config

 * @set: modeset config to set

 *

 * This is a little helper to wrap internal calls to the

 * &drm_mode_config_funcs.set_config driver interface. The only thing it adds is

 * correct refcounting dance.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_mode_set_config_internal(struct drm_mode_set *set)

static int __drm_mode_set_config_internal(struct drm_mode_set *set)

{

	struct drm_crtc *crtc = set->crtc;

	struct drm_framebuffer *fb;
@@ -491,6 +480,25 @@ int drm_mode_set_config_internal(struct drm_mode_set *set) 


	return ret;

}

/**

 * drm_mode_set_config_internal - helper to call &drm_mode_config_funcs.set_config

 * @set: modeset config to set

 *

 * This is a little helper to wrap internal calls to the

 * &drm_mode_config_funcs.set_config driver interface. The only thing it adds is

 * correct refcounting dance.

 *

 * This should only be used by non-atomic legacy drivers.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_mode_set_config_internal(struct drm_mode_set *set)

{

	WARN_ON(drm_drv_uses_atomic_modeset(set->crtc->dev));



	return __drm_mode_set_config_internal(set);

}

EXPORT_SYMBOL(drm_mode_set_config_internal);



/**
@@ -688,7 +696,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
	set.connectors = connector_set;

	set.num_connectors = crtc_req->count_connectors;

	set.fb = fb;

	ret = drm_mode_set_config_internal(&set);

	ret = __drm_mode_set_config_internal(&set);



out:

	if (fb)