Commit af5ecb53 authored by Dave Airlie's avatar Dave Airlie

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
parents 2d561310 e64b9189
...@@ -129,7 +129,7 @@ Optional properties: ...@@ -129,7 +129,7 @@ Optional properties:
example: example:
display@di0 { disp0 {
compatible = "fsl,imx-parallel-display"; compatible = "fsl,imx-parallel-display";
edid = [edid-data]; edid = [edid-data];
interface-pix-fmt = "rgb24"; interface-pix-fmt = "rgb24";
......
...@@ -115,7 +115,7 @@ static void imx_drm_crtc_reset(struct drm_crtc *crtc) ...@@ -115,7 +115,7 @@ static void imx_drm_crtc_reset(struct drm_crtc *crtc)
if (crtc->state) { if (crtc->state) {
if (crtc->state->mode_blob) 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); state = to_imx_crtc_state(crtc->state);
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
......
...@@ -183,7 +183,7 @@ static int imx_pd_register(struct drm_device *drm, ...@@ -183,7 +183,7 @@ static int imx_pd_register(struct drm_device *drm,
&imx_pd_connector_helper_funcs); &imx_pd_connector_helper_funcs);
drm_connector_init(drm, &imxpd->connector, drm_connector_init(drm, &imxpd->connector,
&imx_pd_connector_funcs, &imx_pd_connector_funcs,
DRM_MODE_CONNECTOR_VGA); DRM_MODE_CONNECTOR_DPI);
} }
if (imxpd->panel) if (imxpd->panel)
......
...@@ -249,11 +249,8 @@ EXPORT_SYMBOL_GPL(ipu_dc_enable); ...@@ -249,11 +249,8 @@ EXPORT_SYMBOL_GPL(ipu_dc_enable);
void ipu_dc_enable_channel(struct ipu_dc *dc) void ipu_dc_enable_channel(struct ipu_dc *dc)
{ {
int di;
u32 reg; u32 reg;
di = dc->di;
reg = readl(dc->base + DC_WR_CH_CONF); reg = readl(dc->base + DC_WR_CH_CONF);
reg |= DC_WR_CH_CONF_PROG_TYPE_NORMAL; reg |= DC_WR_CH_CONF_PROG_TYPE_NORMAL;
writel(reg, dc->base + DC_WR_CH_CONF); writel(reg, dc->base + DC_WR_CH_CONF);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment