On Sat, Oct 21, 2017 at 05:26:33PM +0530, Meghana Madhyastha wrote:
> Move the helper functions enable_backlight and disable_backlight
> from tinydrm-helpers.c to backlight.h as static inline functions so
> that they can be used by other drivers.
>
> Signed-off-by: Meghana Madhyastha <meghana.madhyastha@xxxxxxxxx>
Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> ---
> Changes in v14:
> - None
>
> drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 55 --------------------------
> drivers/gpu/drm/tinydrm/mipi-dbi.c | 5 ++-
> include/drm/tinydrm/tinydrm-helpers.h | 2 -
> include/linux/backlight.h | 30 ++++++++++++++
> 4 files changed, 33 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
> index bd6cce0..a42dee6 100644
> --- a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
> +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c
> @@ -276,61 +276,6 @@ struct backlight_device *tinydrm_of_find_backlight(struct device *dev)
> }
> EXPORT_SYMBOL(tinydrm_of_find_backlight);
>
> -/**
> - * tinydrm_enable_backlight - Enable backlight helper
> - * @backlight: Backlight device
> - *
> - * Returns:
> - * Zero on success, negative error code on failure.
> - */
> -int tinydrm_enable_backlight(struct backlight_device *backlight)
> -{
> - unsigned int old_state;
> - int ret;
> -
> - if (!backlight)
> - return 0;
> -
> - old_state = backlight->props.state;
> - backlight->props.state &= ~BL_CORE_FBBLANK;
> - DRM_DEBUG_KMS("Backlight state: 0x%x -> 0x%x\n", old_state,
> - backlight->props.state);
> -
> - ret = backlight_update_status(backlight);
> - if (ret)
> - DRM_ERROR("Failed to enable backlight %d\n", ret);
> -
> - return ret;
> -}
> -EXPORT_SYMBOL(tinydrm_enable_backlight);
> -
> -/**
> - * tinydrm_disable_backlight - Disable backlight helper
> - * @backlight: Backlight device
> - *
> - * Returns:
> - * Zero on success, negative error code on failure.
> - */
> -int tinydrm_disable_backlight(struct backlight_device *backlight)
> -{
> - unsigned int old_state;
> - int ret;
> -
> - if (!backlight)
> - return 0;
> -
> - old_state = backlight->props.state;
> - backlight->props.state |= BL_CORE_FBBLANK;
> - DRM_DEBUG_KMS("Backlight state: 0x%x -> 0x%x\n", old_state,
> - backlight->props.state);
> - ret = backlight_update_status(backlight);
> - if (ret)
> - DRM_ERROR("Failed to disable backlight %d\n", ret);
> -
> - return ret;
> -}
> -EXPORT_SYMBOL(tinydrm_disable_backlight);
> -
> #if IS_ENABLED(CONFIG_SPI)
>
> /**
> diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
> index d43e992..2561549 100644
> --- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
> +++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
> @@ -12,6 +12,7 @@
> #include <drm/drm_gem_framebuffer_helper.h>
> #include <drm/tinydrm/mipi-dbi.h>
> #include <drm/tinydrm/tinydrm-helpers.h>
> +#include <linux/backlight.h>
> #include <linux/debugfs.h>
> #include <linux/dma-buf.h>
> #include <linux/gpio/consumer.h>
> @@ -280,7 +281,7 @@ void mipi_dbi_pipe_enable(struct drm_simple_display_pipe *pipe,
> if (fb)
> fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);
>
> - tinydrm_enable_backlight(mipi->backlight);
> + backlight_enable(mipi->backlight);
> }
> EXPORT_SYMBOL(mipi_dbi_pipe_enable);
>
> @@ -319,7 +320,7 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe)
> mipi->enabled = false;
>
> if (mipi->backlight)
> - tinydrm_disable_backlight(mipi->backlight);
> + backlight_disable(mipi->backlight);
> else
> mipi_dbi_blank(mipi);
> }
> diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h
> index d554ded..f54fae0 100644
> --- a/include/drm/tinydrm/tinydrm-helpers.h
> +++ b/include/drm/tinydrm/tinydrm-helpers.h
> @@ -47,8 +47,6 @@ void tinydrm_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
> struct drm_clip_rect *clip);
>
> struct backlight_device *tinydrm_of_find_backlight(struct device *dev);
> -int tinydrm_enable_backlight(struct backlight_device *backlight);
> -int tinydrm_disable_backlight(struct backlight_device *backlight);
>
> size_t tinydrm_spi_max_transfer_size(struct spi_device *spi, size_t max_len);
> bool tinydrm_spi_bpw_supported(struct spi_device *spi, u8 bpw);
> diff --git a/include/linux/backlight.h b/include/linux/backlight.h
> index 5f2fd61..b88fabb 100644
> --- a/include/linux/backlight.h
> +++ b/include/linux/backlight.h
> @@ -129,6 +129,36 @@ static inline int backlight_update_status(struct backlight_device *bd)
> return ret;
> }
>
> +/**
> + * backlight_enable - Enable backlight
> + * @bd: the backlight device to enable
> + */
> +static inline int backlight_enable(struct backlight_device *bd)
> +{
> + if (!bd)
> + return 0;
> +
> + bd->props.power = FB_BLANK_UNBLANK;
> + bd->props.state &= ~BL_CORE_FBBLANK;
> +
> + return backlight_update_status(bd);
> +}
> +
> +/**
> + * backlight_disable - Disable backlight
> + * @bd: the backlight device to disable
> + */
> +static inline int backlight_disable(struct backlight_device *bd)
> +{
> + if (!bd)
> + return 0;
> +
> + bd->props.power = FB_BLANK_POWERDOWN;
> + bd->props.state |= BL_CORE_FBBLANK;
> +
> + return backlight_update_status(bd);
> +}
> +
> extern struct backlight_device *backlight_device_register(const char *name,
> struct device *dev, void *devdata, const struct backlight_ops *ops,
> const struct backlight_properties *props);
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@xxxxxxxxxxxxxxxx.
> To post to this group, send email to outreachy-kernel@xxxxxxxxxxxxxxxx.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/203e216d74645b795687a29786c97209d1785167.1508586429.git.meghana.madhyastha%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
