leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/imx: imx-ldb: use encoder atomic_mode_set callback

Browse Source 
Using atomic_mode_set instead of mode_set allows to access crtc
and connector states in addition to the modes. This allows to
remove the connector list walk.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel
2016-07-22 12:43:04 +02:00
parent fe4a11c935
commit 3a2ad5028c
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/imx/imx-ldb.c
View File

@@ -252,11 +252,13 @@ static void imx_ldb_encoder_enable(struct drm_encoder *encoder)
drm_panel_enable(imx_ldb_ch->panel); drm_panel_enable(imx_ldb_ch->panel);
} }
static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, static void
struct drm_display_mode *orig_mode, imx_ldb_encoder_atomic_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode) struct drm_crtc_state *crtc_state,
struct drm_connector_state *connector_state)
{ {
struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
struct drm_display_mode *mode = &crtc_state->adjusted_mode;
struct imx_ldb *ldb = imx_ldb_ch->ldb; struct imx_ldb *ldb = imx_ldb_ch->ldb;
int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
unsigned long serial_clk; unsigned long serial_clk;
@@ -298,17 +300,11 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,
} }
if (!bus_format) { if (!bus_format) {
struct drm_connector *connector; struct drm_connector *connector = connector_state->connector;
struct drm_display_info *di = &connector->display_info;
drm_for_each_connector(connector, encoder->dev) { if (di->num_bus_formats)
struct drm_display_info *di = &connector->display_info; bus_format = di->bus_formats[0];
if (connector->encoder == encoder &&
di->num_bus_formats) {
bus_format = di->bus_formats[0];
break;
}
}
} }
imx_ldb_ch_set_bus_format(imx_ldb_ch, bus_format); imx_ldb_ch_set_bus_format(imx_ldb_ch, bus_format);
} }
@@ -426,7 +422,7 @@ static const struct drm_encoder_funcs imx_ldb_encoder_funcs = {
}; };
static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = { static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {
.mode_set = imx_ldb_encoder_mode_set, .atomic_mode_set = imx_ldb_encoder_atomic_mode_set,
.enable = imx_ldb_encoder_enable, .enable = imx_ldb_encoder_enable,
.disable = imx_ldb_encoder_disable, .disable = imx_ldb_encoder_disable,
.atomic_check = imx_ldb_encoder_atomic_check, .atomic_check = imx_ldb_encoder_atomic_check,