@@ -95,11 +95,16 @@ struct imx_ldb {
const struct bus_mux *lvds_mux;
};
+static inline int imx_ldb_is_dual(struct imx_ldb *ldb)
+{
+ return ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
+}
+
static void imx_ldb_ch_set_bus_format(struct imx_ldb_channel *imx_ldb_ch,
u32 bus_format)
{
struct imx_ldb *ldb = imx_ldb_ch->ldb;
- int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
+ int dual = imx_ldb_is_dual(ldb);
switch (bus_format) {
case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG:
@@ -196,7 +201,7 @@ static void imx_ldb_encoder_enable(struct drm_encoder *encoder)
{
struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
struct imx_ldb *ldb = imx_ldb_ch->ldb;
- int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
+ int dual = imx_ldb_is_dual(ldb);
int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder);
drm_panel_prepare(imx_ldb_ch->panel);
@@ -251,7 +256,7 @@ imx_ldb_encoder_atomic_mode_set(struct drm_encoder *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;
- int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
+ int dual = imx_ldb_is_dual(ldb);
unsigned long serial_clk;
unsigned long di_clk = mode->clock * 1000;
int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder);
@@ -315,7 +320,7 @@ static void imx_ldb_encoder_disable(struct drm_encoder *encoder)
regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
- if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
+ if (imx_ldb_is_dual(ldb)) {
clk_disable_unprepare(ldb->clk[0]);
clk_disable_unprepare(ldb->clk[1]);
}
@@ -434,7 +439,7 @@ static int imx_ldb_register(struct drm_device *drm,
if (ret)
return ret;
- if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
+ if (imx_ldb_is_dual(ldb)) {
ret = imx_ldb_get_clk(ldb, 1);
if (ret)
return ret;
@@ -557,7 +562,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
struct drm_device *drm = data;
struct device_node *np = dev->of_node;
struct imx_ldb *imx_ldb = dev_get_drvdata(dev);
- int dual = imx_ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
+ int dual = imx_ldb_is_dual(imx_ldb);
struct device_node *child;
int ret;
int i;
There where several places where this bit operation is made. Add a simple helper so we don't need to remember the bit each time. Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> --- drivers/gpu/drm/imx/imx-ldb.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)