6 files changed, 24 insertions, 11 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3b7370d914a5..72837b8c7031 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -624,9 +624,8 @@ static bool gmc_v9_0_keep_stolen_memory(struct amdgpu_device *adev)
          */
         switch (adev->asic_type) {
         case CHIP_VEGA10:
-                return true;
         case CHIP_RAVEN:
-                return (adev->pdev->device == 0x15d8);
+                return true;
         case CHIP_VEGA12:
         case CHIP_VEGA20:
         default:
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 995f9df66142..bcb1a93c0b4c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -29,6 +29,7 @@
 #include "dm_services_types.h"
 #include "dc.h"
 #include "dc/inc/core_types.h"
+#include "dal_asic_id.h"
 
 #include "vid.h"
 #include "amdgpu.h"
@@ -640,7 +641,7 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)
 
 static int load_dmcu_fw(struct amdgpu_device *adev)
 {
-        const char *fw_name_dmcu;
+        const char *fw_name_dmcu = NULL;
         int r;
         const struct dmcu_firmware_header_v1_0 *hdr;
 
@@ -663,7 +664,14 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
         case CHIP_VEGA20:
                 return 0;
         case CHIP_RAVEN:
-                fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
+#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
+                if (ASICREV_IS_PICASSO(adev->external_rev_id))
+                        fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
+                else if (ASICREV_IS_RAVEN2(adev->external_rev_id))
+                        fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
+                else
+#endif
+                        return 0;
                 break;
         default:
                 DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
index 33854c94cb85..515515ef24f9 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
@@ -125,6 +125,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
                 return;
         etnaviv_dump_core = false;
 
+        mutex_lock(&gpu->mmu->lock);
+
         mmu_size = etnaviv_iommu_dump_size(gpu->mmu);
 
         /* We always dump registers, mmu, ring and end marker */
@@ -167,6 +169,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
         iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,
                                PAGE_KERNEL);
         if (!iter.start) {
+                mutex_unlock(&gpu->mmu->lock);
                 dev_warn(gpu->dev, "failed to allocate devcoredump file\n");
                 return;
         }
@@ -234,6 +237,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
                                          obj->base.size);
         }
 
+        mutex_unlock(&gpu->mmu->lock);
+
         etnaviv_core_dump_header(&iter, ETDUMP_BUF_END, iter.data);
 
         dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_KERNEL);
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index d7a727a6e3d7..91edfe2498a6 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -605,7 +605,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
                 active = ipu_idmac_get_current_buffer(ipu_plane->ipu_ch);
                 ipu_cpmem_set_buffer(ipu_plane->ipu_ch, !active, eba);
                 ipu_idmac_select_buffer(ipu_plane->ipu_ch, !active);
-                ipu_plane->next_buf = !active;
                 if (ipu_plane_separate_alpha(ipu_plane)) {
                         active = ipu_idmac_get_current_buffer(ipu_plane->alpha_ch);
                         ipu_cpmem_set_buffer(ipu_plane->alpha_ch, !active,
@@ -710,7 +709,6 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
         ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
         ipu_idmac_lock_enable(ipu_plane->ipu_ch, num_bursts);
         ipu_plane_enable(ipu_plane);
-        ipu_plane->next_buf = -1;
 }
 
 static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = {
@@ -732,10 +730,15 @@ bool ipu_plane_atomic_update_pending(struct drm_plane *plane)
 
         if (ipu_state->use_pre)
                 return ipu_prg_channel_configure_pending(ipu_plane->ipu_ch);
-        else if (ipu_plane->next_buf >= 0)
-                return ipu_idmac_get_current_buffer(ipu_plane->ipu_ch) !=
-                       ipu_plane->next_buf;
 
+        /*
+         * Pretend no update is pending in the non-PRE/PRG case. For this to
+         * happen, an atomic update would have to be deferred until after the
+         * start of the next frame and simultaneously interrupt latency would
+         * have to be high enough to let the atomic update finish and issue an
+         * event before the previous end of frame interrupt handler can be
+         * executed.
+         */
         return false;
 }
 int ipu_planes_assign_pre(struct drm_device *dev,
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h
index 15e85e15d35c..ffacbcdd2f98 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.h
+++ b/drivers/gpu/drm/imx/ipuv3-plane.h
@@ -27,7 +27,6 @@ struct ipu_plane {
         int                     dp_flow;
 
         bool                    disabling;
-        int                     next_buf;
 };
 
 struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
diff --git a/drivers/gpu/drm/qxl/qxl_prime.c b/drivers/gpu/drm/qxl/qxl_prime.c
index 114653b471c6..7d3816fca5a8 100644
--- a/drivers/gpu/drm/qxl/qxl_prime.c
+++ b/drivers/gpu/drm/qxl/qxl_prime.c
@@ -77,6 +77,5 @@ void qxl_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
 int qxl_gem_prime_mmap(struct drm_gem_object *obj,
                        struct vm_area_struct *area)
 {
-        WARN_ONCE(1, "not implemented");
         return -ENOSYS;
 }