forked from Minki/linux
7ad7a5acfb
The mxsfb driver will crash if the mxsfb DT node has a subnode, but the content of the subnode is not of-graph binding with an endpoint linking to panel. The crash was triggered by providing old-style panel bindings to the mxsfb driver instead of the new of-graph ones. The problem happens in mxsfb_create_output(), which is invoked from mxsfb_load(). The mxsfb_create_output() iterates over all mxsfb DT subnode endpoints and tries to bind a panel on each endpoint. If there is any problem binding the panel, that is, mxsfb->panel == NULL, this function will return an error code, otherwise success 0 is returned. If the subnodes do not specify of-graph binding with an endpoint, the iteration over endpoints in mxsfb_create_output() will have zero cycles and the function will immediatelly return 0, but the mxsfb->panel will remain NULL. This is propagated back into the mxsfb_load(), which does not detect any problem and expects that the mxsfb->panel is valid, thus calls mxsfb_panel_attach(). But since mxsfb->panel == NULL, mxsfb_panel_attach() is called with first argument NULL and this crashes the kernel. This patch fixes the problem by explicitly checking for valid mxsfb->panel at the end of the iteration in mxsfb_create_output(). Signed-off-by: Marek Vasut <marex@denx.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Dave Airlie <airlied@redhat.com> Cc: Stefan Agner <stefan@agner.ch> Cc: Breno Matheus Lima <brenomatheus@gmail.com> Tested-by: Breno Lima <breno.lima@nxp.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
136 lines
3.6 KiB
C
136 lines
3.6 KiB
C
/*
|
|
* Copyright (C) 2016 Marek Vasut <marex@denx.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/of_graph.h>
|
|
|
|
#include <drm/drm_atomic.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
#include <drm/drm_fb_cma_helper.h>
|
|
#include <drm/drm_gem_cma_helper.h>
|
|
#include <drm/drm_panel.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
#include <drm/drm_simple_kms_helper.h>
|
|
#include <drm/drmP.h>
|
|
|
|
#include "mxsfb_drv.h"
|
|
|
|
static struct mxsfb_drm_private *
|
|
drm_connector_to_mxsfb_drm_private(struct drm_connector *connector)
|
|
{
|
|
return container_of(connector, struct mxsfb_drm_private, connector);
|
|
}
|
|
|
|
static int mxsfb_panel_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb =
|
|
drm_connector_to_mxsfb_drm_private(connector);
|
|
|
|
if (mxsfb->panel)
|
|
return mxsfb->panel->funcs->get_modes(mxsfb->panel);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct
|
|
drm_connector_helper_funcs mxsfb_panel_connector_helper_funcs = {
|
|
.get_modes = mxsfb_panel_get_modes,
|
|
};
|
|
|
|
static enum drm_connector_status
|
|
mxsfb_panel_connector_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb =
|
|
drm_connector_to_mxsfb_drm_private(connector);
|
|
|
|
if (mxsfb->panel)
|
|
return connector_status_connected;
|
|
|
|
return connector_status_disconnected;
|
|
}
|
|
|
|
static void mxsfb_panel_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb =
|
|
drm_connector_to_mxsfb_drm_private(connector);
|
|
|
|
if (mxsfb->panel)
|
|
drm_panel_detach(mxsfb->panel);
|
|
|
|
drm_connector_unregister(connector);
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static const struct drm_connector_funcs mxsfb_panel_connector_funcs = {
|
|
.dpms = drm_atomic_helper_connector_dpms,
|
|
.detect = mxsfb_panel_connector_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = mxsfb_panel_connector_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 int mxsfb_attach_endpoint(struct drm_device *drm,
|
|
const struct of_endpoint *ep)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb = drm->dev_private;
|
|
struct device_node *np;
|
|
struct drm_panel *panel;
|
|
int ret = -EPROBE_DEFER;
|
|
|
|
np = of_graph_get_remote_port_parent(ep->local_node);
|
|
panel = of_drm_find_panel(np);
|
|
of_node_put(np);
|
|
|
|
if (!panel)
|
|
return -EPROBE_DEFER;
|
|
|
|
mxsfb->connector.dpms = DRM_MODE_DPMS_OFF;
|
|
mxsfb->connector.polled = 0;
|
|
drm_connector_helper_add(&mxsfb->connector,
|
|
&mxsfb_panel_connector_helper_funcs);
|
|
ret = drm_connector_init(drm, &mxsfb->connector,
|
|
&mxsfb_panel_connector_funcs,
|
|
DRM_MODE_CONNECTOR_Unknown);
|
|
if (!ret)
|
|
mxsfb->panel = panel;
|
|
|
|
return ret;
|
|
}
|
|
|
|
int mxsfb_create_output(struct drm_device *drm)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb = drm->dev_private;
|
|
struct device_node *ep_np = NULL;
|
|
struct of_endpoint ep;
|
|
int ret;
|
|
|
|
for_each_endpoint_of_node(drm->dev->of_node, ep_np) {
|
|
ret = of_graph_parse_endpoint(ep_np, &ep);
|
|
if (!ret)
|
|
ret = mxsfb_attach_endpoint(drm, &ep);
|
|
|
|
if (ret) {
|
|
of_node_put(ep_np);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
if (!mxsfb->panel)
|
|
return -EPROBE_DEFER;
|
|
|
|
return 0;
|
|
}
|