Merge pull request #32 from kitakar5525/backport/v4.19-surface-devel

Backporting 5.3/5.4 changes into 4.19
linux-surface · Jan 21, 2020 · b959e95 · b959e95
2 parents 2cd8f54 + 69ea9ac
commit b959e95
Show file tree

Hide file tree

Showing 120 changed files with 5,814 additions and 27,338 deletions.
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -4697,7 +4697,7 @@ static const struct file_operations i915_fifo_underrun_reset_ops = {
 };
 
 static ssize_t
-i915_intel_ipts_cleanup_write(struct file *filp,
+i915_ipts_cleanup_write(struct file *filp,
  const char __user *ubuf,
  size_t cnt, loff_t *ppos)
 {
@@ -4713,20 +4713,20 @@ i915_intel_ipts_cleanup_write(struct file *filp,
  if (!flag)
  return cnt;
 
- intel_ipts_cleanup(dev);
+ ipts_cleanup(dev);
 
  return cnt;
 }
 
-static const struct file_operations i915_intel_ipts_cleanup_ops = {
+static const struct file_operations i915_ipts_cleanup_ops = {
  .owner = THIS_MODULE,
  .open = simple_open,
- .write = i915_intel_ipts_cleanup_write,
+ .write = i915_ipts_cleanup_write,
  .llseek = default_llseek,
 };
 
 static ssize_t
-i915_intel_ipts_init_write(struct file *filp,
+i915_ipts_init_write(struct file *filp,
  const char __user *ubuf,
  size_t cnt, loff_t *ppos)
 {
@@ -4742,15 +4742,15 @@ i915_intel_ipts_init_write(struct file *filp,
  if (!flag)
  return cnt;
 
- intel_ipts_init(dev);
+ ipts_init(dev);
 
  return cnt;
 }
 
-static const struct file_operations i915_intel_ipts_init_ops = {
+static const struct file_operations i915_ipts_init_ops = {
  .owner = THIS_MODULE,
  .open = simple_open,
- .write = i915_intel_ipts_init_write,
+ .write = i915_ipts_init_write,
  .llseek = default_llseek,
 };
 
@@ -4833,8 +4833,8 @@ static const struct i915_debugfs_files {
  {"i915_ipc_status", &i915_ipc_status_fops},
  {"i915_drrs_ctl", &i915_drrs_ctl_fops},
  {"i915_edp_psr_debug", &i915_edp_psr_debug_fops},
- {"i915_intel_ipts_cleanup", &i915_intel_ipts_cleanup_ops},
- {"i915_intel_ipts_init", &i915_intel_ipts_init_ops},
+ {"i915_ipts_cleanup", &i915_ipts_cleanup_ops},
+ {"i915_ipts_init", &i915_ipts_init_ops},
 };
 
 int i915_debugfs_register(struct drm_i915_private *dev_priv)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
@@ -47,13 +47,13 @@
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"
-#include "i915_trace.h"
 #include "i915_pmu.h"
 #include "i915_query.h"
+#include "i915_trace.h"
 #include "i915_vgpu.h"
 #include "intel_drv.h"
-#include "intel_uc.h"
 #include "intel_ipts.h"
+#include "intel_uc.h"
 
 static struct drm_driver driver;
 
@@ -698,7 +698,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
  intel_hpd_init(dev_priv);
 
  if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
- intel_ipts_init(dev);
+ ipts_init(dev);
 
  return 0;
 
@@ -1443,7 +1443,7 @@ void i915_driver_unload(struct drm_device *dev)
  struct pci_dev *pdev = dev_priv->drm.pdev;
 
  if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
- intel_ipts_cleanup(dev);
+ ipts_cleanup(dev);
 
  i915_driver_unregister(dev_priv);
 

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
@@ -1505,7 +1505,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir)
  }
 
  if (iir & GT_RENDER_PIPECTL_NOTIFY_INTERRUPT && i915_modparams.enable_ipts)
- intel_ipts_notify_complete();
+ ipts_notify_complete();
 
  if (tasklet)
  tasklet_hi_schedule(&engine->execlists.tasklet);

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
@@ -2634,8 +2634,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)
  return;
 
  if (mode != DRM_MODE_DPMS_ON) {
- //if (downstream_hpd_needs_d0(intel_dp))
- // return;
+ if (downstream_hpd_needs_d0(intel_dp))
+ return;
 
  ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
  DP_SET_POWER_D3);