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

Commit 21c74a8e authored by Jason Wessel's avatar Jason Wessel Committed by Dave Airlie
Browse files

drm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum 



The enter argument as implemented by commit 413d45d3 (drm, kdb, kms:
Add an enter argument to mode_set_base_atomic() API) should be more
descriptive as to what it does vs just passing 1 and 0 around.

There is no runtime behavior change as a result of this patch.

Reported-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
CC: David Airlie <airlied@linux.ie>
CC: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 99231028

drivers/gpu/drm/drm_fb_helper.c

+2 −3
Original line number Diff line number Diff line
@@ -289,8 +289,7 @@ int drm_fb_helper_debug_enter(struct fb_info *info) 
						    mode_set->fb,

						    mode_set->x,

						    mode_set->y,

						    1);



						    ENTER_ATOMIC_MODE_SET);

		}

	}
@@ -336,7 +335,7 @@ int drm_fb_helper_debug_leave(struct fb_info *info) 


		drm_fb_helper_restore_lut_atomic(mode_set->crtc);

		funcs->mode_set_base_atomic(mode_set->crtc, fb, crtc->x,

					    crtc->y, 0);

					    crtc->y, LEAVE_ATOMIC_MODE_SET);

	}



	return 0;

drivers/gpu/drm/i915/intel_display.c

+3 −2
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 
/* Assume fb object is pinned & idle & fenced and just update base pointers */

static int

intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,

			   int x, int y, int enter)

			   int x, int y, enum mode_set_atomic state)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1614,7 +1614,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, 
			   atomic_read(&obj_priv->pending_flip) == 0);

	}



	ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, 0);

	ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y,

					 LEAVE_ATOMIC_MODE_SET);

	if (ret) {

		i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj);

		mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/nouveau/nv04_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -860,12 +860,12 @@ nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
static int

nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc,

			       struct drm_framebuffer *fb,

			       int x, int y, int enter)

			       int x, int y, enum mode_set_atomic state)

{

	struct drm_nouveau_private *dev_priv = crtc->dev->dev_private;

	struct drm_device *dev = dev_priv->dev;



	if (enter)

	if (state == ENTER_ATOMIC_MODE_SET)

		nouveau_fbcon_save_disable_accel(dev);

	else

		nouveau_fbcon_restore_accel(dev);

drivers/gpu/drm/nouveau/nv50_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ nv50_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
static int

nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc,

			       struct drm_framebuffer *fb,

			       int x, int y, int enter)

			       int x, int y, enum mode_set_atomic state)

{

	return nv50_crtc_do_mode_set_base(crtc, fb, x, y, true, true);

}

drivers/gpu/drm/radeon/atombios_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y, 


int atombios_crtc_set_base_atomic(struct drm_crtc *crtc,

                                  struct drm_framebuffer *fb,

                                  int x, int y, int enter)

				  int x, int y, enum mode_set_atomic state)

{

       struct drm_device *dev = crtc->dev;

       struct radeon_device *rdev = dev->dev_private;