Merge drm/drm-fixes into drm-misc-fixes

We haven't backmerged for a while, let's start the -rc period by pulling
rc1.

Signed-off-by: Maxime Ripard <[email protected]>

diff --combined drivers/gpu/drm/arm/malidp_mw.c
index a59227b2cdb550368729b4810bb7f0873938eba7,22c0847986df908d2393d1611b9c6d443e51a40d..875a3a9eabfa1e08068dd265c5dbfc7cf3f36411
--- 1/drivers/gpu/drm/arm/malidp_mw.c
--- 2/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@@ -5,13 -5,14 +5,14 @@@
   *
   * ARM Mali DP Writeback connector implementation
   */
+ 
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>
- #include <drm/drm_probe_helper.h>
  #include <drm/drm_fb_cma_helper.h>
+ #include <drm/drm_fourcc.h>
  #include <drm/drm_gem_cma_helper.h>
- #include <drm/drmP.h>
+ #include <drm/drm_probe_helper.h>
  #include <drm/drm_writeback.h>
  
  #include "malidp_drv.h"
@@@ -130,7 -131,7 +131,7 @@@ malidp_mw_encoder_atomic_check(struct d
        struct drm_framebuffer *fb;
        int i, n_planes;
  
 -      if (!conn_state->writeback_job || !conn_state->writeback_job->fb)
 +      if (!conn_state->writeback_job)
                return 0;
  
        fb = conn_state->writeback_job->fb;
@@@ -247,7 -248,7 +248,7 @@@ void malidp_mw_atomic_commit(struct drm
  
        mw_state = to_mw_state(conn_state);
  
 -      if (conn_state->writeback_job && conn_state->writeback_job->fb) {
 +      if (conn_state->writeback_job) {
                struct drm_framebuffer *fb = conn_state->writeback_job->fb;
  
                DRM_DEV_DEBUG_DRIVER(drm->dev,

diff --combined drivers/gpu/drm/omapdrm/dss/dss.c
index 25b6a79dc385dfde94acdf2f013a808504eb7687,e226324adb697874631cd23f95cff68a3b7d0b39..4bdd63b5710029684ea9d9445c737d1dc71dfa9c
--- 1/drivers/gpu/drm/omapdrm/dss/dss.c
--- 2/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@@ -923,7 -923,6 +923,6 @@@ dss_debugfs_create_file(struct dss_devi
                        void *data)
  {
        struct dss_debugfs_entry *entry;
-       struct dentry *d;
  
        entry = kzalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry)
@@@ -931,15 -930,9 +930,9 @@@
  
        entry->show_fn = show_fn;
        entry->data = data;
+       entry->dentry = debugfs_create_file(name, 0444, dss->debugfs.root,
+                                           entry, &dss_debug_fops);
  
-       d = debugfs_create_file(name, 0444, dss->debugfs.root, entry,
-                               &dss_debug_fops);
-       if (IS_ERR(d)) {
-               kfree(entry);
-               return ERR_CAST(d);
-       }
- 
-       entry->dentry = d;
        return entry;
  }
  
@@@ -1090,7 -1083,7 +1083,7 @@@ static const struct dss_features omap34
  
  static const struct dss_features omap3630_dss_feats = {
        .model                  =       DSS_MODEL_OMAP3,
 -      .fck_div_max            =       32,
 +      .fck_div_max            =       31,
        .fck_freq_max           =       173000000,
        .dss_fck_multiplier     =       1,
        .parent_clk_name        =       "dpll4_ck",

diff --combined drivers/gpu/drm/vc4/vc4_txp.c
index e92fa12750343fa1770fbcc1acc1dd9ecbe829bc,1ce4d7142b6e9f1bae20b4dcc20c14692fdf61b6..bf720206727f08d3b72454133dd4e1f8d51ad909
--- 1/drivers/gpu/drm/vc4/vc4_txp.c
--- 2/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@@ -7,18 -7,20 +7,20 @@@
   *    Boris Brezillon <[email protected]>
   */
  
- #include <drm/drm_atomic_helper.h>
- #include <drm/drm_fb_cma_helper.h>
- #include <drm/drm_edid.h>
- #include <drm/drm_panel.h>
- #include <drm/drm_probe_helper.h>
- #include <drm/drm_writeback.h>
  #include <linux/clk.h>
  #include <linux/component.h>
  #include <linux/of_graph.h>
  #include <linux/of_platform.h>
  #include <linux/pm_runtime.h>
  
+ #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_edid.h>
+ #include <drm/drm_fb_cma_helper.h>
+ #include <drm/drm_fourcc.h>
+ #include <drm/drm_panel.h>
+ #include <drm/drm_probe_helper.h>
+ #include <drm/drm_writeback.h>
+ 
  #include "vc4_drv.h"
  #include "vc4_regs.h"
  
@@@ -229,7 -231,7 +231,7 @@@ static int vc4_txp_connector_atomic_che
        int i;
  
        conn_state = drm_atomic_get_new_connector_state(state, conn);
 -      if (!conn_state->writeback_job || !conn_state->writeback_job->fb)
 +      if (!conn_state->writeback_job)
                return 0;
  
        crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
@@@ -269,7 -271,8 +271,7 @@@ static void vc4_txp_connector_atomic_co
        u32 ctrl;
        int i;
  
 -      if (WARN_ON(!conn_state->writeback_job ||
 -                  !conn_state->writeback_job->fb))
 +      if (WARN_ON(!conn_state->writeback_job))
                return;
  
        mode = &conn_state->crtc->state->adjusted_mode;