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.orgalistair/sunxi64-5.4-dsi
Noralf Trønnes
parent
cc43121271
commit
710ae47dc6
|
|
@ -5,15 +5,6 @@ drm/tinydrm Tiny DRM drivers
|
|||
tinydrm is a collection of DRM drivers that are so small they can fit in a
|
||||
single source file.
|
||||
|
||||
Helpers
|
||||
=======
|
||||
|
||||
.. kernel-doc:: include/drm/tinydrm/tinydrm-helpers.h
|
||||
:internal:
|
||||
|
||||
.. kernel-doc:: drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
|
||||
:export:
|
||||
|
||||
MIPI DBI Compatible Controllers
|
||||
===============================
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
obj-$(CONFIG_DRM_TINYDRM) += core/
|
||||
|
||||
# Controllers
|
||||
obj-$(CONFIG_TINYDRM_MIPI_DBI) += mipi-dbi.o
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
tinydrm-y := tinydrm-pipe.o
|
||||
|
||||
obj-$(CONFIG_DRM_TINYDRM) += tinydrm.o
|
||||
|
|
@ -1,183 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* Copyright (C) 2016 Noralf Trønnes
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_drv.h>
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_modes.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_simple_kms_helper.h>
|
||||
|
||||
struct tinydrm_connector {
|
||||
struct drm_connector base;
|
||||
struct drm_display_mode mode;
|
||||
};
|
||||
|
||||
static inline struct tinydrm_connector *
|
||||
to_tinydrm_connector(struct drm_connector *connector)
|
||||
{
|
||||
return container_of(connector, struct tinydrm_connector, base);
|
||||
}
|
||||
|
||||
static int tinydrm_connector_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct tinydrm_connector *tconn = to_tinydrm_connector(connector);
|
||||
struct drm_display_mode *mode;
|
||||
|
||||
mode = drm_mode_duplicate(connector->dev, &tconn->mode);
|
||||
if (!mode) {
|
||||
DRM_ERROR("Failed to duplicate mode\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (mode->name[0] == '\0')
|
||||
drm_mode_set_name(mode);
|
||||
|
||||
mode->type |= DRM_MODE_TYPE_PREFERRED;
|
||||
drm_mode_probed_add(connector, mode);
|
||||
|
||||
if (mode->width_mm) {
|
||||
connector->display_info.width_mm = mode->width_mm;
|
||||
connector->display_info.height_mm = mode->height_mm;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const struct drm_connector_helper_funcs tinydrm_connector_hfuncs = {
|
||||
.get_modes = tinydrm_connector_get_modes,
|
||||
};
|
||||
|
||||
static enum drm_connector_status
|
||||
tinydrm_connector_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
if (drm_dev_is_unplugged(connector->dev))
|
||||
return connector_status_disconnected;
|
||||
|
||||
return connector->status;
|
||||
}
|
||||
|
||||
static void tinydrm_connector_destroy(struct drm_connector *connector)
|
||||
{
|
||||
struct tinydrm_connector *tconn = to_tinydrm_connector(connector);
|
||||
|
||||
drm_connector_cleanup(connector);
|
||||
kfree(tconn);
|
||||
}
|
||||
|
||||
static const struct drm_connector_funcs tinydrm_connector_funcs = {
|
||||
.reset = drm_atomic_helper_connector_reset,
|
||||
.detect = tinydrm_connector_detect,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = tinydrm_connector_destroy,
|
||||
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||
};
|
||||
|
||||
struct drm_connector *
|
||||
tinydrm_connector_create(struct drm_device *drm,
|
||||
const struct drm_display_mode *mode,
|
||||
int connector_type)
|
||||
{
|
||||
struct tinydrm_connector *tconn;
|
||||
struct drm_connector *connector;
|
||||
int ret;
|
||||
|
||||
tconn = kzalloc(sizeof(*tconn), GFP_KERNEL);
|
||||
if (!tconn)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
drm_mode_copy(&tconn->mode, mode);
|
||||
connector = &tconn->base;
|
||||
|
||||
drm_connector_helper_add(connector, &tinydrm_connector_hfuncs);
|
||||
ret = drm_connector_init(drm, connector, &tinydrm_connector_funcs,
|
||||
connector_type);
|
||||
if (ret) {
|
||||
kfree(tconn);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
connector->status = connector_status_connected;
|
||||
|
||||
return connector;
|
||||
}
|
||||
|
||||
static int tinydrm_rotate_mode(struct drm_display_mode *mode,
|
||||
unsigned int rotation)
|
||||
{
|
||||
if (rotation == 0 || rotation == 180) {
|
||||
return 0;
|
||||
} else if (rotation == 90 || rotation == 270) {
|
||||
swap(mode->hdisplay, mode->vdisplay);
|
||||
swap(mode->hsync_start, mode->vsync_start);
|
||||
swap(mode->hsync_end, mode->vsync_end);
|
||||
swap(mode->htotal, mode->vtotal);
|
||||
swap(mode->width_mm, mode->height_mm);
|
||||
return 0;
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* tinydrm_display_pipe_init - Initialize display pipe
|
||||
* @drm: DRM device
|
||||
* @pipe: Display pipe
|
||||
* @funcs: Display pipe functions
|
||||
* @connector_type: Connector type
|
||||
* @formats: Array of supported formats (DRM_FORMAT\_\*)
|
||||
* @format_count: Number of elements in @formats
|
||||
* @mode: Supported mode
|
||||
* @rotation: Initial @mode rotation in degrees Counter Clock Wise
|
||||
*
|
||||
* This function sets up a &drm_simple_display_pipe with a &drm_connector that
|
||||
* has one fixed &drm_display_mode which is rotated according to @rotation.
|
||||
*
|
||||
* Returns:
|
||||
* Zero on success, negative error code on failure.
|
||||
*/
|
||||
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)
|
||||
{
|
||||
struct drm_display_mode mode_copy;
|
||||
struct drm_connector *connector;
|
||||
int ret;
|
||||
static const uint64_t modifiers[] = {
|
||||
DRM_FORMAT_MOD_LINEAR,
|
||||
DRM_FORMAT_MOD_INVALID
|
||||
};
|
||||
|
||||
drm_mode_copy(&mode_copy, mode);
|
||||
ret = tinydrm_rotate_mode(&mode_copy, rotation);
|
||||
if (ret) {
|
||||
DRM_ERROR("Illegal rotation value %u\n", rotation);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
drm->mode_config.min_width = mode_copy.hdisplay;
|
||||
drm->mode_config.max_width = mode_copy.hdisplay;
|
||||
drm->mode_config.min_height = mode_copy.vdisplay;
|
||||
drm->mode_config.max_height = mode_copy.vdisplay;
|
||||
|
||||
connector = tinydrm_connector_create(drm, &mode_copy, connector_type);
|
||||
if (IS_ERR(connector))
|
||||
return PTR_ERR(connector);
|
||||
|
||||
return drm_simple_display_pipe_init(drm, pipe, funcs, formats,
|
||||
format_count, modifiers, connector);
|
||||
}
|
||||
EXPORT_SYMBOL(tinydrm_display_pipe_init);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_modeset_helper.h>
|
||||
#include <drm/tinydrm/mipi-dbi.h>
|
||||
#include <drm/tinydrm/tinydrm-helpers.h>
|
||||
#include <video/mipi_display.h>
|
||||
|
||||
#define HX8357D_SETOSC 0xb0
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_modeset_helper.h>
|
||||
#include <drm/tinydrm/mipi-dbi.h>
|
||||
#include <drm/tinydrm/tinydrm-helpers.h>
|
||||
#include <video/mipi_display.h>
|
||||
|
||||
#define ILI9341_FRMCTR1 0xb1
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_modeset_helper.h>
|
||||
#include <drm/tinydrm/mipi-dbi.h>
|
||||
#include <drm/tinydrm/tinydrm-helpers.h>
|
||||
#include <video/mipi_display.h>
|
||||
|
||||
#define ILI9341_FRMCTR1 0xb1
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/spi/spi.h>
|
||||
|
||||
#include <drm/drm_connector.h>
|
||||
#include <drm/drm_damage_helper.h>
|
||||
#include <drm/drm_drv.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
|
|
@ -20,10 +21,11 @@
|
|||
#include <drm/drm_format_helper.h>
|
||||
#include <drm/drm_fourcc.h>
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_vblank.h>
|
||||
#include <drm/drm_modes.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_rect.h>
|
||||
#include <drm/drm_vblank.h>
|
||||
#include <drm/tinydrm/mipi-dbi.h>
|
||||
#include <drm/tinydrm/tinydrm-helpers.h>
|
||||
#include <video/mipi_display.h>
|
||||
|
||||
#define MIPI_DBI_MAX_SPI_READ_SPEED 2000000 /* 2MHz */
|
||||
|
|
@ -400,6 +402,60 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe)
|
|||
}
|
||||
EXPORT_SYMBOL(mipi_dbi_pipe_disable);
|
||||
|
||||
static int mipi_dbi_connector_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct mipi_dbi *mipi = drm_to_mipi_dbi(connector->dev);
|
||||
struct drm_display_mode *mode;
|
||||
|
||||
mode = drm_mode_duplicate(connector->dev, &mipi->mode);
|
||||
if (!mode) {
|
||||
DRM_ERROR("Failed to duplicate mode\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (mode->name[0] == '\0')
|
||||
drm_mode_set_name(mode);
|
||||
|
||||
mode->type |= DRM_MODE_TYPE_PREFERRED;
|
||||
drm_mode_probed_add(connector, mode);
|
||||
|
||||
if (mode->width_mm) {
|
||||
connector->display_info.width_mm = mode->width_mm;
|
||||
connector->display_info.height_mm = mode->height_mm;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const struct drm_connector_helper_funcs mipi_dbi_connector_hfuncs = {
|
||||
.get_modes = mipi_dbi_connector_get_modes,
|
||||
};
|
||||
|
||||
static const struct drm_connector_funcs mipi_dbi_connector_funcs = {
|
||||
.reset = drm_atomic_helper_connector_reset,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = drm_connector_cleanup,
|
||||
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||
};
|
||||
|
||||
static int mipi_dbi_rotate_mode(struct drm_display_mode *mode,
|
||||
unsigned int rotation)
|
||||
{
|
||||
if (rotation == 0 || rotation == 180) {
|
||||
return 0;
|
||||
} else if (rotation == 90 || rotation == 270) {
|
||||
swap(mode->hdisplay, mode->vdisplay);
|
||||
swap(mode->hsync_start, mode->vsync_start);
|
||||
swap(mode->hsync_end, mode->vsync_end);
|
||||
swap(mode->htotal, mode->vtotal);
|
||||
swap(mode->width_mm, mode->height_mm);
|
||||
return 0;
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
static const struct drm_mode_config_funcs mipi_dbi_mode_config_funcs = {
|
||||
.fb_create = drm_gem_fb_create_with_dirty,
|
||||
.atomic_check = drm_atomic_helper_check,
|
||||
|
|
@ -440,6 +496,10 @@ int mipi_dbi_init_with_formats(struct mipi_dbi *mipi,
|
|||
const struct drm_display_mode *mode,
|
||||
unsigned int rotation, size_t tx_buf_size)
|
||||
{
|
||||
static const uint64_t modifiers[] = {
|
||||
DRM_FORMAT_MOD_LINEAR,
|
||||
DRM_FORMAT_MOD_INVALID
|
||||
};
|
||||
struct drm_device *drm = &mipi->drm;
|
||||
int ret;
|
||||
|
||||
|
|
@ -452,16 +512,31 @@ int mipi_dbi_init_with_formats(struct mipi_dbi *mipi,
|
|||
if (!mipi->tx_buf)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = tinydrm_display_pipe_init(drm, &mipi->pipe, funcs,
|
||||
DRM_MODE_CONNECTOR_SPI,
|
||||
formats, format_count, mode,
|
||||
rotation);
|
||||
drm_mode_copy(&mipi->mode, mode);
|
||||
ret = mipi_dbi_rotate_mode(&mipi->mode, rotation);
|
||||
if (ret) {
|
||||
DRM_ERROR("Illegal rotation value %u\n", rotation);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
drm_connector_helper_add(&mipi->connector, &mipi_dbi_connector_hfuncs);
|
||||
ret = drm_connector_init(drm, &mipi->connector, &mipi_dbi_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_SPI);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = drm_simple_display_pipe_init(drm, &mipi->pipe, funcs, formats, format_count,
|
||||
modifiers, &mipi->connector);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
drm_plane_enable_fb_damage_clips(&mipi->pipe.plane);
|
||||
|
||||
drm->mode_config.funcs = &mipi_dbi_mode_config_funcs;
|
||||
drm->mode_config.min_width = mipi->mode.hdisplay;
|
||||
drm->mode_config.max_width = mipi->mode.hdisplay;
|
||||
drm->mode_config.min_height = mipi->mode.vdisplay;
|
||||
drm->mode_config.max_height = mipi->mode.vdisplay;
|
||||
mipi->rotation = rotation;
|
||||
|
||||
DRM_DEBUG_KMS("rotation = %u\n", rotation);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#include <drm/drm_gem_cma_helper.h>
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/tinydrm/mipi-dbi.h>
|
||||
#include <drm/tinydrm/tinydrm-helpers.h>
|
||||
|
||||
#define ST7735R_FRMCTR1 0xb1
|
||||
#define ST7735R_FRMCTR2 0xb2
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
Loading…
Reference in New Issue