Merge tag 'drm-misc-next-2017-06-15' of git://anongit.freedesktop.org/git/drm-misc...

Cross-subsystem Changes:
- dt-bindings: add vendor prefix for NLT Technologies, Ltd. (Lucas)
- dt-bindings: Add support for samsung s6e3hf2 panel (Hoegeun)

Core Changes:
- Add drm_panel_bridge to avoid connector boilerplate in drivers (Eric)
- Trival fixes for dupe forward decl and reduce scope of variable (Dawid)

Driver Changes:
- dw-hdmi: Use mode_valid hook on bridge instead of connector (Jose)
- vc4,atmel-hlcdc: Use drm_panel_bridge where appropriate (Eric)
- panel: Add Innolux P079ZCA panel driver (Chris)
- panel-simple: Add NL12880B20-05, NL192108AC18-02D, P320HVN03 panels (Lucas)
- panel-samsung-s6e3ha2: Add s6e3hf2 panel support (Hoegeun)
- zte,vc4,pl111,panel,mxsfb: Miscellaneous fixes

Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Chris Zhong <zyw@rock-chips.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Cc: Dawid Kurek <dawikur@gmail.com>
* tag 'drm-misc-next-2017-06-15' of git://anongit.freedesktop.org/git/drm-misc: (26 commits)
  drm: Reduce scope of 'state' variable
  drm: mxsfb_crtc: Reset the eLCDIF controller
  drm: Remove duplicate forward declaration
  drm/panel: s6e3ha2: Add support for s6e3hf2 panel on TM2e board
  dt-bindings: Add support for samsung s6e3hf2 panel
  drm/panel: add backlight dependency for sitronix-st7789v
  drm/panel: S6E3HA2 needs backlight code
  drm/panel: simple: add support for AUO P320HVN03
  drm/panel: simple: add support for NLT NL192108AC18-02D
  dt-bindings: add vendor prefix for NLT Technologies, Ltd.
  drm/panel: simple: add support for NEC NL12880B20-05
  drm/panel: add Innolux P079ZCA panel driver
  dt-bindings: Add INNOLUX P079ZCA panel bindings
  drm/vc4: Fix resource leak in 'vc4_get_hang_state_ioctl()' in error handling path
  drm/vc4/vc4_bo.c: always set bo->resv
  drm: Add const to name field declaration in struct drm_prop_enum_list
  drm/pl111: Fix offset calculation for the primary plane.
  drm/atmel-hlcdc: Fix panel registration
  drm/bridge: Build the panel wrapper in drm_kms_helper
  drm/atmel-hlcdc: Replace the panel usage with drm_panel_bridge.
  ...

diff --cc drivers/gpu/drm/Makefile
Simple merge

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
index 423dda2785d44fd2a900a406d7b1d86c3269d970,dfdd18763b0a8d17f917f7cb0753972abff17230..8db51fb131dbc1f258f69c0bdaf934e523acb445
--- 1/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
--- 2/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
@@@ -26,184 -27,38 +27,38 @@@
  
  #include "atmel_hlcdc_dc.h"
  
- /**
-  * Atmel HLCDC RGB connector structure
-  *
-  * This structure stores RGB slave device information.
-  *
-  * @connector: DRM connector
-  * @encoder: DRM encoder
-  * @dc: pointer to the atmel_hlcdc_dc structure
-  * @panel: panel connected on the RGB output
-  */
- struct atmel_hlcdc_rgb_output {
-       struct drm_connector connector;
-       struct drm_encoder encoder;
-       struct atmel_hlcdc_dc *dc;
-       struct drm_panel *panel;
- };
- 
- static inline struct atmel_hlcdc_rgb_output *
- drm_connector_to_atmel_hlcdc_rgb_output(struct drm_connector *connector)
- {
-       return container_of(connector, struct atmel_hlcdc_rgb_output,
-                           connector);
- }
- 
- static inline struct atmel_hlcdc_rgb_output *
- drm_encoder_to_atmel_hlcdc_rgb_output(struct drm_encoder *encoder)
- {
-       return container_of(encoder, struct atmel_hlcdc_rgb_output, encoder);
- }
- 
- static void atmel_hlcdc_rgb_encoder_enable(struct drm_encoder *encoder)
- {
-       struct atmel_hlcdc_rgb_output *rgb =
-                       drm_encoder_to_atmel_hlcdc_rgb_output(encoder);
- 
-       if (rgb->panel) {
-               drm_panel_prepare(rgb->panel);
-               drm_panel_enable(rgb->panel);
-       }
- }
- 
- static void atmel_hlcdc_rgb_encoder_disable(struct drm_encoder *encoder)
- {
-       struct atmel_hlcdc_rgb_output *rgb =
-                       drm_encoder_to_atmel_hlcdc_rgb_output(encoder);
- 
-       if (rgb->panel) {
-               drm_panel_disable(rgb->panel);
-               drm_panel_unprepare(rgb->panel);
-       }
- }
- 
- static const struct drm_encoder_helper_funcs atmel_hlcdc_panel_encoder_helper_funcs = {
-       .disable = atmel_hlcdc_rgb_encoder_disable,
-       .enable = atmel_hlcdc_rgb_encoder_enable,
- };
- 
- static void atmel_hlcdc_rgb_encoder_destroy(struct drm_encoder *encoder)
- {
-       drm_encoder_cleanup(encoder);
-       memset(encoder, 0, sizeof(*encoder));
- }
- 
  static const struct drm_encoder_funcs atmel_hlcdc_panel_encoder_funcs = {
-       .destroy = atmel_hlcdc_rgb_encoder_destroy,
- };
- 
- static int atmel_hlcdc_panel_get_modes(struct drm_connector *connector)
- {
-       struct atmel_hlcdc_rgb_output *rgb =
-                       drm_connector_to_atmel_hlcdc_rgb_output(connector);
- 
-       if (rgb->panel)
-               return rgb->panel->funcs->get_modes(rgb->panel);
- 
-       return 0;
- }
- 
- static int atmel_hlcdc_rgb_mode_valid(struct drm_connector *connector,
-                                     struct drm_display_mode *mode)
- {
-       struct atmel_hlcdc_rgb_output *rgb =
-                       drm_connector_to_atmel_hlcdc_rgb_output(connector);
- 
-       return atmel_hlcdc_dc_mode_valid(rgb->dc, mode);
- }
- 
- static const struct drm_connector_helper_funcs atmel_hlcdc_panel_connector_helper_funcs = {
-       .get_modes = atmel_hlcdc_panel_get_modes,
-       .mode_valid = atmel_hlcdc_rgb_mode_valid,
- };
- 
- static enum drm_connector_status
- atmel_hlcdc_panel_connector_detect(struct drm_connector *connector, bool force)
- {
-       struct atmel_hlcdc_rgb_output *rgb =
-                       drm_connector_to_atmel_hlcdc_rgb_output(connector);
- 
-       if (rgb->panel)
-               return connector_status_connected;
- 
-       return connector_status_disconnected;
- }
- 
- static void
- atmel_hlcdc_panel_connector_destroy(struct drm_connector *connector)
- {
-       struct atmel_hlcdc_rgb_output *rgb =
-                       drm_connector_to_atmel_hlcdc_rgb_output(connector);
- 
-       if (rgb->panel)
-               drm_panel_detach(rgb->panel);
- 
-       drm_connector_cleanup(connector);
- }
- 
- static const struct drm_connector_funcs atmel_hlcdc_panel_connector_funcs = {
-       .dpms = drm_atomic_helper_connector_dpms,
-       .detect = atmel_hlcdc_panel_connector_detect,
-       .fill_modes = drm_helper_probe_single_connector_modes,
-       .destroy = atmel_hlcdc_panel_connector_destroy,
-       .reset = drm_atomic_helper_connector_reset,
-       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+       .destroy = drm_encoder_cleanup,
  };
  
 -static int atmel_hlcdc_attach_endpoint(struct drm_device *dev,
 -                                     const struct device_node *np)
 +static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, int endpoint)
  {
-       struct atmel_hlcdc_dc *dc = dev->dev_private;
-       struct atmel_hlcdc_rgb_output *output;
+       struct drm_encoder *encoder;
        struct drm_panel *panel;
        struct drm_bridge *bridge;
        int ret;
  
-       output = devm_kzalloc(dev->dev, sizeof(*output), GFP_KERNEL);
-       if (!output)
 +      ret = drm_of_find_panel_or_bridge(dev->dev->of_node, 0, endpoint,
 +                                        &panel, &bridge);
 +      if (ret)
 +              return ret;
 +
+       encoder = devm_kzalloc(dev->dev, sizeof(*encoder), GFP_KERNEL);
+       if (!encoder)
                return -EINVAL;
  
-       output->dc = dc;
- 
-       drm_encoder_helper_add(&output->encoder,
-                              &atmel_hlcdc_panel_encoder_helper_funcs);
-       ret = drm_encoder_init(dev, &output->encoder,
+       ret = drm_encoder_init(dev, encoder,
                               &atmel_hlcdc_panel_encoder_funcs,
                               DRM_MODE_ENCODER_NONE, NULL);
        if (ret)
                return ret;
  
-       output->encoder.possible_crtcs = 0x1;
+       encoder->possible_crtcs = 0x1;
  
 -      ret = drm_of_find_panel_or_bridge(np, 0, 0, &panel, &bridge);
 -      if (ret)
 -              return ret;
 -
        if (panel) {
-               output->connector.dpms = DRM_MODE_DPMS_OFF;
-               output->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
-               drm_connector_helper_add(&output->connector,
-                               &atmel_hlcdc_panel_connector_helper_funcs);
-               ret = drm_connector_init(dev, &output->connector,
-                                        &atmel_hlcdc_panel_connector_funcs,
-                                        DRM_MODE_CONNECTOR_Unknown);
-               if (ret)
-                       goto err_encoder_cleanup;
- 
-               drm_mode_connector_attach_encoder(&output->connector,
-                                                 &output->encoder);
- 
-               ret = drm_panel_attach(panel, &output->connector);
-               if (ret) {
-                       drm_connector_cleanup(&output->connector);
-                       goto err_encoder_cleanup;
-               }
- 
-               output->panel = panel;
- 
-               return 0;
+               bridge = drm_panel_bridge_add(panel, DRM_MODE_CONNECTOR_Unknown);
+               if (IS_ERR(bridge))
+                       return PTR_ERR(bridge);
        }
  
        if (bridge) {