lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/exynos: added manager object to connector

Browse Source 
connector contains some contents for display controller so the connector also
should be able to access controller through manager.

Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
This commit is contained in:
Inki Dae
2011-10-19 17:16:55 +09:00
parent 8b58dfe029
commit adb6b15967
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/exynos/exynos_drm_connector.c
View File

@@ -37,6 +37,8 @@
struct exynos_drm_connector { struct exynos_drm_connector {
struct drm_connector drm_connector; struct drm_connector drm_connector;
uint32_t encoder_id;
struct exynos_drm_manager *manager;
}; };
/* convert exynos_video_timings to drm_display_mode */ /* convert exynos_video_timings to drm_display_mode */
@@ -99,8 +101,9 @@ convert_to_video_timing(struct fb_videomode *timing,
static int exynos_drm_connector_get_modes(struct drm_connector *connector) static int exynos_drm_connector_get_modes(struct drm_connector *connector)
{ {
struct exynos_drm_manager *manager = struct exynos_drm_connector *exynos_connector =
exynos_drm_get_manager(connector->encoder); to_exynos_connector(connector);
struct exynos_drm_manager *manager = exynos_connector->manager;
struct exynos_drm_display *display = manager->display; struct exynos_drm_display *display = manager->display;
unsigned int count; unsigned int count;
@@ -169,8 +172,9 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
static int exynos_drm_connector_mode_valid(struct drm_connector *connector, static int exynos_drm_connector_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
struct exynos_drm_manager *manager = struct exynos_drm_connector *exynos_connector =
exynos_drm_get_manager(connector->encoder); to_exynos_connector(connector);
struct exynos_drm_manager *manager = exynos_connector->manager;
struct exynos_drm_display *display = manager->display; struct exynos_drm_display *display = manager->display;
struct fb_videomode timing; struct fb_videomode timing;
int ret = MODE_BAD; int ret = MODE_BAD;
@@ -188,9 +192,25 @@ static int exynos_drm_connector_mode_valid(struct drm_connector *connector,
struct drm_encoder *exynos_drm_best_encoder(struct drm_connector *connector) struct drm_encoder *exynos_drm_best_encoder(struct drm_connector *connector)
{ {
struct drm_device *dev = connector->dev;
struct exynos_drm_connector *exynos_connector =
to_exynos_connector(connector);
struct drm_mode_object *obj;
struct drm_encoder *encoder;
DRM_DEBUG_KMS("%s\n", __FILE__); DRM_DEBUG_KMS("%s\n", __FILE__);
return connector->encoder; obj = drm_mode_object_find(dev, exynos_connector->encoder_id,
DRM_MODE_OBJECT_ENCODER);
if (!obj) {
DRM_DEBUG_KMS("Unknown ENCODER ID %d\n",
exynos_connector->encoder_id);
return NULL;
}
encoder = obj_to_encoder(obj);
return encoder;
} }
static struct drm_connector_helper_funcs exynos_connector_helper_funcs = { static struct drm_connector_helper_funcs exynos_connector_helper_funcs = {
@@ -203,8 +223,9 @@ static struct drm_connector_helper_funcs exynos_connector_helper_funcs = {
static enum drm_connector_status static enum drm_connector_status
exynos_drm_connector_detect(struct drm_connector *connector, bool force) exynos_drm_connector_detect(struct drm_connector *connector, bool force)
{ {
struct exynos_drm_manager *manager = struct exynos_drm_connector *exynos_connector =
exynos_drm_get_manager(connector->encoder); to_exynos_connector(connector);
struct exynos_drm_manager *manager = exynos_connector->manager;
struct exynos_drm_display *display = manager->display; struct exynos_drm_display *display = manager->display;
enum drm_connector_status status = connector_status_disconnected; enum drm_connector_status status = connector_status_disconnected;
@@ -276,7 +297,10 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev,
if (err) if (err)
goto err_connector; goto err_connector;
exynos_connector->encoder_id = encoder->base.id;
exynos_connector->manager = manager;
connector->encoder = encoder; connector->encoder = encoder;
err = drm_mode_connector_attach_encoder(connector, encoder); err = drm_mode_connector_attach_encoder(connector, encoder);
if (err) { if (err) {
DRM_ERROR("failed to attach a connector to a encoder\n"); DRM_ERROR("failed to attach a connector to a encoder\n");

3
drivers/gpu/drm/exynos/exynos_drm_encoder.c
View File

@@ -58,7 +58,8 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode)
list_for_each_entry(connector, &dev->mode_config.connector_list, head) { list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
if (connector->encoder == encoder) { if (connector->encoder == encoder) {
struct exynos_drm_display *display = manager->display; struct exynos_drm_display *display =
manager->display;
if (display && display->power_on) if (display && display->power_on)
display->power_on(manager->dev, mode); display->power_on(manager->dev, mode);