Hi,
On Mon, Dec 10, 2018 at 02:28:43PM +0200, Laurent Pinchart wrote:
> The omap_dss_device type and output_type fields differ mostly for
> historical reasons. The output_type field is required for all devices
> but the display at the end of the pipeline, and must be set to
> OMAP_DISPLAY_TYPE_NONE for the latter. The type field is required for
> all devices but the internal encoder, for which it is ignored.
>
> The only reason why the output_type field must be set to
> OMAP_DISPLAY_TYPE_NONE for the display at the end of the pipeline is to
> identify omap_dss_device instances corresponding to displays. This is
> not documented and confusing.
>
> Clean the code by adding a new display field to the omap_dss_device
> structure to identify displays, and merge the type and output_type
> fields.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
-- Sebastian
> .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 1 +
> drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 1 +
> drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 1 +
> drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 1 -
> drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 1 -
> .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 1 -
> drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 1 +
> drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 +
> .../omapdrm/displays/panel-lgphilips-lb035q02.c | 1 +
> .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 +
> .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 1 +
> .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 +
> .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 1 +
> .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 1 +
> drivers/gpu/drm/omapdrm/dss/base.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/dpi.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/omapdss.h | 14 +++++++++-----
> drivers/gpu/drm/omapdrm/dss/output.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +-
> drivers/gpu/drm/omapdrm/dss/venc.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_crtc.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_encoder.c | 4 ++--
> 25 files changed, 31 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
> index 1503563117f3..6c0561101874 100644
> --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
> +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
> @@ -56,6 +56,7 @@ static int tvc_probe(struct platform_device *pdev)
> dssdev->ops = &tvc_ops;
> dssdev->dev = &pdev->dev;
> dssdev->type = OMAP_DISPLAY_TYPE_VENC;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
>
> diff --git a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
> index bf5ee50ce5fe..fa3a69bf8a04 100644
> --- a/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
> +++ b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
> @@ -239,6 +239,7 @@ static int dvic_probe(struct platform_device *pdev)
> dssdev->ops = &dvic_ops;
> dssdev->dev = &pdev->dev;
> dssdev->type = OMAP_DISPLAY_TYPE_DVI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
>
> diff --git a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
> index 797da4a3f22e..68d6f6e44b03 100644
> --- a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
> +++ b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
> @@ -140,6 +140,7 @@ static int hdmic_probe(struct platform_device *pdev)
> dssdev->ops = &hdmic_ops;
> dssdev->dev = &pdev->dev;
> dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = ddata->hpd_gpio
> diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
> index fc5e0c47054d..29a5a130ebd1 100644
> --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
> +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
> @@ -88,7 +88,6 @@ static int opa362_probe(struct platform_device *pdev)
> dssdev->ops = &opa362_ops;
> dssdev->dev = &pdev->dev;
> dssdev->type = OMAP_DISPLAY_TYPE_VENC;
> - dssdev->output_type = OMAP_DISPLAY_TYPE_VENC;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(1) | BIT(0);
>
> diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
> index 82035078377a..fb88537de1cc 100644
> --- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
> +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
> @@ -84,7 +84,6 @@ static int tfp410_probe(struct platform_device *pdev)
> dssdev->ops = &tfp410_ops;
> dssdev->dev = &pdev->dev;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> - dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(1) | BIT(0);
> dssdev->bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_POSEDGE
> diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
> index ced36718a95f..bc03752d2762 100644
> --- a/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
> +++ b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
> @@ -167,7 +167,6 @@ static int tpd_probe(struct platform_device *pdev)
> dssdev->ops = &tpd_ops;
> dssdev->dev = &pdev->dev;
> dssdev->type = OMAP_DISPLAY_TYPE_HDMI;
> - dssdev->output_type = OMAP_DISPLAY_TYPE_HDMI;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(1) | BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_DETECT
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
> index 3b3570cb0d9a..c95afbe90d77 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
> @@ -150,6 +150,7 @@ static int panel_dpi_probe(struct platform_device *pdev)
> dssdev->dev = &pdev->dev;
> dssdev->ops = &panel_dpi_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> index d9f10f41ddfb..741a5e324767 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> @@ -1272,6 +1272,7 @@ static int dsicm_probe(struct platform_device *pdev)
> dssdev->ops = &dsicm_ops;
> dssdev->driver = &dsicm_dss_driver;
> dssdev->type = OMAP_DISPLAY_TYPE_DSI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
> index f37931bf1c5f..4133351924be 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
> @@ -197,6 +197,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
> dssdev->dev = &spi->dev;
> dssdev->ops = &lb035q02_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
> index 8f2fb3d0492f..498a88307f04 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
> @@ -192,6 +192,7 @@ static int nec_8048_probe(struct spi_device *spi)
> dssdev->dev = &spi->dev;
> dssdev->ops = &nec_8048_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
> index 8d5d7f775b55..1e68e0d14f87 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
> @@ -207,6 +207,7 @@ static int sharp_ls_probe(struct platform_device *pdev)
> dssdev->dev = &pdev->dev;
> dssdev->ops = &sharp_ls_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
> index b8360cef3754..abee0b348cff 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
> @@ -706,6 +706,7 @@ static int acx565akm_probe(struct spi_device *spi)
> dssdev->dev = &spi->dev;
> dssdev->ops = &acx565akm_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_SDI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
> index 721c5bb3bdef..5b4fbcc196bc 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
> @@ -321,6 +321,7 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
> dssdev->dev = &spi->dev;
> dssdev->ops = &td028ttec1_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
> index 50960018dbe8..781dc8b0afe7 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
> @@ -420,6 +420,7 @@ static int tpo_td043_probe(struct spi_device *spi)
> dssdev->dev = &spi->dev;
> dssdev->ops = &tpo_td043_ops;
> dssdev->type = OMAP_DISPLAY_TYPE_DPI;
> + dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> dssdev->of_ports = BIT(0);
> dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES;
> diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c
> index d14abde3c5f0..81ea0f55cd75 100644
> --- a/drivers/gpu/drm/omapdrm/dss/base.c
> +++ b/drivers/gpu/drm/omapdrm/dss/base.c
> @@ -207,7 +207,7 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
> dev_dbg(dst->dev, "disconnect\n");
>
> if (!dst->id && !omapdss_device_is_connected(dst)) {
> - WARN_ON(dst->output_type);
> + WARN_ON(!dst->display);
> return;
> }
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
> index 295bc3eeea80..cc78dfa07f04 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dpi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
> @@ -634,7 +634,7 @@ static int dpi_init_output_port(struct dpi_data *dpi, struct device_node *port)
>
> out->dev = &dpi->pdev->dev;
> out->id = OMAP_DSS_OUTPUT_DPI;
> - out->output_type = OMAP_DISPLAY_TYPE_DPI;
> + out->type = OMAP_DISPLAY_TYPE_DPI;
> out->dispc_channel = dpi_get_channel(dpi);
> out->of_ports = BIT(port_num);
> out->ops = &dpi_ops;
> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
> index 0ba4670fd6cf..fd5b37ba8562 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
> @@ -5112,7 +5112,7 @@ static int dsi_init_output(struct dsi_data *dsi)
> out->id = dsi->module_id == 0 ?
> OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2;
>
> - out->output_type = OMAP_DISPLAY_TYPE_DSI;
> + out->type = OMAP_DISPLAY_TYPE_DSI;
> out->name = dsi->module_id == 0 ? "dsi.0" : "dsi.1";
> out->dispc_channel = dsi_get_channel(dsi);
> out->ops = &dsi_ops;
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> index 4337380b1bf7..6339e2756b34 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> @@ -679,7 +679,7 @@ static int hdmi4_init_output(struct omap_hdmi *hdmi)
>
> out->dev = &hdmi->pdev->dev;
> out->id = OMAP_DSS_OUTPUT_HDMI;
> - out->output_type = OMAP_DISPLAY_TYPE_HDMI;
> + out->type = OMAP_DISPLAY_TYPE_HDMI;
> out->name = "hdmi.0";
> out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
> out->ops = &hdmi_ops;
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> index b94f884c5c1a..2955bbad13bb 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> @@ -663,7 +663,7 @@ static int hdmi5_init_output(struct omap_hdmi *hdmi)
>
> out->dev = &hdmi->pdev->dev;
> out->id = OMAP_DSS_OUTPUT_HDMI;
> - out->output_type = OMAP_DISPLAY_TYPE_HDMI;
> + out->type = OMAP_DISPLAY_TYPE_HDMI;
> out->name = "hdmi.0";
> out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
> out->ops = &hdmi_ops;
> diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> index 33648445f50b..cc5b6eca3701 100644
> --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
> +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> @@ -413,14 +413,18 @@ struct omap_dss_device {
>
> struct list_head list;
>
> + /*
> + * DSS type that this device generates (for DSS internal devices) or
> + * requires (for external encoders, connectors and panels). Must be a
> + * non-zero (different than OMAP_DISPLAY_TYPE_NONE) value.
> + */
> enum omap_display_type type;
> +
> /*
> - * DSS output type that this device generates (for DSS internal devices)
> - * or requires (for external encoders). Must be OMAP_DISPLAY_TYPE_NONE
> - * for display devices (connectors and panels) and to non-zero value for
> - * all other devices.
> + * True if the device is a display (panel or connector) at the end of
> + * the pipeline, false otherwise.
> */
> - enum omap_display_type output_type;
> + bool display;
>
> const char *name;
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
> index 0ac400a521f3..f25ecfd26534 100644
> --- a/drivers/gpu/drm/omapdrm/dss/output.c
> +++ b/drivers/gpu/drm/omapdrm/dss/output.c
> @@ -33,7 +33,7 @@ int omapdss_device_init_output(struct omap_dss_device *out)
> return PTR_ERR(out->next);
> }
>
> - if (out->next && out->output_type != out->next->type) {
> + if (out->next && out->type != out->next->type) {
> dev_err(out->dev, "output type and display type don't match\n");
> return -EINVAL;
> }
> diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
> index 38b0bf19538d..e7945322c471 100644
> --- a/drivers/gpu/drm/omapdrm/dss/sdi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
> @@ -272,7 +272,7 @@ static int sdi_init_output(struct sdi_device *sdi)
>
> out->dev = &sdi->pdev->dev;
> out->id = OMAP_DSS_OUTPUT_SDI;
> - out->output_type = OMAP_DISPLAY_TYPE_SDI;
> + out->type = OMAP_DISPLAY_TYPE_SDI;
> out->name = "sdi.0";
> out->dispc_channel = OMAP_DSS_CHANNEL_LCD;
> /* We have SDI only on OMAP3, where it's on port 1 */
> diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
> index f2cbecfd05b5..da43b865d973 100644
> --- a/drivers/gpu/drm/omapdrm/dss/venc.c
> +++ b/drivers/gpu/drm/omapdrm/dss/venc.c
> @@ -760,7 +760,7 @@ static int venc_init_output(struct venc_device *venc)
>
> out->dev = &venc->pdev->dev;
> out->id = OMAP_DSS_OUTPUT_VENC;
> - out->output_type = OMAP_DISPLAY_TYPE_VENC;
> + out->type = OMAP_DISPLAY_TYPE_VENC;
> out->name = "venc.0";
> out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
> out->ops = &venc_ops;
> diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
> index 51036e6fca1c..0cea3824d3a6 100644
> --- a/drivers/gpu/drm/omapdrm/omap_crtc.c
> +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
> @@ -129,7 +129,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
> if (WARN_ON(omap_crtc->enabled == enable))
> return;
>
> - if (omap_crtc->pipe->output->output_type == OMAP_DISPLAY_TYPE_HDMI) {
> + if (omap_crtc->pipe->output->type == OMAP_DISPLAY_TYPE_HDMI) {
> priv->dispc_ops->mgr_enable(priv->dispc, channel, enable);
> omap_crtc->enabled = enable;
> return;
> diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
> index 4fb8b3fbd688..21175499ecd1 100644
> --- a/drivers/gpu/drm/omapdrm/omap_encoder.c
> +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
> @@ -153,7 +153,7 @@ static void omap_encoder_disable(struct drm_encoder *encoder)
> * DSI is treated as an exception as DSI pipelines still use the legacy
> * flow where the pipeline output controls the encoder.
> */
> - if (dssdev->output_type != OMAP_DISPLAY_TYPE_DSI) {
> + if (dssdev->type != OMAP_DISPLAY_TYPE_DSI) {
> dssdev->ops->disable(dssdev);
> dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
> }
> @@ -181,7 +181,7 @@ static void omap_encoder_enable(struct drm_encoder *encoder)
> * DSI is treated as an exception as DSI pipelines still use the legacy
> * flow where the pipeline output controls the encoder.
> */
> - if (dssdev->output_type != OMAP_DISPLAY_TYPE_DSI) {
> + if (dssdev->type != OMAP_DISPLAY_TYPE_DSI) {
> dssdev->ops->enable(dssdev);
> dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
> }
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
