Merge tag 'linux-kselftest-next-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux.git] / drivers / gpu / drm / drm_atomic_uapi.c

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index 268bb69c2e2f52eb8d69467ba3a8d508e05b7706..7e48d40600fffddf29ab2aea69941e46edfc3851 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -2,6 +2,7 @@
  * Copyright (C) 2014 Red Hat
  * Copyright (C) 2014 Intel Corp.
  * Copyright (C) 2018 Intel Corp.
  * Copyright (C) 2014 Red Hat
  * Copyright (C) 2014 Intel Corp.
  * Copyright (C) 2018 Intel Corp.

+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.

  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),


@@ -78,8 +79,8 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,
                drm_mode_convert_to_umode(&umode, mode);
                state->mode_blob =
                        drm_property_create_blob(state->crtc->dev,
                drm_mode_convert_to_umode(&umode, mode);
                state->mode_blob =
                        drm_property_create_blob(state->crtc->dev,

-                                                sizeof(umode),
-                                                &umode);
+                                                sizeof(umode),
+                                                &umode);

                if (IS_ERR(state->mode_blob))
                        return PTR_ERR(state->mode_blob);
 
                if (IS_ERR(state->mode_blob))
                        return PTR_ERR(state->mode_blob);
 


@@ -114,7 +115,7 @@ EXPORT_SYMBOL(drm_atomic_set_mode_for_crtc);
  * Zero on success, error code on failure. Cannot return -EDEADLK.
  */
 int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
  * Zero on success, error code on failure. Cannot return -EDEADLK.
  */
 int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,

-                                      struct drm_property_blob *blob)
+                                     struct drm_property_blob *blob)

 {
        struct drm_crtc *crtc = state->crtc;
 
 {
        struct drm_crtc *crtc = state->crtc;
 


@@ -1321,6 +1322,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
        struct drm_out_fence_state *fence_state;
        int ret = 0;
        unsigned int i, j, num_fences;
        struct drm_out_fence_state *fence_state;
        int ret = 0;
        unsigned int i, j, num_fences;

+       struct drm_printer p = drm_info_printer(dev->dev);

 
        /* disallow for drivers not supporting atomic: */
        if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
 
        /* disallow for drivers not supporting atomic: */
        if (!drm_core_check_feature(dev, DRIVER_ATOMIC))


@@ -1453,7 +1455,7 @@ retry:
                ret = drm_atomic_nonblocking_commit(state);
        } else {
                if (drm_debug_enabled(DRM_UT_STATE))
                ret = drm_atomic_nonblocking_commit(state);
        } else {
                if (drm_debug_enabled(DRM_UT_STATE))

-                       drm_atomic_print_state(state);
+                       drm_atomic_print_new_state(state, &p);

 
                ret = drm_atomic_commit(state);
        }
 
                ret = drm_atomic_commit(state);
        }