mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-18 08:35:08 +08:00
Mediatek DRM Next for Linux 5.13
1. Fine tune the line time for EOTp. 2. Add support mt8192 dpi. 3. Make crtc config-updating atomic. 4. Don't support hdmi connector creation. -----BEGIN PGP SIGNATURE----- iQJMBAABCgA2FiEEACwLKSDmq+9RDv5P4cpzo8lZTiQFAmBqxRIYHGNodW5rdWFu Zy5odUBrZXJuZWwub3JnAAoJEOHKc6PJWU4kWdEQAIZPQks9r5kWnRQJoh4EiiqU vupem3HbmGk2dtmJhZVr2URgmWCFeFPJ8sImN7qmECgBlGUH+0DW26+o3/nWUSjl 6wCWGl7RSPigsvoVkuJHKFnQMJTVAuaPjF77rs/TyExBxIk5vIwDvxOTCRaairyT j90V78Wjx3EtSfTgw/RY3MSaLWmBN48VENRiQepM5AahG+DS3wg/eYsW6yNd0aM5 utxyhkH+25donMr+Dhs6XbqN+c5b90AiL+YdXh4oOZfncds9+FIwJ6/n8RHImBoE gRo02AjewHjwcg60xcbn+hzH5ezoqUxjSbv5OH8IRd2IN03LYpQRzBEr2+Qijm5I zO1Yg9n9pF8VAKXj60n1PMxfd6yRPAFYRHMKgotSwI5APSOA7oe6bNmK3JuL0XEy SgvFXXe9OSqFbu+ZSXWuX/CCLfUH94adAMs9UJTLMHVxCGdiBvppdKAV/kkrIs7z qLI/697ZMbszYZzw2OBzCY5DKEEPgs9rcH4VfZiwr4n+bvOO2+PLxy3Avg+/kVJv gsfMjM5kU/HUvmPkXULvmEYl3ED2G6YOlNU6WhYyHw7sc/epYv4iCt7bL5EHIwcF Om6vxIASWctSZoig71p7r+OvymfHDY/s+u/oWwQXTwOjBn0aVCLqP4JWTag5pYB1 RmiKV3Ch0iyuWEP2Xw/H =VClB -----END PGP SIGNATURE----- Merge tag 'mediatek-drm-next-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next Mediatek DRM Next for Linux 5.13 1. Fine tune the line time for EOTp. 2. Add support mt8192 dpi. 3. Make crtc config-updating atomic. 4. Don't support hdmi connector creation. From: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210405082248.3578-1-chunkuang.hu@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
commit
0c7997179a
@ -22,6 +22,7 @@ properties:
|
||||
- mediatek,mt7623-dpi
|
||||
- mediatek,mt8173-dpi
|
||||
- mediatek,mt8183-dpi
|
||||
- mediatek,mt8192-dpi
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
@ -50,15 +51,10 @@ properties:
|
||||
- const: sleep
|
||||
|
||||
port:
|
||||
type: object
|
||||
$ref: /schemas/graph.yaml#/properties/port
|
||||
description:
|
||||
Output port node with endpoint definitions as described in
|
||||
Documentation/devicetree/bindings/graph.txt. This port should be connected
|
||||
to the input port of an attached HDMI or LVDS encoder chip.
|
||||
|
||||
properties:
|
||||
endpoint:
|
||||
type: object
|
||||
Output port node. This port should be connected to the input port of an
|
||||
attached HDMI or LVDS encoder chip.
|
||||
|
||||
required:
|
||||
- compatible
|
||||
|
||||
@ -5978,6 +5978,7 @@ DRM DRIVERS FOR MEDIATEK
|
||||
M: Chun-Kuang Hu <chunkuang.hu@kernel.org>
|
||||
M: Philipp Zabel <p.zabel@pengutronix.de>
|
||||
L: dri-devel@lists.freedesktop.org
|
||||
L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
|
||||
S: Supported
|
||||
F: Documentation/devicetree/bindings/display/mediatek/
|
||||
F: drivers/gpu/drm/mediatek/
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
@ -208,10 +209,8 @@ static int mtk_cec_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
cec->irq = platform_get_irq(pdev, 0);
|
||||
if (cec->irq < 0) {
|
||||
dev_err(dev, "Failed to get cec irq: %d\n", cec->irq);
|
||||
if (cec->irq < 0)
|
||||
return cec->irq;
|
||||
}
|
||||
|
||||
ret = devm_request_threaded_irq(dev, cec->irq, NULL,
|
||||
mtk_cec_htplg_isr_thread,
|
||||
@ -247,6 +246,7 @@ static const struct of_device_id mtk_cec_of_ids[] = {
|
||||
{ .compatible = "mediatek,mt8173-cec", },
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mtk_cec_of_ids);
|
||||
|
||||
struct platform_driver mtk_cec_driver = {
|
||||
.probe = mtk_cec_probe,
|
||||
|
||||
@ -120,6 +120,7 @@ struct mtk_dpi_yc_limit {
|
||||
struct mtk_dpi_conf {
|
||||
unsigned int (*cal_factor)(int clock);
|
||||
u32 reg_h_fre_con;
|
||||
u32 max_clock_khz;
|
||||
bool edge_sel_en;
|
||||
};
|
||||
|
||||
@ -557,9 +558,23 @@ static void mtk_dpi_bridge_enable(struct drm_bridge *bridge)
|
||||
mtk_dpi_set_display_mode(dpi, &dpi->mode);
|
||||
}
|
||||
|
||||
static enum drm_mode_status
|
||||
mtk_dpi_bridge_mode_valid(struct drm_bridge *bridge,
|
||||
const struct drm_display_info *info,
|
||||
const struct drm_display_mode *mode)
|
||||
{
|
||||
struct mtk_dpi *dpi = bridge_to_dpi(bridge);
|
||||
|
||||
if (mode->clock > dpi->conf->max_clock_khz)
|
||||
return MODE_CLOCK_HIGH;
|
||||
|
||||
return MODE_OK;
|
||||
}
|
||||
|
||||
static const struct drm_bridge_funcs mtk_dpi_bridge_funcs = {
|
||||
.attach = mtk_dpi_bridge_attach,
|
||||
.mode_set = mtk_dpi_bridge_mode_set,
|
||||
.mode_valid = mtk_dpi_bridge_mode_valid,
|
||||
.disable = mtk_dpi_bridge_disable,
|
||||
.enable = mtk_dpi_bridge_enable,
|
||||
};
|
||||
@ -668,17 +683,26 @@ static unsigned int mt8183_calculate_factor(int clock)
|
||||
static const struct mtk_dpi_conf mt8173_conf = {
|
||||
.cal_factor = mt8173_calculate_factor,
|
||||
.reg_h_fre_con = 0xe0,
|
||||
.max_clock_khz = 300000,
|
||||
};
|
||||
|
||||
static const struct mtk_dpi_conf mt2701_conf = {
|
||||
.cal_factor = mt2701_calculate_factor,
|
||||
.reg_h_fre_con = 0xb0,
|
||||
.edge_sel_en = true,
|
||||
.max_clock_khz = 150000,
|
||||
};
|
||||
|
||||
static const struct mtk_dpi_conf mt8183_conf = {
|
||||
.cal_factor = mt8183_calculate_factor,
|
||||
.reg_h_fre_con = 0xe0,
|
||||
.max_clock_khz = 100000,
|
||||
};
|
||||
|
||||
static const struct mtk_dpi_conf mt8192_conf = {
|
||||
.cal_factor = mt8183_calculate_factor,
|
||||
.reg_h_fre_con = 0xe0,
|
||||
.max_clock_khz = 150000,
|
||||
};
|
||||
|
||||
static int mtk_dpi_probe(struct platform_device *pdev)
|
||||
@ -751,10 +775,8 @@ static int mtk_dpi_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
dpi->irq = platform_get_irq(pdev, 0);
|
||||
if (dpi->irq <= 0) {
|
||||
dev_err(dev, "Failed to get irq: %d\n", dpi->irq);
|
||||
if (dpi->irq <= 0)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
|
||||
NULL, &dpi->next_bridge);
|
||||
@ -801,8 +823,12 @@ static const struct of_device_id mtk_dpi_of_ids[] = {
|
||||
{ .compatible = "mediatek,mt8183-dpi",
|
||||
.data = &mt8183_conf,
|
||||
},
|
||||
{ .compatible = "mediatek,mt8192-dpi",
|
||||
.data = &mt8192_conf,
|
||||
},
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);
|
||||
|
||||
struct platform_driver mtk_dpi_driver = {
|
||||
.probe = mtk_dpi_probe,
|
||||
|
||||
@ -61,6 +61,7 @@ struct mtk_drm_crtc {
|
||||
|
||||
/* lock for display hardware access */
|
||||
struct mutex hw_lock;
|
||||
bool config_updating;
|
||||
};
|
||||
|
||||
struct mtk_crtc_state {
|
||||
@ -97,7 +98,7 @@ static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
|
||||
static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
|
||||
{
|
||||
drm_crtc_handle_vblank(&mtk_crtc->base);
|
||||
if (mtk_crtc->pending_needs_vblank) {
|
||||
if (!mtk_crtc->config_updating && mtk_crtc->pending_needs_vblank) {
|
||||
mtk_drm_crtc_finish_page_flip(mtk_crtc);
|
||||
mtk_crtc->pending_needs_vblank = false;
|
||||
}
|
||||
@ -425,7 +426,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc,
|
||||
}
|
||||
}
|
||||
|
||||
static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc)
|
||||
static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
|
||||
bool needs_vblank)
|
||||
{
|
||||
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
|
||||
struct cmdq_pkt *cmdq_handle;
|
||||
@ -436,6 +438,10 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc)
|
||||
int i;
|
||||
|
||||
mutex_lock(&mtk_crtc->hw_lock);
|
||||
mtk_crtc->config_updating = true;
|
||||
if (needs_vblank)
|
||||
mtk_crtc->pending_needs_vblank = true;
|
||||
|
||||
for (i = 0; i < mtk_crtc->layer_nr; i++) {
|
||||
struct drm_plane *plane = &mtk_crtc->planes[i];
|
||||
struct mtk_plane_state *plane_state;
|
||||
@ -472,6 +478,7 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc)
|
||||
cmdq_pkt_flush_async(cmdq_handle, ddp_cmdq_cb, cmdq_handle);
|
||||
}
|
||||
#endif
|
||||
mtk_crtc->config_updating = false;
|
||||
mutex_unlock(&mtk_crtc->hw_lock);
|
||||
}
|
||||
|
||||
@ -532,7 +539,7 @@ void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
|
||||
return;
|
||||
|
||||
plane_helper_funcs->atomic_update(plane, state);
|
||||
mtk_drm_crtc_hw_config(mtk_crtc);
|
||||
mtk_drm_crtc_update_config(mtk_crtc, false);
|
||||
}
|
||||
|
||||
static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
|
||||
@ -582,7 +589,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
|
||||
}
|
||||
mtk_crtc->pending_planes = true;
|
||||
|
||||
mtk_drm_crtc_hw_config(mtk_crtc);
|
||||
mtk_drm_crtc_update_config(mtk_crtc, false);
|
||||
/* Wait for planes to be disabled */
|
||||
drm_crtc_wait_one_vblank(crtc);
|
||||
|
||||
@ -618,14 +625,12 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
|
||||
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
|
||||
int i;
|
||||
|
||||
if (mtk_crtc->event)
|
||||
mtk_crtc->pending_needs_vblank = true;
|
||||
if (crtc->state->color_mgmt_changed)
|
||||
for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
|
||||
mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc->state);
|
||||
mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc->state);
|
||||
}
|
||||
mtk_drm_crtc_hw_config(mtk_crtc);
|
||||
mtk_drm_crtc_update_config(mtk_crtc, !!mtk_crtc->event);
|
||||
}
|
||||
|
||||
static const struct drm_crtc_funcs mtk_crtc_funcs = {
|
||||
|
||||
@ -470,6 +470,7 @@ static const struct of_device_id mtk_drm_of_ids[] = {
|
||||
.data = &mt8183_mmsys_driver_data},
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mtk_drm_of_ids);
|
||||
|
||||
static int mtk_drm_probe(struct platform_device *pdev)
|
||||
{
|
||||
|
||||
@ -401,8 +401,11 @@ static void mtk_dsi_rxtx_control(struct mtk_dsi *dsi)
|
||||
break;
|
||||
}
|
||||
|
||||
tmp_reg |= (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) << 6;
|
||||
tmp_reg |= (dsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET) >> 3;
|
||||
if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)
|
||||
tmp_reg |= HSTX_CKLP_EN;
|
||||
|
||||
if (!(dsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET))
|
||||
tmp_reg |= DIS_EOT;
|
||||
|
||||
writel(tmp_reg, dsi->regs + DSI_TXRX_CTRL);
|
||||
}
|
||||
@ -478,6 +481,7 @@ static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi)
|
||||
timing->da_hs_zero + timing->da_hs_exit + 3;
|
||||
|
||||
delta = dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST ? 18 : 12;
|
||||
delta += dsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET ? 2 : 0;
|
||||
|
||||
horizontal_frontporch_byte = vm->hfront_porch * dsi_tmp_buf_bpp;
|
||||
horizontal_front_back_byte = horizontal_frontporch_byte + horizontal_backporch_byte;
|
||||
@ -1141,6 +1145,7 @@ static const struct of_device_id mtk_dsi_of_match[] = {
|
||||
.data = &mt8183_dsi_driver_data },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mtk_dsi_of_match);
|
||||
|
||||
struct platform_driver mtk_dsi_driver = {
|
||||
.probe = mtk_dsi_probe,
|
||||
|
||||
@ -153,7 +153,7 @@ struct mtk_hdmi_conf {
|
||||
struct mtk_hdmi {
|
||||
struct drm_bridge bridge;
|
||||
struct drm_bridge *next_bridge;
|
||||
struct drm_connector conn;
|
||||
struct drm_connector *curr_conn;/* current connector (only valid when 'enabled') */
|
||||
struct device *dev;
|
||||
const struct mtk_hdmi_conf *conf;
|
||||
struct phy *phy;
|
||||
@ -186,11 +186,6 @@ static inline struct mtk_hdmi *hdmi_ctx_from_bridge(struct drm_bridge *b)
|
||||
return container_of(b, struct mtk_hdmi, bridge);
|
||||
}
|
||||
|
||||
static inline struct mtk_hdmi *hdmi_ctx_from_conn(struct drm_connector *c)
|
||||
{
|
||||
return container_of(c, struct mtk_hdmi, conn);
|
||||
}
|
||||
|
||||
static u32 mtk_hdmi_read(struct mtk_hdmi *hdmi, u32 offset)
|
||||
{
|
||||
return readl(hdmi->regs + offset);
|
||||
@ -974,7 +969,7 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi,
|
||||
ssize_t err;
|
||||
|
||||
err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
|
||||
&hdmi->conn, mode);
|
||||
hdmi->curr_conn, mode);
|
||||
if (err < 0) {
|
||||
dev_err(hdmi->dev,
|
||||
"Failed to get AVI infoframe from mode: %zd\n", err);
|
||||
@ -1054,7 +1049,7 @@ static int mtk_hdmi_setup_vendor_specific_infoframe(struct mtk_hdmi *hdmi,
|
||||
ssize_t err;
|
||||
|
||||
err = drm_hdmi_vendor_infoframe_from_display_mode(&frame,
|
||||
&hdmi->conn, mode);
|
||||
hdmi->curr_conn, mode);
|
||||
if (err) {
|
||||
dev_err(hdmi->dev,
|
||||
"Failed to get vendor infoframe from mode: %zd\n", err);
|
||||
@ -1201,48 +1196,16 @@ mtk_hdmi_update_plugged_status(struct mtk_hdmi *hdmi)
|
||||
connector_status_connected : connector_status_disconnected;
|
||||
}
|
||||
|
||||
static enum drm_connector_status hdmi_conn_detect(struct drm_connector *conn,
|
||||
bool force)
|
||||
static enum drm_connector_status mtk_hdmi_detect(struct mtk_hdmi *hdmi)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
|
||||
return mtk_hdmi_update_plugged_status(hdmi);
|
||||
}
|
||||
|
||||
static void hdmi_conn_destroy(struct drm_connector *conn)
|
||||
static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
|
||||
const struct drm_display_info *info,
|
||||
const struct drm_display_mode *mode)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
|
||||
|
||||
mtk_cec_set_hpd_event(hdmi->cec_dev, NULL, NULL);
|
||||
|
||||
drm_connector_cleanup(conn);
|
||||
}
|
||||
|
||||
static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
|
||||
struct edid *edid;
|
||||
int ret;
|
||||
|
||||
if (!hdmi->ddc_adpt)
|
||||
return -ENODEV;
|
||||
|
||||
edid = drm_get_edid(conn, hdmi->ddc_adpt);
|
||||
if (!edid)
|
||||
return -ENODEV;
|
||||
|
||||
hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
|
||||
|
||||
drm_connector_update_edid_property(conn, edid);
|
||||
|
||||
ret = drm_add_edid_modes(conn, edid);
|
||||
kfree(edid);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,
|
||||
struct drm_display_mode *mode)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
struct drm_bridge *next_bridge;
|
||||
|
||||
dev_dbg(hdmi->dev, "xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n",
|
||||
@ -1267,74 +1230,57 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,
|
||||
return drm_mode_validate_size(mode, 0x1fff, 0x1fff);
|
||||
}
|
||||
|
||||
static struct drm_encoder *mtk_hdmi_conn_best_enc(struct drm_connector *conn)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_conn(conn);
|
||||
|
||||
return hdmi->bridge.encoder;
|
||||
}
|
||||
|
||||
static const struct drm_connector_funcs mtk_hdmi_connector_funcs = {
|
||||
.detect = hdmi_conn_detect,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = hdmi_conn_destroy,
|
||||
.reset = drm_atomic_helper_connector_reset,
|
||||
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
||||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||
};
|
||||
|
||||
static const struct drm_connector_helper_funcs
|
||||
mtk_hdmi_connector_helper_funcs = {
|
||||
.get_modes = mtk_hdmi_conn_get_modes,
|
||||
.mode_valid = mtk_hdmi_conn_mode_valid,
|
||||
.best_encoder = mtk_hdmi_conn_best_enc,
|
||||
};
|
||||
|
||||
static void mtk_hdmi_hpd_event(bool hpd, struct device *dev)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
|
||||
|
||||
if (hdmi && hdmi->bridge.encoder && hdmi->bridge.encoder->dev)
|
||||
if (hdmi && hdmi->bridge.encoder && hdmi->bridge.encoder->dev) {
|
||||
static enum drm_connector_status status;
|
||||
|
||||
status = mtk_hdmi_detect(hdmi);
|
||||
drm_helper_hpd_irq_event(hdmi->bridge.encoder->dev);
|
||||
drm_bridge_hpd_notify(&hdmi->bridge, status);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Bridge callbacks
|
||||
*/
|
||||
|
||||
static enum drm_connector_status mtk_hdmi_bridge_detect(struct drm_bridge *bridge)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
|
||||
return mtk_hdmi_detect(hdmi);
|
||||
}
|
||||
|
||||
static struct edid *mtk_hdmi_bridge_get_edid(struct drm_bridge *bridge,
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
struct edid *edid;
|
||||
|
||||
if (!hdmi->ddc_adpt)
|
||||
return NULL;
|
||||
edid = drm_get_edid(connector, hdmi->ddc_adpt);
|
||||
if (!edid)
|
||||
return NULL;
|
||||
hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
|
||||
return edid;
|
||||
}
|
||||
|
||||
static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge,
|
||||
enum drm_bridge_attach_flags flags)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
int ret;
|
||||
|
||||
if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
|
||||
DRM_ERROR("Fix bridge driver to make connector optional!");
|
||||
if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) {
|
||||
DRM_ERROR("%s: The flag DRM_BRIDGE_ATTACH_NO_CONNECTOR must be supplied\n",
|
||||
__func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = drm_connector_init_with_ddc(bridge->encoder->dev, &hdmi->conn,
|
||||
&mtk_hdmi_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_HDMIA,
|
||||
hdmi->ddc_adpt);
|
||||
if (ret) {
|
||||
dev_err(hdmi->dev, "Failed to initialize connector: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
drm_connector_helper_add(&hdmi->conn, &mtk_hdmi_connector_helper_funcs);
|
||||
|
||||
hdmi->conn.polled = DRM_CONNECTOR_POLL_HPD;
|
||||
hdmi->conn.interlace_allowed = true;
|
||||
hdmi->conn.doublescan_allowed = false;
|
||||
|
||||
ret = drm_connector_attach_encoder(&hdmi->conn,
|
||||
bridge->encoder);
|
||||
if (ret) {
|
||||
dev_err(hdmi->dev,
|
||||
"Failed to attach connector to encoder: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (hdmi->next_bridge) {
|
||||
ret = drm_bridge_attach(bridge->encoder, hdmi->next_bridge,
|
||||
bridge, flags);
|
||||
@ -1357,7 +1303,8 @@ static bool mtk_hdmi_bridge_mode_fixup(struct drm_bridge *bridge,
|
||||
return true;
|
||||
}
|
||||
|
||||
static void mtk_hdmi_bridge_disable(struct drm_bridge *bridge)
|
||||
static void mtk_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
|
||||
struct drm_bridge_state *old_bridge_state)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
|
||||
@ -1368,10 +1315,13 @@ static void mtk_hdmi_bridge_disable(struct drm_bridge *bridge)
|
||||
clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_HDMI_PIXEL]);
|
||||
clk_disable_unprepare(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]);
|
||||
|
||||
hdmi->curr_conn = NULL;
|
||||
|
||||
hdmi->enabled = false;
|
||||
}
|
||||
|
||||
static void mtk_hdmi_bridge_post_disable(struct drm_bridge *bridge)
|
||||
static void mtk_hdmi_bridge_atomic_post_disable(struct drm_bridge *bridge,
|
||||
struct drm_bridge_state *old_state)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
|
||||
@ -1406,7 +1356,8 @@ static void mtk_hdmi_bridge_mode_set(struct drm_bridge *bridge,
|
||||
drm_mode_copy(&hdmi->mode, adjusted_mode);
|
||||
}
|
||||
|
||||
static void mtk_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
|
||||
static void mtk_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge,
|
||||
struct drm_bridge_state *old_state)
|
||||
{
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
|
||||
@ -1426,10 +1377,16 @@ static void mtk_hdmi_send_infoframe(struct mtk_hdmi *hdmi,
|
||||
mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode);
|
||||
}
|
||||
|
||||
static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge)
|
||||
static void mtk_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
|
||||
struct drm_bridge_state *old_state)
|
||||
{
|
||||
struct drm_atomic_state *state = old_state->base.state;
|
||||
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
|
||||
|
||||
/* Retrieve the connector through the atomic state. */
|
||||
hdmi->curr_conn = drm_atomic_get_new_connector_for_encoder(state,
|
||||
bridge->encoder);
|
||||
|
||||
mtk_hdmi_output_set_display_mode(hdmi, &hdmi->mode);
|
||||
clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]);
|
||||
clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PIXEL]);
|
||||
@ -1440,13 +1397,19 @@ static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge)
|
||||
}
|
||||
|
||||
static const struct drm_bridge_funcs mtk_hdmi_bridge_funcs = {
|
||||
.mode_valid = mtk_hdmi_bridge_mode_valid,
|
||||
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
|
||||
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
|
||||
.atomic_reset = drm_atomic_helper_bridge_reset,
|
||||
.attach = mtk_hdmi_bridge_attach,
|
||||
.mode_fixup = mtk_hdmi_bridge_mode_fixup,
|
||||
.disable = mtk_hdmi_bridge_disable,
|
||||
.post_disable = mtk_hdmi_bridge_post_disable,
|
||||
.atomic_disable = mtk_hdmi_bridge_atomic_disable,
|
||||
.atomic_post_disable = mtk_hdmi_bridge_atomic_post_disable,
|
||||
.mode_set = mtk_hdmi_bridge_mode_set,
|
||||
.pre_enable = mtk_hdmi_bridge_pre_enable,
|
||||
.enable = mtk_hdmi_bridge_enable,
|
||||
.atomic_pre_enable = mtk_hdmi_bridge_atomic_pre_enable,
|
||||
.atomic_enable = mtk_hdmi_bridge_atomic_enable,
|
||||
.detect = mtk_hdmi_bridge_detect,
|
||||
.get_edid = mtk_hdmi_bridge_get_edid,
|
||||
};
|
||||
|
||||
static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
|
||||
@ -1662,8 +1625,10 @@ static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf,
|
||||
{
|
||||
struct mtk_hdmi *hdmi = dev_get_drvdata(dev);
|
||||
|
||||
memcpy(buf, hdmi->conn.eld, min(sizeof(hdmi->conn.eld), len));
|
||||
|
||||
if (hdmi->enabled)
|
||||
memcpy(buf, hdmi->curr_conn->eld, min(sizeof(hdmi->curr_conn->eld), len));
|
||||
else
|
||||
memset(buf, 0, len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1755,6 +1720,9 @@ static int mtk_drm_hdmi_probe(struct platform_device *pdev)
|
||||
|
||||
hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs;
|
||||
hdmi->bridge.of_node = pdev->dev.of_node;
|
||||
hdmi->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID
|
||||
| DRM_BRIDGE_OP_HPD;
|
||||
hdmi->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
|
||||
drm_bridge_add(&hdmi->bridge);
|
||||
|
||||
ret = mtk_hdmi_clk_enable_audio(hdmi);
|
||||
@ -1818,6 +1786,7 @@ static const struct of_device_id mtk_drm_hdmi_of_ids[] = {
|
||||
},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mtk_drm_hdmi_of_ids);
|
||||
|
||||
static struct platform_driver mtk_hdmi_driver = {
|
||||
.probe = mtk_drm_hdmi_probe,
|
||||
|
||||
@ -335,6 +335,7 @@ static const struct of_device_id mtk_hdmi_ddc_match[] = {
|
||||
{ .compatible = "mediatek,mt8173-hdmi-ddc", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mtk_hdmi_ddc_match);
|
||||
|
||||
struct platform_driver mtk_hdmi_ddc_driver = {
|
||||
.probe = mtk_hdmi_ddc_probe,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user