1a2703bd73
Currently, the DSI host blocks binding the display pipeline until the
panel is available. This unnecessarily prevents other display outpus
from working, and adds logspam to dmesg when the panel driver is built
as a module (the component master is unsuccessfully brought up several
times during boot).
Flip the dependency, instead requiring the host to be bound before the
panel is attached. The panel driver provides no functionality outside of
the display pipeline anyway.
Since the panel is now probed after the DRM connector, we need a hotplug
event to turn on the connector after the panel is attached.
This has the added benefit of fixing panel module removal/insertion.
Previously, the panel would be turned off when its module was removed.
But because the connector state was hardcoded, nothing knew to turn the
panel back on when it was re-attached. Now, with hotplug events
available, the connector state will follow the panel module state, and
the panel will be re-enabled properly.
Fixes: 133add5b5a ("drm/sun4i: Add Allwinner A31 MIPI-DSI controller support")
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200211072858.30784-3-samuel@sholland.org
52 lines
1.2 KiB
C
52 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2016 Allwinnertech Co., Ltd.
|
|
* Copyright (C) 2017-2018 Bootlin
|
|
*
|
|
* Maxime Ripard <maxime.ripard@bootlin.com>
|
|
*/
|
|
|
|
#ifndef _SUN6I_MIPI_DSI_H_
|
|
#define _SUN6I_MIPI_DSI_H_
|
|
|
|
#include <drm/drm_connector.h>
|
|
#include <drm/drm_encoder.h>
|
|
#include <drm/drm_mipi_dsi.h>
|
|
|
|
#define SUN6I_DSI_TCON_DIV 4
|
|
|
|
struct sun6i_dsi {
|
|
struct drm_connector connector;
|
|
struct drm_encoder encoder;
|
|
struct mipi_dsi_host host;
|
|
|
|
struct clk *bus_clk;
|
|
struct clk *mod_clk;
|
|
struct regmap *regs;
|
|
struct regulator *regulator;
|
|
struct reset_control *reset;
|
|
struct phy *dphy;
|
|
|
|
struct device *dev;
|
|
struct mipi_dsi_device *device;
|
|
struct drm_device *drm;
|
|
struct drm_panel *panel;
|
|
};
|
|
|
|
static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host)
|
|
{
|
|
return container_of(host, struct sun6i_dsi, host);
|
|
};
|
|
|
|
static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector)
|
|
{
|
|
return container_of(connector, struct sun6i_dsi, connector);
|
|
};
|
|
|
|
static inline struct sun6i_dsi *encoder_to_sun6i_dsi(const struct drm_encoder *encoder)
|
|
{
|
|
return container_of(encoder, struct sun6i_dsi, encoder);
|
|
};
|
|
|
|
#endif /* _SUN6I_MIPI_DSI_H_ */
|