From: Sean Paul <seanpaul@chromium.org>
Date: Wed, 22 May 2019 20:08:21 +0000 (-0400)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=374ed5429346a021c8e2d26fafce14c5b15dedd0;p=openwrt%2Fstaging%2Fblogic.git

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

Backmerging 5.2-rc1 to -misc-next for robher

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

374ed5429346a021c8e2d26fafce14c5b15dedd0
diff --cc Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
index abaca05b6267,1b1a74129141..2658b8ec1d83
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
@@@ -43,9 -37,21 +43,24 @@@ Optional properties
  - operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt
    for details.
  
 +- #cooling-cells: Refer to Documentation/devicetree/bindings/thermal/thermal.txt
 +  for details.
 +
+ - resets : Phandle of the GPU reset line.
+ 
+ Vendor-specific bindings
+ ------------------------
+ 
+ The Mali GPU is integrated very differently from one SoC to
+ another. In order to accomodate those differences, you have the option
+ to specify one more vendor-specific compatible, among:
+ 
+ - "amlogic,meson-gxm-mali"
+   Required properties:
+   - resets : Should contain phandles of :
+     + GPU reset line
+     + GPU APB glue reset line
+ 
  Example for a Mali-T760:
  
  gpu@ffa30000 {
diff --cc drivers/gpu/drm/scheduler/sched_main.c
index 10d1d37e644a,a1bec2779e76..cf596fc0355b
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@@ -349,21 -366,16 +349,20 @@@ void drm_sched_increase_karma(struct dr
  EXPORT_SYMBOL(drm_sched_increase_karma);
  
  /**
-  * drm_sched_hw_job_reset - stop the scheduler if it contains the bad job
+  * drm_sched_stop - stop the scheduler
   *
   * @sched: scheduler instance
-  * @bad: bad scheduler job
   *
 + * Stop the scheduler and also removes and frees all completed jobs.
 + * Note: bad job will not be freed as it might be used later and so it's
 + * callers responsibility to release it manually if it's not part of the
 + * mirror list any more.
 + *
   */
 -void drm_sched_stop(struct drm_gpu_scheduler *sched)
 +void drm_sched_stop(struct drm_gpu_scheduler *sched, struct drm_sched_job *bad)
  {
 -	struct drm_sched_job *s_job;
 +	struct drm_sched_job *s_job, *tmp;
  	unsigned long flags;
 -	struct dma_fence *last_fence =  NULL;
  
  	kthread_park(sched->thread);