On Tue, Aug 9, 2016 at 9:41 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
> They're only used internally within the dp helpers. Also nuke the
> kerneldoc (we only document the driver interface in the drm shared
> functions). And move the header file from the public include/
> directory to the source files into drm_crtc_helper_internal.h, similar
> to how we already have drm_crtc_internal.h.
>
> While at it also move drm_fb_helper_modinit since that belongs in
> there, too.
>
> I noticed this all since I spotted kerneldoc which wasn't pulled into
> the rst templates.
>
> Cc: Rafael Antognolli <rafael.antognolli@xxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_crtc_helper_internal.h | 58 ++++++++++++++++++++++++++++
> drivers/gpu/drm/drm_dp_aux_dev.c | 19 ++-------
> drivers/gpu/drm/drm_dp_helper.c | 3 +-
> drivers/gpu/drm/drm_kms_helper_common.c | 3 +-
> include/drm/drm_dp_aux_dev.h | 62 ------------------------------
> include/drm/drm_fb_helper.h | 1 -
> 6 files changed, 65 insertions(+), 81 deletions(-)
> create mode 100644 drivers/gpu/drm/drm_crtc_helper_internal.h
> delete mode 100644 include/drm/drm_dp_aux_dev.h
>
> diff --git a/drivers/gpu/drm/drm_crtc_helper_internal.h b/drivers/gpu/drm/drm_crtc_helper_internal.h
> new file mode 100644
> index 000000000000..1ef004f9dffc
> --- /dev/null
> +++ b/drivers/gpu/drm/drm_crtc_helper_internal.h
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright © 2015 Intel Corporation
2016?
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/*
> + * This header file contains mode setting related functions and definitions
> + * which are only used within the drm kms helper module as internal
> + * implementation details and are not exported to drivers.
> + */
> +
> +#include <drm/drm_dp_helper.h>
> +
> +/* drm_fb_helper.c */
> +int drm_fb_helper_modinit(void);
> +
> +/* drm_dp_aux_dev.c */
> +#ifdef CONFIG_DRM_DP_AUX_CHARDEV
> +int drm_dp_aux_dev_init(void);
> +void drm_dp_aux_dev_exit(void);
> +int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
> +void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux);
> +#else
> +static inline int drm_dp_aux_dev_init(void)
> +{
> + return 0;
> +}
> +
> +static inline void drm_dp_aux_dev_exit(void)
> +{
> +}
> +
> +static inline int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
> +{
> + return 0;
> +}
> +
> +static inline void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
> +{
> +}
> +#endif
> diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c
> index 734f86a345f6..ec1ed94b2390 100644
> --- a/drivers/gpu/drm/drm_dp_aux_dev.c
> +++ b/drivers/gpu/drm/drm_dp_aux_dev.c
> @@ -36,6 +36,8 @@
> #include <drm/drm_crtc.h>
> #include <drm/drmP.h>
>
> +#include "drm_crtc_helper_internal.h"
> +
> struct drm_dp_aux_dev {
> unsigned index;
> struct drm_dp_aux *aux;
> @@ -283,12 +285,7 @@ static int auxdev_wait_atomic_t(atomic_t *p)
> schedule();
> return 0;
> }
> -/**
> - * drm_dp_aux_unregister_devnode() - unregister a devnode for this aux channel
> - * @aux: DisplayPort AUX channel
> - *
> - * Returns 0 on success or a negative error code on failure.
> - */
> +
> void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
> {
> struct drm_dp_aux_dev *aux_dev;
> @@ -314,14 +311,7 @@ void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
> DRM_DEBUG("drm_dp_aux_dev: aux [%s] unregistering\n", aux->name);
> kref_put(&aux_dev->refcount, release_drm_dp_aux_dev);
> }
> -EXPORT_SYMBOL(drm_dp_aux_unregister_devnode);
>
> -/**
> - * drm_dp_aux_register_devnode() - register a devnode for this aux channel
> - * @aux: DisplayPort AUX channel
> - *
> - * Returns 0 on success or a negative error code on failure.
> - */
> int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
> {
> struct drm_dp_aux_dev *aux_dev;
> @@ -347,7 +337,6 @@ error:
> drm_dp_aux_unregister_devnode(aux);
> return res;
> }
> -EXPORT_SYMBOL(drm_dp_aux_register_devnode);
>
> int drm_dp_aux_dev_init(void)
> {
> @@ -369,11 +358,9 @@ out:
> class_destroy(drm_dp_aux_dev_class);
> return res;
> }
> -EXPORT_SYMBOL(drm_dp_aux_dev_init);
>
> void drm_dp_aux_dev_exit(void)
> {
> unregister_chrdev(drm_dev_major, "aux");
> class_destroy(drm_dp_aux_dev_class);
> }
> -EXPORT_SYMBOL(drm_dp_aux_dev_exit);
> diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
> index eae5ef963cb7..23537175ce48 100644
> --- a/drivers/gpu/drm/drm_dp_helper.c
> +++ b/drivers/gpu/drm/drm_dp_helper.c
> @@ -28,9 +28,10 @@
> #include <linux/sched.h>
> #include <linux/i2c.h>
> #include <drm/drm_dp_helper.h>
> -#include <drm/drm_dp_aux_dev.h>
> #include <drm/drmP.h>
>
> +#include "drm_crtc_helper_internal.h"
> +
> /**
> * DOC: dp helpers
> *
> diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c
> index 3187c4bb01cb..45db36cd3d20 100644
> --- a/drivers/gpu/drm/drm_kms_helper_common.c
> +++ b/drivers/gpu/drm/drm_kms_helper_common.c
> @@ -27,7 +27,8 @@
>
> #include <drm/drmP.h>
> #include <drm/drm_fb_helper.h>
> -#include <drm/drm_dp_aux_dev.h>
> +
> +#include "drm_crtc_helper_internal.h"
>
> MODULE_AUTHOR("David Airlie, Jesse Barnes");
> MODULE_DESCRIPTION("DRM KMS helper");
> diff --git a/include/drm/drm_dp_aux_dev.h b/include/drm/drm_dp_aux_dev.h
> deleted file mode 100644
> index 1b76d990d8ab..000000000000
> --- a/include/drm/drm_dp_aux_dev.h
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -/*
> - * Copyright © 2015 Intel Corporation
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> - * IN THE SOFTWARE.
> - *
> - * Authors:
> - * Rafael Antognolli <rafael.antognolli@xxxxxxxxx>
> - *
> - */
> -
> -#ifndef DRM_DP_AUX_DEV
> -#define DRM_DP_AUX_DEV
> -
> -#include <drm/drm_dp_helper.h>
> -
> -#ifdef CONFIG_DRM_DP_AUX_CHARDEV
> -
> -int drm_dp_aux_dev_init(void);
> -void drm_dp_aux_dev_exit(void);
> -int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
> -void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux);
> -
> -#else
> -
> -static inline int drm_dp_aux_dev_init(void)
> -{
> - return 0;
> -}
> -
> -static inline void drm_dp_aux_dev_exit(void)
> -{
> -}
> -
> -static inline int drm_dp_aux_register_devnode(struct drm_dp_aux *aux)
> -{
> - return 0;
> -}
> -
> -static inline void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)
> -{
> -}
> -
> -#endif
> -
> -#endif
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index db8d4780eaa2..504124363088 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -215,7 +215,6 @@ struct drm_fb_helper {
> };
>
> #ifdef CONFIG_DRM_FBDEV_EMULATION
> -int drm_fb_helper_modinit(void);
> void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,
> const struct drm_fb_helper_funcs *funcs);
> int drm_fb_helper_init(struct drm_device *dev,
> --
> 2.8.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
