Merge tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux into drm-next
drm/imx: various cleanups - Switch to drm_*_get/put() helpers - Use correct parallel-display connector enum: DPI instead of VGA - Remove incorrect unit name from device tree binding documentation example - Remove an unused variable * tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux: gpu: ipu-v3: ipu-dc: Remove unused 'di' variable dt-bindings: fsl-imx-drm: Remove incorrect "@di0" usage drm/imx: parallel-display: use correct connector enum drm/imx: switch to drm_*_get(), drm_*_put() helpers
This commit is contained in:
@@ -129,7 +129,7 @@ Optional properties:
|
||||
|
||||
example:
|
||||
|
||||
display@di0 {
|
||||
disp0 {
|
||||
compatible = "fsl,imx-parallel-display";
|
||||
edid = [edid-data];
|
||||
interface-pix-fmt = "rgb24";
|
||||
|
||||
@@ -115,7 +115,7 @@ static void imx_drm_crtc_reset(struct drm_crtc *crtc)
|
||||
|
||||
if (crtc->state) {
|
||||
if (crtc->state->mode_blob)
|
||||
drm_property_unreference_blob(crtc->state->mode_blob);
|
||||
drm_property_blob_put(crtc->state->mode_blob);
|
||||
|
||||
state = to_imx_crtc_state(crtc->state);
|
||||
memset(state, 0, sizeof(*state));
|
||||
|
||||
@@ -183,7 +183,7 @@ static int imx_pd_register(struct drm_device *drm,
|
||||
&imx_pd_connector_helper_funcs);
|
||||
drm_connector_init(drm, &imxpd->connector,
|
||||
&imx_pd_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_VGA);
|
||||
DRM_MODE_CONNECTOR_DPI);
|
||||
}
|
||||
|
||||
if (imxpd->panel)
|
||||
|
||||
@@ -249,11 +249,8 @@ EXPORT_SYMBOL_GPL(ipu_dc_enable);
|
||||
|
||||
void ipu_dc_enable_channel(struct ipu_dc *dc)
|
||||
{
|
||||
int di;
|
||||
u32 reg;
|
||||
|
||||
di = dc->di;
|
||||
|
||||
reg = readl(dc->base + DC_WR_CH_CONF);
|
||||
reg |= DC_WR_CH_CONF_PROG_TYPE_NORMAL;
|
||||
writel(reg, dc->base + DC_WR_CH_CONF);
|
||||
|
||||
Reference in New Issue
Block a user