Revert "drm/panel: Add and fill drm_panel type field"

This reverts commit 64b76abfe3 which is
commit 9a2654c0f62a1704f36acb6329f9ccbd539f75ad upstream.

It breaks the Android abi and is not needed for any Android systems.  If
it is required in the future, it can come back in an abi-safe way.

Bug: 161946584
Change-Id: Idfbd072361ba097010fc168a3a81aa853c0b6b0e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-08-03 13:54:37 +00:00
parent 7d6c570f61
commit 4d6b7da7af
41 changed files with 41 additions and 112 deletions

View File

@@ -46,20 +46,17 @@ static LIST_HEAD(panel_list);
* @panel: DRM panel
* @dev: parent device of the panel
* @funcs: panel operations
* @connector_type: the connector type (DRM_MODE_CONNECTOR_*) corresponding to
* the panel interface
*
* Initialize the panel structure for subsequent registration with
* drm_panel_add().
*/
void drm_panel_init(struct drm_panel *panel, struct device *dev,
const struct drm_panel_funcs *funcs, int connector_type)
const struct drm_panel_funcs *funcs)
{
INIT_LIST_HEAD(&panel->list);
BLOCKING_INIT_NOTIFIER_HEAD(&panel->nh);
panel->dev = dev;
panel->funcs = funcs;
panel->connector_type = connector_type;
}
EXPORT_SYMBOL(drm_panel_init);

View File

@@ -350,8 +350,7 @@ static int versatile_panel_probe(struct platform_device *pdev)
dev_info(dev, "panel mounted on IB2 daughterboard\n");
}
drm_panel_init(&vpanel->panel, dev, &versatile_panel_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&vpanel->panel, dev, &versatile_panel_drm_funcs);
return drm_panel_add(&vpanel->panel);
}

View File

@@ -204,8 +204,7 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi)
mipi_dsi_set_drvdata(dsi, ctx);
ctx->dsi = dsi;
drm_panel_init(&ctx->panel, &dsi->dev, &feiyang_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, &dsi->dev, &feiyang_funcs);
ctx->dvdd = devm_regulator_get(&dsi->dev, "dvdd");
if (IS_ERR(ctx->dvdd)) {

View File

@@ -895,8 +895,7 @@ static int ili9322_probe(struct spi_device *spi)
ili->input = ili->conf->input;
}
drm_panel_init(&ili->panel, dev, &ili9322_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&ili->panel, dev, &ili9322_drm_funcs);
return drm_panel_add(&ili->panel);
}

View File

@@ -433,8 +433,7 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)
mipi_dsi_set_drvdata(dsi, ctx);
ctx->dsi = dsi;
drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs);
ctx->power = devm_regulator_get(&dsi->dev, "power");
if (IS_ERR(ctx->power)) {

View File

@@ -487,8 +487,7 @@ static int innolux_panel_add(struct mipi_dsi_device *dsi,
if (IS_ERR(innolux->backlight))
return PTR_ERR(innolux->backlight);
drm_panel_init(&innolux->base, dev, &innolux_panel_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&innolux->base, dev, &innolux_panel_funcs);
err = drm_panel_add(&innolux->base);
if (err < 0)

View File

@@ -437,8 +437,7 @@ static int jdi_panel_add(struct jdi_panel *jdi)
return ret;
}
drm_panel_init(&jdi->base, &jdi->dsi->dev, &jdi_panel_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&jdi->base, &jdi->dsi->dev, &jdi_panel_funcs);
ret = drm_panel_add(&jdi->base);

View File

@@ -392,7 +392,7 @@ static int kingdisplay_panel_add(struct kingdisplay_panel *kingdisplay)
return PTR_ERR(kingdisplay->backlight);
drm_panel_init(&kingdisplay->base, &kingdisplay->link->dev,
&kingdisplay_panel_funcs, DRM_MODE_CONNECTOR_DSI);
&kingdisplay_panel_funcs);
return drm_panel_add(&kingdisplay->base);
}

View File

@@ -196,8 +196,7 @@ static int lb035q02_probe(struct spi_device *spi)
if (ret < 0)
return ret;
drm_panel_init(&lcd->panel, &lcd->spi->dev, &lb035q02_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, &lcd->spi->dev, &lb035q02_funcs);
return drm_panel_add(&lcd->panel);
}

View File

@@ -259,8 +259,7 @@ static int lg4573_probe(struct spi_device *spi)
return ret;
}
drm_panel_init(&ctx->panel, &spi->dev, &lg4573_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&ctx->panel, &spi->dev, &lg4573_drm_funcs);
return drm_panel_add(&ctx->panel);
}

View File

@@ -254,8 +254,7 @@ static int panel_lvds_probe(struct platform_device *pdev)
*/
/* Register the panel. */
drm_panel_init(&lvds->panel, lvds->dev, &panel_lvds_funcs,
DRM_MODE_CONNECTOR_LVDS);
drm_panel_init(&lvds->panel, lvds->dev, &panel_lvds_funcs);
ret = drm_panel_add(&lvds->panel);
if (ret < 0)

View File

@@ -205,8 +205,7 @@ static int nl8048_probe(struct spi_device *spi)
if (ret < 0)
return ret;
drm_panel_init(&lcd->panel, &lcd->spi->dev, &nl8048_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, &lcd->spi->dev, &nl8048_funcs);
return drm_panel_add(&lcd->panel);
}

View File

@@ -292,8 +292,7 @@ static int nt39016_probe(struct spi_device *spi)
return err;
}
drm_panel_init(&panel->drm_panel, dev, &nt39016_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&panel->drm_panel, dev, &nt39016_funcs);
err = drm_panel_add(&panel->drm_panel);
if (err < 0) {

View File

@@ -288,8 +288,7 @@ static int lcd_olinuxino_probe(struct i2c_client *client,
if (IS_ERR(lcd->backlight))
return PTR_ERR(lcd->backlight);
drm_panel_init(&lcd->panel, dev, &lcd_olinuxino_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, dev, &lcd_olinuxino_funcs);
return drm_panel_add(&lcd->panel);
}

View File

@@ -455,8 +455,7 @@ static int otm8009a_probe(struct mipi_dsi_device *dsi)
dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
MIPI_DSI_MODE_LPM;
drm_panel_init(&ctx->panel, dev, &otm8009a_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &otm8009a_drm_funcs);
ctx->bl_dev = devm_backlight_device_register(dev, dev_name(dev),
dev, ctx,

View File

@@ -167,7 +167,7 @@ static int osd101t2587_panel_add(struct osd101t2587_panel *osd101t2587)
return PTR_ERR(osd101t2587->backlight);
drm_panel_init(&osd101t2587->base, &osd101t2587->dsi->dev,
&osd101t2587_panel_funcs, DRM_MODE_CONNECTOR_DSI);
&osd101t2587_panel_funcs);
return drm_panel_add(&osd101t2587->base);
}

View File

@@ -224,7 +224,7 @@ static int wuxga_nt_panel_add(struct wuxga_nt_panel *wuxga_nt)
}
drm_panel_init(&wuxga_nt->base, &wuxga_nt->dsi->dev,
&wuxga_nt_panel_funcs, DRM_MODE_CONNECTOR_DSI);
&wuxga_nt_panel_funcs);
ret = drm_panel_add(&wuxga_nt->base);
if (ret < 0)

View File

@@ -433,8 +433,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,
return PTR_ERR(ts->dsi);
}
drm_panel_init(&ts->base, dev, &rpi_touchscreen_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ts->base, dev, &rpi_touchscreen_funcs);
/* This appears last, as it's what will unblock the DSI host
* driver's component bind function.

View File

@@ -606,8 +606,7 @@ static int rad_panel_probe(struct mipi_dsi_device *dsi)
if (ret)
return ret;
drm_panel_init(&panel->panel, dev, &rad_panel_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&panel->panel, dev, &rad_panel_funcs);
dev_set_drvdata(dev, panel);
ret = drm_panel_add(&panel->panel);

View File

@@ -404,8 +404,7 @@ static int rm68200_probe(struct mipi_dsi_device *dsi)
dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
MIPI_DSI_MODE_LPM;
drm_panel_init(&ctx->panel, dev, &rm68200_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &rm68200_drm_funcs);
drm_panel_add(&ctx->panel);

View File

@@ -343,8 +343,7 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)
return ret;
}
drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs);
drm_panel_add(&ctx->panel);

View File

@@ -173,8 +173,7 @@ static int rb070d30_panel_dsi_probe(struct mipi_dsi_device *dsi)
mipi_dsi_set_drvdata(dsi, ctx);
ctx->dsi = dsi;
drm_panel_init(&ctx->panel, &dsi->dev, &rb070d30_panel_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, &dsi->dev, &rb070d30_panel_funcs);
ctx->gpios.reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ctx->gpios.reset)) {

View File

@@ -351,8 +351,7 @@ static int ld9040_probe(struct spi_device *spi)
return ret;
}
drm_panel_init(&ctx->panel, dev, &ld9040_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&ctx->panel, dev, &ld9040_drm_funcs);
return drm_panel_add(&ctx->panel);
}

View File

@@ -215,8 +215,7 @@ static int s6d16d0_probe(struct mipi_dsi_device *dsi)
return ret;
}
drm_panel_init(&s6->panel, dev, &s6d16d0_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&s6->panel, dev, &s6d16d0_drm_funcs);
ret = drm_panel_add(&s6->panel);
if (ret < 0)

View File

@@ -732,8 +732,7 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi)
ctx->bl_dev->props.brightness = S6E3HA2_DEFAULT_BRIGHTNESS;
ctx->bl_dev->props.power = FB_BLANK_POWERDOWN;
drm_panel_init(&ctx->panel, dev, &s6e3ha2_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &s6e3ha2_drm_funcs);
ret = drm_panel_add(&ctx->panel);
if (ret < 0)

View File

@@ -466,8 +466,7 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi)
return PTR_ERR(ctx->reset_gpio);
}
drm_panel_init(&ctx->panel, dev, &s6e63j0x03_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &s6e63j0x03_funcs);
ctx->bl_dev = backlight_device_register("s6e63j0x03", dev, ctx,
&s6e63j0x03_bl_ops, NULL);

View File

@@ -473,8 +473,7 @@ static int s6e63m0_probe(struct spi_device *spi)
return ret;
}
drm_panel_init(&ctx->panel, dev, &s6e63m0_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&ctx->panel, dev, &s6e63m0_drm_funcs);
ret = s6e63m0_backlight_register(ctx);
if (ret < 0)

View File

@@ -1017,8 +1017,7 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi)
ctx->brightness = GAMMA_LEVEL_NUM - 1;
drm_panel_init(&ctx->panel, dev, &s6e8aa0_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &s6e8aa0_drm_funcs);
ret = drm_panel_add(&ctx->panel);
if (ret < 0)

View File

@@ -274,8 +274,7 @@ static int seiko_panel_probe(struct device *dev,
return -EPROBE_DEFER;
}
drm_panel_init(&panel->base, dev, &seiko_panel_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&panel->base, dev, &seiko_panel_funcs);
err = drm_panel_add(&panel->base);
if (err < 0)

View File

@@ -329,8 +329,7 @@ static int sharp_panel_add(struct sharp_panel *sharp)
if (IS_ERR(sharp->backlight))
return PTR_ERR(sharp->backlight);
drm_panel_init(&sharp->base, &sharp->link1->dev, &sharp_panel_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&sharp->base, &sharp->link1->dev, &sharp_panel_funcs);
return drm_panel_add(&sharp->base);
}

View File

@@ -185,8 +185,7 @@ static int ls037v7dw01_probe(struct platform_device *pdev)
return PTR_ERR(lcd->ud_gpio);
}
drm_panel_init(&lcd->panel, &pdev->dev, &ls037v7dw01_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, &pdev->dev, &ls037v7dw01_funcs);
return drm_panel_add(&lcd->panel);
}

View File

@@ -265,7 +265,7 @@ static int sharp_nt_panel_add(struct sharp_nt_panel *sharp_nt)
return PTR_ERR(sharp_nt->backlight);
drm_panel_init(&sharp_nt->base, &sharp_nt->dsi->dev,
&sharp_nt_panel_funcs, DRM_MODE_CONNECTOR_DSI);
&sharp_nt_panel_funcs);
return drm_panel_add(&sharp_nt->base);
}

View File

@@ -94,7 +94,6 @@ struct panel_desc {
u32 bus_format;
u32 bus_flags;
int connector_type;
};
struct panel_simple {
@@ -465,8 +464,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
if (!of_get_display_timing(dev->of_node, "panel-timing", &dt))
panel_simple_parse_panel_timing_node(dev, panel, &dt);
drm_panel_init(&panel->base, dev, &panel_simple_funcs,
desc->connector_type);
drm_panel_init(&panel->base, dev, &panel_simple_funcs);
err = drm_panel_add(&panel->base);
if (err < 0)
@@ -833,7 +831,6 @@ static const struct panel_desc auo_g133han01 = {
.unprepare = 1000,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing auo_g185han01_timings = {
@@ -863,7 +860,6 @@ static const struct panel_desc auo_g185han01 = {
.unprepare = 1000,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing auo_p320hvn03_timings = {
@@ -892,7 +888,6 @@ static const struct panel_desc auo_p320hvn03 = {
.unprepare = 500,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode auo_t215hvn01_mode = {
@@ -1208,7 +1203,6 @@ static const struct panel_desc dlc_dlc0700yzg_1 = {
.disable = 200,
},
.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing dlc_dlc1010gig_timing = {
@@ -1239,7 +1233,6 @@ static const struct panel_desc dlc_dlc1010gig = {
.unprepare = 60,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode edt_et035012dm6_mode = {
@@ -1506,7 +1499,6 @@ static const struct panel_desc hannstar_hsd070pww1 = {
.height = 94,
},
.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing hannstar_hsd100pxn1_timing = {
@@ -1531,7 +1523,6 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
.height = 152,
},
.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
@@ -1638,7 +1629,6 @@ static const struct panel_desc innolux_g070y2_l01 = {
.unprepare = 800,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing innolux_g101ice_l01_timing = {
@@ -1667,7 +1657,6 @@ static const struct panel_desc innolux_g101ice_l01 = {
.disable = 200,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing innolux_g121i1_l01_timing = {
@@ -1695,7 +1684,6 @@ static const struct panel_desc innolux_g121i1_l01 = {
.disable = 20,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode innolux_g121x1_l03_mode = {
@@ -1879,7 +1867,6 @@ static const struct panel_desc koe_tx31d200vm0baa = {
.height = 109,
},
.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing kyo_tcg121xglp_timing = {
@@ -1904,7 +1891,6 @@ static const struct panel_desc kyo_tcg121xglp = {
.height = 184,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode lemaker_bl035_rgb_002_mode = {
@@ -1953,7 +1939,6 @@ static const struct panel_desc lg_lb070wv8 = {
.height = 91,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode lg_lp079qx1_sp0v_mode = {
@@ -2110,7 +2095,6 @@ static const struct panel_desc mitsubishi_aa070mc01 = {
.disable = 400,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
.bus_flags = DRM_BUS_FLAG_DE_HIGH,
};
@@ -2139,7 +2123,6 @@ static const struct panel_desc nec_nl12880bc20_05 = {
.disable = 50,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode nec_nl4827hc19_05b_mode = {
@@ -2242,7 +2225,6 @@ static const struct panel_desc nlt_nl192108ac18_02d = {
.unprepare = 500,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode nvd_9128_mode = {
@@ -2266,7 +2248,6 @@ static const struct panel_desc nvd_9128 = {
.height = 88,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing okaya_rs800480t_7x0gp_timing = {
@@ -2679,7 +2660,6 @@ static const struct panel_desc sharp_lq101k1ly04 = {
.height = 136,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing sharp_lq123p1jx31_timing = {
@@ -2859,7 +2839,6 @@ static const struct panel_desc tianma_tm070jdhg30 = {
.height = 95,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct display_timing tianma_tm070rvhg71_timing = {
@@ -2884,7 +2863,6 @@ static const struct panel_desc tianma_tm070rvhg71 = {
.height = 86,
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode ti_nspire_cx_lcd_mode[] = {
@@ -2967,7 +2945,6 @@ static const struct panel_desc toshiba_lt089ac29000 = {
},
.bus_format = MEDIA_BUS_FMT_RGB888_1X24,
.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct drm_display_mode tpk_f07a_0102_mode = {
@@ -3038,7 +3015,6 @@ static const struct panel_desc urt_umsh_8596md_lvds = {
.height = 91,
},
.bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
.connector_type = DRM_MODE_CONNECTOR_LVDS,
};
static const struct panel_desc urt_umsh_8596md_parallel = {

View File

@@ -369,8 +369,7 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
if (IS_ERR(st7701->backlight))
return PTR_ERR(st7701->backlight);
drm_panel_init(&st7701->panel, &dsi->dev, &st7701_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&st7701->panel, &dsi->dev, &st7701_funcs);
/**
* Once sleep out has been issued, ST7701 IC required to wait 120ms

View File

@@ -381,8 +381,7 @@ static int st7789v_probe(struct spi_device *spi)
spi_set_drvdata(spi, ctx);
ctx->spi = spi;
drm_panel_init(&ctx->panel, &spi->dev, &st7789v_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&ctx->panel, &spi->dev, &st7789v_drm_funcs);
ctx->power = devm_regulator_get(&spi->dev, "power");
if (IS_ERR(ctx->power))

View File

@@ -648,8 +648,7 @@ static int acx565akm_probe(struct spi_device *spi)
return ret;
}
drm_panel_init(&lcd->panel, &lcd->spi->dev, &acx565akm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, &lcd->spi->dev, &acx565akm_funcs);
ret = drm_panel_add(&lcd->panel);
if (ret < 0) {

View File

@@ -347,8 +347,7 @@ static int td028ttec1_probe(struct spi_device *spi)
return ret;
}
drm_panel_init(&lcd->panel, &lcd->spi->dev, &td028ttec1_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, &lcd->spi->dev, &td028ttec1_funcs);
return drm_panel_add(&lcd->panel);
}

View File

@@ -458,8 +458,7 @@ static int td043mtea1_probe(struct spi_device *spi)
return ret;
}
drm_panel_init(&lcd->panel, &lcd->spi->dev, &td043mtea1_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&lcd->panel, &lcd->spi->dev, &td043mtea1_funcs);
ret = drm_panel_add(&lcd->panel);
if (ret < 0) {

View File

@@ -457,8 +457,7 @@ static int tpg110_probe(struct spi_device *spi)
if (ret)
return ret;
drm_panel_init(&tpg->panel, dev, &tpg110_drm_funcs,
DRM_MODE_CONNECTOR_DPI);
drm_panel_init(&tpg->panel, dev, &tpg110_drm_funcs);
spi_set_drvdata(spi, tpg);
return drm_panel_add(&tpg->panel);

View File

@@ -518,8 +518,7 @@ static int truly_nt35597_panel_add(struct truly_nt35597 *ctx)
/* dual port */
gpiod_set_value(ctx->mode_gpio, 0);
drm_panel_init(&ctx->panel, dev, &truly_nt35597_drm_funcs,
DRM_MODE_CONNECTOR_DSI);
drm_panel_init(&ctx->panel, dev, &truly_nt35597_drm_funcs);
drm_panel_add(&ctx->panel);
return 0;

View File

@@ -162,15 +162,6 @@ struct drm_panel {
*/
const struct drm_panel_funcs *funcs;
/**
* @connector_type:
*
* Type of the panel as a DRM_MODE_CONNECTOR_* value. This is used to
* initialise the drm_connector corresponding to the panel with the
* correct connector type.
*/
int connector_type;
/**
* @list:
*
@@ -187,8 +178,7 @@ struct drm_panel {
};
void drm_panel_init(struct drm_panel *panel, struct device *dev,
const struct drm_panel_funcs *funcs,
int connector_type);
const struct drm_panel_funcs *funcs);
int drm_panel_add(struct drm_panel *panel);
void drm_panel_remove(struct drm_panel *panel);