From: Dave Airlie <airlied@redhat.com>
Date: Wed, 28 Sep 2016 01:17:26 +0000 (+1000)
Subject: Merge tag 'tilcdc-4.9-3.1' of https://github.com/jsarha/linux into drm-next
X-Git-Tag: v4.9-rc1~41^2~18
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=662d5c957161802e2f26317bfe02108fdb215706;p=linux-2.6-block.git

Merge tag 'tilcdc-4.9-3.1' of https://github.com/jsarha/linux into drm-next

Second attempt for 3rd drm/tilcdc pull request for v4.9.

* tag 'tilcdc-4.9-3.1' of https://github.com/jsarha/linux:
  drm/tilcdc: fix wrong error handling
  drm/tilcdc: Return directly after a failed kfree_table_init() in tilcdc_convert_slave_node()
  drm/tilcdc: Remove "default" from blue-and-red-wiring property binding
  drm/tilcdc: Fix non static symbol warning
  drm/tilcdc: mark symbols static where possible
  drm/tilcdc: add missing header dependencies
  drm/tilcdc: WARN if CRTC is touched without CRTC lock
  drm/tilcdc: Take CRTC lock when calling tilcdc_crtc_disable()
  drm/tilcdc: Remove unnecessary tilcdc_crtc_disable() from tilcdc_unload()
  drm/tilcdc: Flush flip-work workqueue before drm_flip_work_cleanup()
  drm/tilcdc: Clean up LCDC functional clock rate setting code
  drm/tilcdc: Take crtc modeset lock while updating the crtc clock rate
---

662d5c957161802e2f26317bfe02108fdb215706
diff --cc drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index cb9df104fe5b,639821fb27b7..52ebe8fc1784
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@@ -15,11 -15,10 +15,12 @@@
   * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
 -#include "drm_flip_work.h"
 -#include <drm/drm_plane_helper.h>
 +#include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
 +#include <drm/drm_crtc.h>
 +#include <drm/drm_flip_work.h>
 +#include <drm/drm_plane_helper.h>
+ #include <linux/workqueue.h>
  
  #include "tilcdc_drv.h"
  #include "tilcdc_regs.h"