diff options
| author |   Noralf Trønnes <noralf@tronnes.org> | 2019-07-19 17:59:16 +0200 |
|---|---|---|
| committer | Noralf Trønnes <noralf@tronnes.org> | 2019-07-23 15:50:46 +0200 |
| commit | 710ae47dc6cb11f11a3007f7ade7d937804e160d (patch) | |
| tree | 042a3f3174406c67b0c6c7ad34aa4bdbb0e57fc3 /include/drm | |
| parent | drm/tinydrm/mipi-dbi: Add mipi_dbi_init_with_formats() (diff) | |
| download | linux-dev-710ae47dc6cb11f11a3007f7ade7d937804e160d.tar.xz linux-dev-710ae47dc6cb11f11a3007f7ade7d937804e160d.zip | |
drm/tinydrm: Move tinydrm_display_pipe_init() to mipi-dbi
tinydrm_display_pipe_init() has only one user now, so move it to mipi-dbi.
Changes:
- Remove drm_connector_helper_funcs.detect, it's always connected.
- Store the connector and mode in mipi_dbi instead of it's own struct.
Otherwise remove some leftover tinydrm-helpers.h inclusions.
Cc: Eric Anholt <eric@anholt.net>
Cc: David Lechner <david@lechnology.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190719155916.62465-12-noralf@tronnes.org
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/tinydrm/mipi-dbi.h | 10 | ||||
| -rw-r--r-- | include/drm/tinydrm/tinydrm-helpers.h | 27 |
2 files changed, 10 insertions, 27 deletions
diff --git a/include/drm/tinydrm/mipi-dbi.h b/include/drm/tinydrm/mipi-dbi.h index c4b04789bf84..393323f87e12 100644 --- a/include/drm/tinydrm/mipi-dbi.h +++ b/include/drm/tinydrm/mipi-dbi.h @@ -46,6 +46,16 @@ struct mipi_dbi { */ struct drm_simple_display_pipe pipe; + /** + * @connector: Connector + */ + struct drm_connector connector; + + /** + * @mode: Fixed display mode + */ + struct drm_display_mode mode; + struct spi_device *spi; bool enabled; struct mutex cmdlock; diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h deleted file mode 100644 index 0e7470771c5e..000000000000 --- a/include/drm/tinydrm/tinydrm-helpers.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2016 Noralf Trønnes - */ - -#ifndef __LINUX_TINYDRM_HELPERS_H -#define __LINUX_TINYDRM_HELPERS_H - -struct backlight_device; -struct drm_device; -struct drm_display_mode; -struct drm_framebuffer; -struct drm_rect; -struct drm_simple_display_pipe; -struct drm_simple_display_pipe_funcs; -struct device; - -int tinydrm_display_pipe_init(struct drm_device *drm, - struct drm_simple_display_pipe *pipe, - const struct drm_simple_display_pipe_funcs *funcs, - int connector_type, - const uint32_t *formats, - unsigned int format_count, - const struct drm_display_mode *mode, - unsigned int rotation); - -#endif /* __LINUX_TINYDRM_HELPERS_H */ |