Merge airlied/drm-next into drm-misc-next

Refresh -misc-next

Signed-off-by: Sean Paul <seanpaul@chromium.org>

1 files changed, 24 insertions, 11 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index ba4335fd4f65..2337d4bfd85c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -73,9 +73,11 @@
  * - 3.21.0 - Add DRM_AMDGPU_FENCE_TO_HANDLE ioctl
  * - 3.22.0 - Add DRM_AMDGPU_SCHED ioctl
  * - 3.23.0 - Add query for VRAM lost counter
+ * - 3.24.0 - Add high priority compute support for gfx9
+ * - 3.25.0 - Add support for sensor query info (stable pstate sclk/mclk).
  */
 #define KMS_DRIVER_MAJOR        3
-#define KMS_DRIVER_MINOR        23
+#define KMS_DRIVER_MINOR        25
 #define KMS_DRIVER_PATCHLEVEL   0
 
 int amdgpu_vram_limit = 0;
@@ -119,7 +121,7 @@ uint amdgpu_pg_mask = 0xffffffff;
 uint amdgpu_sdma_phase_quantum = 32;
 char *amdgpu_disable_cu = NULL;
 char *amdgpu_virtual_display = NULL;
-uint amdgpu_pp_feature_mask = 0xffffffff;
+uint amdgpu_pp_feature_mask = 0xffffbfff;
 int amdgpu_ngg = 0;
 int amdgpu_prim_buf_per_se = 0;
 int amdgpu_pos_buf_per_se = 0;
@@ -129,6 +131,7 @@ int amdgpu_job_hang_limit = 0;
 int amdgpu_lbpw = -1;
 int amdgpu_compute_multipipe = -1;
 int amdgpu_gpu_recovery = -1; /* auto */
+int amdgpu_emu_mode = 0;
 
 MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes");
 module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
@@ -281,9 +284,12 @@ module_param_named(lbpw, amdgpu_lbpw, int, 0444);
 MODULE_PARM_DESC(compute_multipipe, "Force compute queues to be spread across pipes (1 = enable, 0 = disable, -1 = auto)");
 module_param_named(compute_multipipe, amdgpu_compute_multipipe, int, 0444);
 
-MODULE_PARM_DESC(gpu_recovery, "Enable GPU recovery mechanism, (1 = enable, 0 = disable, -1 = auto");
+MODULE_PARM_DESC(gpu_recovery, "Enable GPU recovery mechanism, (1 = enable, 0 = disable, -1 = auto)");
 module_param_named(gpu_recovery, amdgpu_gpu_recovery, int, 0444);
 
+MODULE_PARM_DESC(emu_mode, "Emulation mode, (1 = enable, 0 = disable)");
+module_param_named(emu_mode, amdgpu_emu_mode, int, 0444);
+
 #ifdef CONFIG_DRM_AMDGPU_SI
 
 #if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE)
@@ -576,6 +582,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
         struct drm_device *dev;
         unsigned long flags = ent->driver_data;
         int ret, retry = 0;
+        bool supports_atomic = false;
+
+        if (!amdgpu_virtual_display &&
+            amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK))
+                supports_atomic = true;
 
         if ((flags & AMD_EXP_HW_SUPPORT) && !amdgpu_exp_hw_support) {
                 DRM_INFO("This hardware requires experimental hardware support.\n"
@@ -596,6 +607,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
         if (ret)
                 return ret;
 
+        /* warn the user if they mix atomic and non-atomic capable GPUs */
+        if ((kms_driver.driver_features & DRIVER_ATOMIC) && !supports_atomic)
+                DRM_ERROR("Mixing atomic and non-atomic capable GPUs!\n");
+        /* support atomic early so the atomic debugfs stuff gets created */
+        if (supports_atomic)
+                kms_driver.driver_features |= DRIVER_ATOMIC;
+
         dev = drm_dev_alloc(&kms_driver, &pdev->dev);
         if (IS_ERR(dev))
                 return PTR_ERR(dev);
@@ -833,8 +851,8 @@ amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
                                  ktime_t *stime, ktime_t *etime,
                                  const struct drm_display_mode *mode)
 {
-        return amdgpu_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
-                                          stime, etime, mode);
+        return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
+                                                  stime, etime, mode);
 }
 
 static struct drm_driver kms_driver = {
@@ -852,9 +870,6 @@ static struct drm_driver kms_driver = {
         .disable_vblank = amdgpu_disable_vblank_kms,
         .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
         .get_scanout_position = amdgpu_get_crtc_scanout_position,
-        .irq_preinstall = amdgpu_irq_preinstall,
-        .irq_postinstall = amdgpu_irq_postinstall,
-        .irq_uninstall = amdgpu_irq_uninstall,
         .irq_handler = amdgpu_irq_handler,
         .ioctls = amdgpu_ioctls_kms,
         .gem_free_object_unlocked = amdgpu_gem_object_free,
@@ -867,9 +882,7 @@ static struct drm_driver kms_driver = {
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
         .gem_prime_export = amdgpu_gem_prime_export,
-        .gem_prime_import = drm_gem_prime_import,
-        .gem_prime_pin = amdgpu_gem_prime_pin,
-        .gem_prime_unpin = amdgpu_gem_prime_unpin,
+        .gem_prime_import = amdgpu_gem_prime_import,
         .gem_prime_res_obj = amdgpu_gem_prime_res_obj,
         .gem_prime_get_sg_table = amdgpu_gem_prime_get_sg_table,
         .gem_prime_import_sg_table = amdgpu_gem_prime_import_sg_table,