Hi, On Mon, Dec 10, 2018 at 09:50:08AM +0200, Laurent Pinchart wrote: > Hi Sebastian, > > On Monday, 10 December 2018 00:07:55 EET Sebastian Reichel wrote: > > On Wed, Dec 05, 2018 at 05:00:15PM +0200, Laurent Pinchart wrote: > > > The DISPC timings checks relate to the CRTC, but they're performed in > > > the encoder and connector .atomic_check() and .mode_valid() operations. > > > Move them to the CRTC .mode_valid() operation. > > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > > --- > > > > Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx> > > > > This should also fix the issue with DSI in a less ugly way: > > > > https://lists.freedesktop.org/archives/dri-devel/2018-November/196622.html > > Should I add the > > Fixes: 7c27fa57ef31 ("drm/omap: Call dispc timings check operation directly") > > tag to this patch ? I plan to test this series in combination with my DSI patches today or tomorrow evening. If it works, probably the following should be added to the patch description: -------------------- As a side-effect this fixes DSI, which uses slightly different mode configuration for the DSI encoder and the DISPC. Fixes: 7c27fa57ef31 ("drm/omap: Call dispc timings check operation directly") -------------------- -- Sebastian > > > drivers/gpu/drm/omapdrm/omap_connector.c | 6 ------ > > > drivers/gpu/drm/omapdrm/omap_crtc.c | 9 +++++++++ > > > drivers/gpu/drm/omapdrm/omap_encoder.c | 6 ------ > > > 3 files changed, 9 insertions(+), 12 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c > > > b/drivers/gpu/drm/omapdrm/omap_connector.c index > > > 8db1f2fbcf43..dd1e0f2e8ffc 100644 > > > --- a/drivers/gpu/drm/omapdrm/omap_connector.c > > > +++ b/drivers/gpu/drm/omapdrm/omap_connector.c > > > @@ -245,8 +245,6 @@ static int omap_connector_mode_valid(struct > > > drm_connector *connector,> > > > struct drm_display_mode *mode) > > > > > > { > > > > > > struct omap_connector *omap_connector = to_omap_connector(connector); > > > > > > - enum omap_channel channel = omap_connector->output->dispc_channel; > > > - struct omap_drm_private *priv = connector->dev->dev_private; > > > > > > struct omap_dss_device *dssdev; > > > struct videomode vm = {0}; > > > struct drm_device *dev = connector->dev; > > > > > > @@ -256,10 +254,6 @@ static int omap_connector_mode_valid(struct > > > drm_connector *connector,> > > > drm_display_mode_to_videomode(mode, &vm); > > > mode->vrefresh = drm_mode_vrefresh(mode); > > > > > > - r = priv->dispc_ops->mgr_check_timings(priv->dispc, channel, &vm); > > > - if (r) > > > - goto done; > > > - > > > > > > for (dssdev = omap_connector->output; dssdev; dssdev = dssdev->next) { > > > > > > if (!dssdev->ops->check_timings) > > > > > > continue; > > > > > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c > > > b/drivers/gpu/drm/omapdrm/omap_crtc.c index caffc547ef97..51036e6fca1c > > > 100644 > > > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > > > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > > > @@ -391,6 +391,15 @@ static enum drm_mode_status > > > omap_crtc_mode_valid(struct drm_crtc *crtc,> > > > const struct drm_display_mode *mode) > > > > > > { > > > > > > struct omap_drm_private *priv = crtc->dev->dev_private; > > > > > > + struct omap_crtc *omap_crtc = to_omap_crtc(crtc); > > > + struct videomode vm = {0}; > > > + int r; > > > + > > > + drm_display_mode_to_videomode(mode, &vm); > > > + r = priv->dispc_ops->mgr_check_timings(priv->dispc, omap_crtc->channel, > > > + &vm); > > > + if (r) > > > + return r; > > > > > > /* Check for bandwidth limit */ > > > if (priv->max_bandwidth) { > > > > > > diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c > > > b/drivers/gpu/drm/omapdrm/omap_encoder.c index 79ee927cd905..7d01df6fa723 > > > 100644 > > > --- a/drivers/gpu/drm/omapdrm/omap_encoder.c > > > +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c > > > @@ -198,19 +198,13 @@ static int omap_encoder_atomic_check(struct > > > drm_encoder *encoder,> > > > struct drm_connector_state *conn_state) > > > > > > { > > > > > > struct omap_encoder *omap_encoder = to_omap_encoder(encoder); > > > > > > - enum omap_channel channel = omap_encoder->output->dispc_channel; > > > > > > struct drm_device *dev = encoder->dev; > > > > > > - struct omap_drm_private *priv = dev->dev_private; > > > > > > struct omap_dss_device *dssdev; > > > struct videomode vm = { 0 }; > > > int ret; > > > > > > drm_display_mode_to_videomode(&crtc_state->mode, &vm); > > > > > > - ret = priv->dispc_ops->mgr_check_timings(priv->dispc, channel, &vm); > > > - if (ret) > > > - goto done; > > > - > > > > > > for (dssdev = omap_encoder->output; dssdev; dssdev = dssdev->next) { > > > > > > if (!dssdev->ops->check_timings) > > > > > > continue; > > > -- > 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
