On 2013-03-12 15:06, Archit Taneja wrote:
> The omapdrm driver requires omapdss panel drivers to expose ops like detect,
> set_timings and check_timings. These can be NULL for fixed panel DPI, DBI, DSI
> and SDI drivers. At some places, there are no checks to see if the panel
> driver
> has these ops or not, and that leads to a crash.
>
> The following things are done to make fixed panels work:
>
> - The omap_connector's detect function is modified such that it considers
> panel
> types which are generally fixed panels as always connected(provided the
> panel
> driver doesn't have a detect op). Hence, the connector corresponding to
> these
> panels is always in a 'connected' state.
>
> - If a panel driver doesn't have a check_timings op, assume that it supports
> the
> mode passed to omap_connector_mode_valid(the 'mode_valid' drm helper
> function)
>
> - The function omap_encoder_update shouldn't really do anything for fixed
> resolution panels, make sure that it calls set_timings only if the panel
> driver has one.
>
> Signed-off-by: Archit Taneja <arc...@ti.com>
> ---
> Note: In v2, we make sure that the mode passed on to omapdrm matches the
> timings
> of the fixed resolution panel.
>
> drivers/gpu/drm/omapdrm/omap_connector.c | 27 +++++++++++++++++++++++++--
> drivers/gpu/drm/omapdrm/omap_encoder.c | 17 +++++++++++++++--
> 2 files changed, 40 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c
> b/drivers/gpu/drm/omapdrm/omap_connector.c
> index c451c41..a72fedd 100644
> --- a/drivers/gpu/drm/omapdrm/omap_connector.c
> +++ b/drivers/gpu/drm/omapdrm/omap_connector.c
> @@ -110,6 +110,11 @@ static enum drm_connector_status omap_connector_detect(
> ret = connector_status_connected;
> else
> ret = connector_status_disconnected;
> + } else if (dssdev->type == OMAP_DISPLAY_TYPE_DPI ||
> + dssdev->type == OMAP_DISPLAY_TYPE_DBI ||
> + dssdev->type == OMAP_DISPLAY_TYPE_SDI ||
> + dssdev->type == OMAP_DISPLAY_TYPE_DSI) {
> + ret = connector_status_connected;
I have to say I don't like this. We shouldn't care about the type here.
I think it's better just to default to connected if there's no detect
function (or unknown? I'm not sure what is the practical difference).
If it works fine without using dssdev->type, we have one less place to
worry when doing dss dev model changes =).
> } else {
> ret = connector_status_unknown;
> }
> @@ -189,12 +194,30 @@ static int omap_connector_mode_valid(struct
> drm_connector *connector,
> struct omap_video_timings timings = {0};
> struct drm_device *dev = connector->dev;
> struct drm_display_mode *new_mode;
> - int ret = MODE_BAD;
> + int r, ret = MODE_BAD;
>
> copy_timings_drm_to_omap(&timings, mode);
> mode->vrefresh = drm_mode_vrefresh(mode);
>
> - if (!dssdrv->check_timings(dssdev, &timings)) {
> + /*
> + * if the panel driver doesn't have a check_timings, it's most likely
> + * a fixed resolution panel, check if the timings match with the
> + * panel's timings
> + */
> + if (dssdrv->check_timings) {
> + r = dssdrv->check_timings(dssdev, &timings);
> + } else {
> + struct omap_video_timings t;
> +
> + dssdrv->get_timings(dssdev, &t);
> +
> + if (memcmp(&timings, &t, sizeof(struct omap_video_timings)))
> + r = -EINVAL;
> + else
> + r = 0;
memcmp on two structs is often not a good idea. There could be padding
bytes there, with uninitialized data. I'm not sure if that's the case
here, though, but it could well change any time (perhaps even depending
on compiler version).
I'm still pondering whether it'd just be simpler to require all the
dssdrv ops to be filled, probably using a helper macro in the panel
drivers... Did you consider that approach? I'm not saying to go for it,
I'm saying I can't make my mind which would be better =).
Tomi
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
