Commit 21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7

Authored by Jason Wessel
Committed by Dave Airlie
1 parent 99231028ff

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

The enter argument as implemented by commit 413d45d3627 (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: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
CC: David Airlie <airlied@linux.ie>
CC: dri-devel@lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied@redhat.com>

Showing 8 changed files with 21 additions and 13 deletions Side-by-side Diff

drivers/gpu/drm/drm_fb_helper.c
... ... @@ -289,8 +289,7 @@
289 289 mode_set->fb,
290 290 mode_set->x,
291 291 mode_set->y,
292   - 1);
293   -
  292 + ENTER_ATOMIC_MODE_SET);
294 293 }
295 294 }
296 295  
... ... @@ -336,7 +335,7 @@
336 335  
337 336 drm_fb_helper_restore_lut_atomic(mode_set->crtc);
338 337 funcs->mode_set_base_atomic(mode_set->crtc, fb, crtc->x,
339   - crtc->y, 0);
  338 + crtc->y, LEAVE_ATOMIC_MODE_SET);
340 339 }
341 340  
342 341 return 0;
drivers/gpu/drm/i915/intel_display.c
... ... @@ -1492,7 +1492,7 @@
1492 1492 /* Assume fb object is pinned & idle & fenced and just update base pointers */
1493 1493 static int
1494 1494 intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,
1495   - int x, int y, int enter)
  1495 + int x, int y, enum mode_set_atomic state)
1496 1496 {
1497 1497 struct drm_device *dev = crtc->dev;
1498 1498 struct drm_i915_private *dev_priv = dev->dev_private;
... ... @@ -1614,7 +1614,8 @@
1614 1614 atomic_read(&obj_priv->pending_flip) == 0);
1615 1615 }
1616 1616  
1617   - ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, 0);
  1617 + ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y,
  1618 + LEAVE_ATOMIC_MODE_SET);
1618 1619 if (ret) {
1619 1620 i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj);
1620 1621 mutex_unlock(&dev->struct_mutex);
drivers/gpu/drm/nouveau/nv04_crtc.c
... ... @@ -860,12 +860,12 @@
860 860 static int
861 861 nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc,
862 862 struct drm_framebuffer *fb,
863   - int x, int y, int enter)
  863 + int x, int y, enum mode_set_atomic state)
864 864 {
865 865 struct drm_nouveau_private *dev_priv = crtc->dev->dev_private;
866 866 struct drm_device *dev = dev_priv->dev;
867 867  
868   - if (enter)
  868 + if (state == ENTER_ATOMIC_MODE_SET)
869 869 nouveau_fbcon_save_disable_accel(dev);
870 870 else
871 871 nouveau_fbcon_restore_accel(dev);
drivers/gpu/drm/nouveau/nv50_crtc.c
... ... @@ -708,7 +708,7 @@
708 708 static int
709 709 nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc,
710 710 struct drm_framebuffer *fb,
711   - int x, int y, int enter)
  711 + int x, int y, enum mode_set_atomic state)
712 712 {
713 713 return nv50_crtc_do_mode_set_base(crtc, fb, x, y, true, true);
714 714 }
drivers/gpu/drm/radeon/atombios_crtc.c
... ... @@ -1270,7 +1270,7 @@
1270 1270  
1271 1271 int atombios_crtc_set_base_atomic(struct drm_crtc *crtc,
1272 1272 struct drm_framebuffer *fb,
1273   - int x, int y, int enter)
  1273 + int x, int y, enum mode_set_atomic state)
1274 1274 {
1275 1275 struct drm_device *dev = crtc->dev;
1276 1276 struct radeon_device *rdev = dev->dev_private;
drivers/gpu/drm/radeon/radeon_legacy_crtc.c
... ... @@ -353,7 +353,7 @@
353 353  
354 354 int radeon_crtc_set_base_atomic(struct drm_crtc *crtc,
355 355 struct drm_framebuffer *fb,
356   - int x, int y, int enter)
  356 + int x, int y, enum mode_set_atomic state)
357 357 {
358 358 return radeon_crtc_do_set_base(crtc, fb, x, y, 1);
359 359 }
drivers/gpu/drm/radeon/radeon_mode.h
... ... @@ -35,6 +35,7 @@
35 35 #include <drm_edid.h>
36 36 #include <drm_dp_helper.h>
37 37 #include <drm_fixed.h>
  38 +#include <drm_crtc_helper.h>
38 39 #include <linux/i2c.h>
39 40 #include <linux/i2c-id.h>
40 41 #include <linux/i2c-algo-bit.h>
... ... @@ -526,7 +527,8 @@
526 527 struct drm_framebuffer *old_fb);
527 528 extern int atombios_crtc_set_base_atomic(struct drm_crtc *crtc,
528 529 struct drm_framebuffer *fb,
529   - int x, int y, int enter);
  530 + int x, int y,
  531 + enum mode_set_atomic state);
530 532 extern int atombios_crtc_mode_set(struct drm_crtc *crtc,
531 533 struct drm_display_mode *mode,
532 534 struct drm_display_mode *adjusted_mode,
... ... @@ -538,7 +540,8 @@
538 540 struct drm_framebuffer *old_fb);
539 541 extern int radeon_crtc_set_base_atomic(struct drm_crtc *crtc,
540 542 struct drm_framebuffer *fb,
541   - int x, int y, int enter);
  543 + int x, int y,
  544 + enum mode_set_atomic state);
542 545 extern int radeon_crtc_do_set_base(struct drm_crtc *crtc,
543 546 struct drm_framebuffer *fb,
544 547 int x, int y, int atomic);
include/drm/drm_crtc_helper.h
... ... @@ -39,6 +39,11 @@
39 39  
40 40 #include <linux/fb.h>
41 41  
  42 +enum mode_set_atomic {
  43 + LEAVE_ATOMIC_MODE_SET,
  44 + ENTER_ATOMIC_MODE_SET,
  45 +};
  46 +
42 47 struct drm_crtc_helper_funcs {
43 48 /*
44 49 * Control power levels on the CRTC. If the mode passed in is
... ... @@ -62,7 +67,7 @@
62 67 struct drm_framebuffer *old_fb);
63 68 int (*mode_set_base_atomic)(struct drm_crtc *crtc,
64 69 struct drm_framebuffer *fb, int x, int y,
65   - int is_enter);
  70 + enum mode_set_atomic);
66 71  
67 72 /* reload the current crtc LUT */
68 73 void (*load_lut)(struct drm_crtc *crtc);