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

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

drm: Add acquire ctx parameter to ->set_config 



Surprisingly a lot of legacy drivers roll their own, for
runtime pm and because vmwgfx.

Also make nouveau's set_config static while at it.

Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-19-daniel.vetter@ffwll.ch
parent 2ceb585a

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+3 −2
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, 
	return 0;

}



int amdgpu_crtc_set_config(struct drm_mode_set *set)

int amdgpu_crtc_set_config(struct drm_mode_set *set,

			   struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_device *dev;

	struct amdgpu_device *adev;
@@ -350,7 +351,7 @@ int amdgpu_crtc_set_config(struct drm_mode_set *set) 
	if (ret < 0)

		return ret;



	ret = drm_crtc_helper_set_config(set);

	ret = drm_crtc_helper_set_config(set, ctx);



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

		if (crtc->enabled)

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+2 −1
Original line number Diff line number Diff line
@@ -590,7 +590,8 @@ int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tile 
/* amdgpu_display.c */

void amdgpu_print_display_setup(struct drm_device *dev);

int amdgpu_modeset_create_props(struct amdgpu_device *adev);

int amdgpu_crtc_set_config(struct drm_mode_set *set);

int amdgpu_crtc_set_config(struct drm_mode_set *set,

			   struct drm_modeset_acquire_ctx *ctx);

int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc,

				 struct drm_framebuffer *fb,

				 struct drm_pending_vblank_event *event,

drivers/gpu/drm/drm_atomic_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -2265,6 +2265,7 @@ static int update_output_state(struct drm_atomic_state *state, 
/**

 * drm_atomic_helper_set_config - set a new config from userspace

 * @set: mode set configuration

 * @ctx: lock acquisition context

 *

 * Provides a default crtc set_config handler using the atomic driver interface.

 *
@@ -2277,7 +2278,8 @@ static int update_output_state(struct drm_atomic_state *state, 
 * Returns:

 * Returns 0 on success, negative errno numbers on failure.

 */

int drm_atomic_helper_set_config(struct drm_mode_set *set)

int drm_atomic_helper_set_config(struct drm_mode_set *set,

				 struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_atomic_state *state;

	struct drm_crtc *crtc = set->crtc;

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static int __drm_mode_set_config_internal(struct drm_mode_set *set, 


	fb = set->fb;



	ret = crtc->funcs->set_config(set);

	ret = crtc->funcs->set_config(set, ctx);

	if (ret == 0) {

		crtc->primary->crtc = crtc;

		crtc->primary->fb = fb;

drivers/gpu/drm/drm_crtc_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ drm_crtc_helper_disable(struct drm_crtc *crtc) 
/**

 * drm_crtc_helper_set_config - set a new config from userspace

 * @set: mode set configuration

 * @ctx: lock acquire context, not used here

 *

 * The drm_crtc_helper_set_config() helper function implements the of

 * &drm_crtc_funcs.set_config callback for drivers using the legacy CRTC
@@ -510,7 +511,8 @@ drm_crtc_helper_disable(struct drm_crtc *crtc) 
 * Returns:

 * Returns 0 on success, negative errno numbers on failure.

 */

int drm_crtc_helper_set_config(struct drm_mode_set *set)

int drm_crtc_helper_set_config(struct drm_mode_set *set,

			       struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_device *dev;

	struct drm_crtc **save_encoder_crtcs, *new_crtc;