forked from Minki/linux
4fcd01d0f3
The DRM connector's encoder pointer is managed internally by the DRM core and set to NULL when the DRM connector is disconnected from the CRTC it was attached to. This results in a NULL pointer dereference in the HDMI connector functions when trying to call the associated slave encoder's operations. Fix this by retrieving the slave encoder pointer from the R-Car connector structure instead of the DRM connector structure. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
122 lines
3.5 KiB
C
122 lines
3.5 KiB
C
/*
|
|
* R-Car Display Unit HDMI Connector
|
|
*
|
|
* Copyright (C) 2014 Renesas Electronics Corporation
|
|
*
|
|
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
#include <drm/drm_encoder_slave.h>
|
|
|
|
#include "rcar_du_drv.h"
|
|
#include "rcar_du_encoder.h"
|
|
#include "rcar_du_hdmicon.h"
|
|
#include "rcar_du_kms.h"
|
|
|
|
#define to_slave_funcs(e) (to_rcar_encoder(e)->slave.slave_funcs)
|
|
|
|
static int rcar_du_hdmi_connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct rcar_du_connector *con = to_rcar_connector(connector);
|
|
struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(con->encoder);
|
|
struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
|
|
|
|
if (sfuncs->get_modes == NULL)
|
|
return 0;
|
|
|
|
return sfuncs->get_modes(encoder, connector);
|
|
}
|
|
|
|
static int rcar_du_hdmi_connector_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
struct rcar_du_connector *con = to_rcar_connector(connector);
|
|
struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(con->encoder);
|
|
struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
|
|
|
|
if (sfuncs->mode_valid == NULL)
|
|
return MODE_OK;
|
|
|
|
return sfuncs->mode_valid(encoder, mode);
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
|
.get_modes = rcar_du_hdmi_connector_get_modes,
|
|
.mode_valid = rcar_du_hdmi_connector_mode_valid,
|
|
.best_encoder = rcar_du_connector_best_encoder,
|
|
};
|
|
|
|
static void rcar_du_hdmi_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
drm_connector_unregister(connector);
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static enum drm_connector_status
|
|
rcar_du_hdmi_connector_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
struct rcar_du_connector *con = to_rcar_connector(connector);
|
|
struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(con->encoder);
|
|
struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);
|
|
|
|
if (sfuncs->detect == NULL)
|
|
return connector_status_unknown;
|
|
|
|
return sfuncs->detect(encoder, connector);
|
|
}
|
|
|
|
static const struct drm_connector_funcs connector_funcs = {
|
|
.dpms = drm_helper_connector_dpms,
|
|
.detect = rcar_du_hdmi_connector_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = rcar_du_hdmi_connector_destroy,
|
|
};
|
|
|
|
int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,
|
|
struct rcar_du_encoder *renc)
|
|
{
|
|
struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(renc);
|
|
struct rcar_du_connector *rcon;
|
|
struct drm_connector *connector;
|
|
int ret;
|
|
|
|
rcon = devm_kzalloc(rcdu->dev, sizeof(*rcon), GFP_KERNEL);
|
|
if (rcon == NULL)
|
|
return -ENOMEM;
|
|
|
|
connector = &rcon->connector;
|
|
connector->display_info.width_mm = 0;
|
|
connector->display_info.height_mm = 0;
|
|
|
|
ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
|
|
DRM_MODE_CONNECTOR_HDMIA);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
drm_connector_helper_add(connector, &connector_helper_funcs);
|
|
ret = drm_connector_register(connector);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
|
|
drm_object_property_set_value(&connector->base,
|
|
rcdu->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF);
|
|
|
|
ret = drm_mode_connector_attach_encoder(connector, encoder);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
connector->encoder = encoder;
|
|
rcon->encoder = renc;
|
|
|
|
return 0;
|
|
}
|