9 files changed, 68 insertions, 123 deletions

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index b0487c9f018c..eb603f1defc2 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -873,9 +873,10 @@ static void drm_dp_destroy_port(struct kref *kref)
                    from an EDID retrieval */
                 if (port->connector) {
                         mutex_lock(&mgr->destroy_connector_lock);
-                        list_add(&port->connector->destroy_list, &mgr->destroy_connector_list);
+                        list_add(&port->next, &mgr->destroy_connector_list);
                         mutex_unlock(&mgr->destroy_connector_lock);
                         schedule_work(&mgr->destroy_connector_work);
+                        return;
                 }
                 drm_dp_port_teardown_pdt(port, port->pdt);
 
@@ -2659,7 +2660,7 @@ static void drm_dp_tx_work(struct work_struct *work)
 static void drm_dp_destroy_connector_work(struct work_struct *work)
 {
         struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, destroy_connector_work);
-        struct drm_connector *connector;
+        struct drm_dp_mst_port *port;
 
         /*
          * Not a regular list traverse as we have to drop the destroy
@@ -2668,15 +2669,21 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
          */
         for (;;) {
                 mutex_lock(&mgr->destroy_connector_lock);
-                connector = list_first_entry_or_null(&mgr->destroy_connector_list, struct drm_connector, destroy_list);
-                if (!connector) {
+                port = list_first_entry_or_null(&mgr->destroy_connector_list, struct drm_dp_mst_port, next);
+                if (!port) {
                         mutex_unlock(&mgr->destroy_connector_lock);
                         break;
                 }
-                list_del(&connector->destroy_list);
+                list_del(&port->next);
                 mutex_unlock(&mgr->destroy_connector_lock);
 
-                mgr->cbs->destroy_connector(mgr, connector);
+                mgr->cbs->destroy_connector(mgr, port->connector);
+
+                drm_dp_port_teardown_pdt(port, port->pdt);
+
+                if (!port->input && port->vcpi.vcpi > 0)
+                        drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
+                kfree(port);
         }
 }
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 842d6b8dc3c4..2a652359af64 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -1745,7 +1745,6 @@ static int fimc_probe(struct platform_device *pdev)
         spin_lock_init(&ctx->lock);
         platform_set_drvdata(pdev, ctx);
 
-        pm_runtime_set_active(dev);
         pm_runtime_enable(dev);
 
         ret = exynos_drm_ippdrv_register(ippdrv);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 8040ed2a831f..f1c6b76c127f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -593,8 +593,7 @@ static int gsc_src_set_transf(struct device *dev,
 
         gsc_write(cfg, GSC_IN_CON);
 
-        ctx->rotation = cfg &
-                (GSC_IN_ROT_90 | GSC_IN_ROT_270) ? 1 : 0;
+        ctx->rotation = (cfg & GSC_IN_ROT_90) ? 1 : 0;
         *swap = ctx->rotation;
 
         return 0;
@@ -857,8 +856,7 @@ static int gsc_dst_set_transf(struct device *dev,
 
         gsc_write(cfg, GSC_IN_CON);
 
-        ctx->rotation = cfg &
-                (GSC_IN_ROT_90 | GSC_IN_ROT_270) ? 1 : 0;
+        ctx->rotation = (cfg & GSC_IN_ROT_90) ? 1 : 0;
         *swap = ctx->rotation;
 
         return 0;
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 99e286489031..4a00990e4ae4 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1064,6 +1064,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
 {
         struct hdmi_context *hdata = ctx_from_connector(connector);
         struct edid *edid;
+        int ret;
 
         if (!hdata->ddc_adpt)
                 return -ENODEV;
@@ -1079,7 +1080,11 @@ static int hdmi_get_modes(struct drm_connector *connector)
 
         drm_mode_connector_update_edid_property(connector, edid);
 
-        return drm_add_edid_modes(connector, edid);
+        ret = drm_add_edid_modes(connector, edid);
+
+        kfree(edid);
+
+        return ret;
 }
 
 static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index cae98db33062..4706b56902b4 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -718,6 +718,10 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg)
 
         /* handling VSYNC */
         if (val & MXR_INT_STATUS_VSYNC) {
+                /* vsync interrupt use different bit for read and clear */
+                val |= MXR_INT_CLEAR_VSYNC;
+                val &= ~MXR_INT_STATUS_VSYNC;
+
                 /* interlace scan need to check shadow register */
                 if (ctx->interlace) {
                         base = mixer_reg_read(res, MXR_GRAPHIC_BASE(0));
@@ -743,11 +747,6 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg)
 
 out:
         /* clear interrupts */
-        if (~val & MXR_INT_EN_VSYNC) {
-                /* vsync interrupt use different bit for read and clear */
-                val &= ~MXR_INT_EN_VSYNC;
-                val |= MXR_INT_CLEAR_VSYNC;
-        }
         mixer_reg_write(res, MXR_INT_STATUS, val);
 
         spin_unlock(&res->reg_slock);
@@ -907,8 +906,8 @@ static int mixer_enable_vblank(struct exynos_drm_crtc *crtc)
         }
 
         /* enable vsync interrupt */
-        mixer_reg_writemask(res, MXR_INT_EN, MXR_INT_EN_VSYNC,
-                        MXR_INT_EN_VSYNC);
+        mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC);
+        mixer_reg_writemask(res, MXR_INT_EN, ~0, MXR_INT_EN_VSYNC);
 
         return 0;
 }
@@ -918,7 +917,13 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc)
         struct mixer_context *mixer_ctx = crtc->ctx;
         struct mixer_resources *res = &mixer_ctx->mixer_res;
 
+        if (!mixer_ctx->powered) {
+                mixer_ctx->int_en &= MXR_INT_EN_VSYNC;
+                return;
+        }
+
         /* disable vsync interrupt */
+        mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC);
         mixer_reg_writemask(res, MXR_INT_EN, 0, MXR_INT_EN_VSYNC);
 }
 
@@ -1047,6 +1052,8 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
 
         mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);
 
+        if (ctx->int_en & MXR_INT_EN_VSYNC)
+                mixer_reg_writemask(res, MXR_INT_STATUS, ~0, MXR_INT_CLEAR_VSYNC);
         mixer_reg_write(res, MXR_INT_EN, ctx->int_en);
         mixer_win_reset(ctx);
 }
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 7ed8033aae60..8e35e0d013df 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -129,8 +129,9 @@ int intel_atomic_commit(struct drm_device *dev,
                         struct drm_atomic_state *state,
                         bool async)
 {
-        int ret;
-        int i;
+        struct drm_crtc_state *crtc_state;
+        struct drm_crtc *crtc;
+        int ret, i;
 
         if (async) {
                 DRM_DEBUG_KMS("i915 does not yet support async commit\n");
@@ -142,48 +143,18 @@ int intel_atomic_commit(struct drm_device *dev,
                 return ret;
 
         /* Point of no return */
-
-        /*
-         * FIXME:  The proper sequence here will eventually be:
-         *
-         * drm_atomic_helper_swap_state(dev, state)
-         * drm_atomic_helper_commit_modeset_disables(dev, state);
-         * drm_atomic_helper_commit_planes(dev, state);
-         * drm_atomic_helper_commit_modeset_enables(dev, state);
-         * drm_atomic_helper_wait_for_vblanks(dev, state);
-         * drm_atomic_helper_cleanup_planes(dev, state);
-         * drm_atomic_state_free(state);
-         *
-         * once we have full atomic modeset.  For now, just manually update
-         * plane states to avoid clobbering good states with dummy states
-         * while nuclear pageflipping.
-         */
-        for (i = 0; i < dev->mode_config.num_total_plane; i++) {
-                struct drm_plane *plane = state->planes[i];
-
-                if (!plane)
-                        continue;
-
-                plane->state->state = state;
-                swap(state->plane_states[i], plane->state);
-                plane->state->state = NULL;
-        }
+        drm_atomic_helper_swap_state(dev, state);
 
         /* swap crtc_scaler_state */
-        for (i = 0; i < dev->mode_config.num_crtc; i++) {
-                struct drm_crtc *crtc = state->crtcs[i];
-                if (!crtc) {
-                        continue;
-                }
-
-                to_intel_crtc(crtc)->config->scaler_state =
-                        to_intel_crtc_state(state->crtc_states[i])->scaler_state;
+        for_each_crtc_in_state(state, crtc, crtc_state, i) {
+                to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);
 
                 if (INTEL_INFO(dev)->gen >= 9)
                         skl_detach_scalers(to_intel_crtc(crtc));
+
+                drm_atomic_helper_commit_planes_on_crtc(crtc_state);
         }
 
-        drm_atomic_helper_commit_planes(dev, state);
         drm_atomic_helper_wait_for_vblanks(dev, state);
         drm_atomic_helper_cleanup_planes(dev, state);
         drm_atomic_state_free(state);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 30e0f54ba19d..87476ff181dd 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11826,7 +11826,9 @@ encoder_retry:
                 goto encoder_retry;
         }
 
-        pipe_config->dither = pipe_config->pipe_bpp != base_bpp;
+        /* Dithering seems to not pass-through bits correctly when it should, so
+         * only enable it on 6bpc panels. */
+        pipe_config->dither = pipe_config->pipe_bpp == 6*3;
         DRM_DEBUG_KMS("plane bpp: %i, pipe bpp: %i, dithering: %i\n",
                       base_bpp, pipe_config->pipe_bpp, pipe_config->dither);
 
@@ -12624,17 +12626,17 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc,
 
         modeset_update_crtc_power_domains(state);
 
-        drm_atomic_helper_commit_planes(dev, state);
-
         /* Now enable the clocks, plane, pipe, and connectors that we set up. */
         for_each_crtc_in_state(state, crtc, crtc_state, i) {
-                if (!needs_modeset(crtc->state) || !crtc->state->enable)
+                if (!needs_modeset(crtc->state) || !crtc->state->enable) {
+                        drm_atomic_helper_commit_planes_on_crtc(crtc_state);
                         continue;
+                }
 
                 update_scanline_offset(to_intel_crtc(crtc));
 
                 dev_priv->display.crtc_enable(crtc);
-                intel_crtc_enable_planes(crtc);
+                drm_atomic_helper_commit_planes_on_crtc(crtc_state);
         }
 
         /* FIXME: add subpixel order */
@@ -12891,20 +12893,11 @@ intel_modeset_stage_output_state(struct drm_device *dev,
         return 0;
 }
 
-static bool primary_plane_visible(struct drm_crtc *crtc)
-{
-        struct intel_plane_state *plane_state =
-                to_intel_plane_state(crtc->primary->state);
-
-        return plane_state->visible;
-}
-
 static int intel_crtc_set_config(struct drm_mode_set *set)
 {
         struct drm_device *dev;
         struct drm_atomic_state *state = NULL;
         struct intel_crtc_state *pipe_config;
-        bool primary_plane_was_visible;
         int ret;
 
         BUG_ON(!set);
@@ -12943,38 +12936,8 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
 
         intel_update_pipe_size(to_intel_crtc(set->crtc));
 
-        primary_plane_was_visible = primary_plane_visible(set->crtc);
-
         ret = intel_set_mode_with_config(set->crtc, pipe_config, true);
 
-        if (ret == 0 &&
-            pipe_config->base.enable &&
-            pipe_config->base.planes_changed &&
-            !needs_modeset(&pipe_config->base)) {
-                struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc);
-
-                /*
-                 * We need to make sure the primary plane is re-enabled if it
-                 * has previously been turned off.
-                 */
-                if (ret == 0 && !primary_plane_was_visible &&
-                    primary_plane_visible(set->crtc)) {
-                        WARN_ON(!intel_crtc->active);
-                        intel_post_enable_primary(set->crtc);
-                }
-
-                /*
-                 * In the fastboot case this may be our only check of the
-                 * state after boot.  It would be better to only do it on
-                 * the first update, but we don't have a nice way of doing that
-                 * (and really, set_config isn't used much for high freq page
-                 * flipping, so increasing its cost here shouldn't be a big
-                 * deal).
-                 */
-                if (i915.fastboot && ret == 0)
-                        intel_modeset_check_state(set->crtc->dev);
-        }
-
         if (ret) {
                 DRM_DEBUG_KMS("failed to set mode on [CRTC:%d], err = %d\n",
                               set->crtc->base.id, ret);
@@ -13305,6 +13268,9 @@ intel_check_primary_plane(struct drm_plane *plane,
                          */
                         if (IS_BROADWELL(dev))
                                 intel_crtc->atomic.wait_vblank = true;
+
+                        if (crtc_state)
+                                intel_crtc->atomic.post_enable_primary = true;
                 }
 
                 /*
@@ -13317,6 +13283,10 @@ intel_check_primary_plane(struct drm_plane *plane,
                 if (!state->visible || !fb)
                         intel_crtc->atomic.disable_ips = true;
 
+                if (!state->visible && old_state->visible &&
+                    crtc_state && !needs_modeset(&crtc_state->base))
+                        intel_crtc->atomic.pre_disable_primary = true;
+
                 intel_crtc->atomic.fb_bits |=
                         INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
 
@@ -15034,6 +15004,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                 struct intel_plane_state *plane_state;
 
                 memset(crtc->config, 0, sizeof(*crtc->config));
+                crtc->config->base.crtc = &crtc->base;
 
                 crtc->config->quirks |= PIPE_CONFIG_QUIRK_INHERITED_MODE;
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
index 52c22b026005..e10f9644140f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -166,30 +166,14 @@ gk104_fifo_context_attach(struct nvkm_object *parent,
 }
 
 static int
-gk104_fifo_chan_kick(struct gk104_fifo_chan *chan)
-{
-        struct nvkm_object *obj = (void *)chan;
-        struct gk104_fifo_priv *priv = (void *)obj->engine;
-
-        nv_wr32(priv, 0x002634, chan->base.chid);
-        if (!nv_wait(priv, 0x002634, 0x100000, 0x000000)) {
-                nv_error(priv, "channel %d [%s] kick timeout\n",
-                         chan->base.chid, nvkm_client_name(chan));
-                return -EBUSY;
-        }
-
-        return 0;
-}
-
-static int
 gk104_fifo_context_detach(struct nvkm_object *parent, bool suspend,
                           struct nvkm_object *object)
 {
         struct nvkm_bar *bar = nvkm_bar(parent);
+        struct gk104_fifo_priv *priv = (void *)parent->engine;
         struct gk104_fifo_base *base = (void *)parent->parent;
         struct gk104_fifo_chan *chan = (void *)parent;
         u32 addr;
-        int ret;
 
         switch (nv_engidx(object->engine)) {
         case NVDEV_ENGINE_SW    : return 0;
@@ -204,9 +188,13 @@ gk104_fifo_context_detach(struct nvkm_object *parent, bool suspend,
                 return -EINVAL;
         }
 
-        ret = gk104_fifo_chan_kick(chan);
-        if (ret && suspend)
-                return ret;
+        nv_wr32(priv, 0x002634, chan->base.chid);
+        if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
+                nv_error(priv, "channel %d [%s] kick timeout\n",
+                         chan->base.chid, nvkm_client_name(chan));
+                if (suspend)
+                        return -EBUSY;
+        }
 
         if (addr) {
                 nv_wo32(base, addr + 0x00, 0x00000000);
@@ -331,7 +319,6 @@ gk104_fifo_chan_fini(struct nvkm_object *object, bool suspend)
                 gk104_fifo_runlist_update(priv, chan->engine);
         }
 
-        gk104_fifo_chan_kick(chan);
         nv_wr32(priv, 0x800000 + (chid * 8), 0x00000000);
         return nvkm_fifo_channel_fini(&chan->base, suspend);
 }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 654c8daeb5ab..97ad3bcb99a7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -2492,7 +2492,7 @@ int vmw_execbuf_process(struct drm_file *file_priv,
         ret = ttm_eu_reserve_buffers(&ticket, &sw_context->validate_nodes,
                                      true, NULL);
         if (unlikely(ret != 0))
-                goto out_err;
+                goto out_err_nores;
 
         ret = vmw_validate_buffers(dev_priv, sw_context);
         if (unlikely(ret != 0))
@@ -2536,6 +2536,7 @@ int vmw_execbuf_process(struct drm_file *file_priv,
         vmw_resource_relocations_free(&sw_context->res_relocations);
 
         vmw_fifo_commit(dev_priv, command_size);
+        mutex_unlock(&dev_priv->binding_mutex);
 
         vmw_query_bo_switch_commit(dev_priv, sw_context);
         ret = vmw_execbuf_fence_commands(file_priv, dev_priv,
@@ -2551,7 +2552,6 @@ int vmw_execbuf_process(struct drm_file *file_priv,
                 DRM_ERROR("Fence submission error. Syncing.\n");
 
         vmw_resource_list_unreserve(&sw_context->resource_list, false);
-        mutex_unlock(&dev_priv->binding_mutex);
 
         ttm_eu_fence_buffer_objects(&ticket, &sw_context->validate_nodes,
                                     (void *) fence);