| Message ID | 1519817174-20714-4-git-send-email-tomi.valkeinen@ti.com |
|---|---|
| State | Accepted |
| Commit | da77772172059e609ef5135881df55e3e6c5c808 |
| Headers | show |
| Series | drm/omap: misc patches | expand |
Hi, On Wed, Feb 28, 2018 at 01:26:00PM +0200, Tomi Valkeinen wrote: > From: Peter Ujfalusi <peter.ujfalusi@ti.com> > > Do not try to init the fbdev if either num_crtcs or num_connectors is 0. > In this case we do not have display so the fbdev init would fail anyways. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> -- Sebastian > drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c > index be94480326d7..0f66c74a54b0 100644 > --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c > +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c > @@ -249,6 +249,9 @@ void omap_fbdev_init(struct drm_device *dev) > struct drm_fb_helper *helper; > int ret = 0; > > + if (!priv->num_crtcs || !priv->num_connectors) > + return; > + > fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); > if (!fbdev) > goto fail; > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index be94480326d7..0f66c74a54b0 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -249,6 +249,9 @@ void omap_fbdev_init(struct drm_device *dev) struct drm_fb_helper *helper; int ret = 0; + if (!priv->num_crtcs || !priv->num_connectors) + return; + fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); if (!fbdev) goto fail;