Merge "msm: kgsl: Add qcom,gpu-quirk-disable-lmloadkill"

diff --cc Documentation/devicetree/bindings/gpu/adreno.txt
index 44c874a,bb6fd06..8a79626
--- 1/Documentation/devicetree/bindings/gpu/adreno.txt
--- 2/Documentation/devicetree/bindings/gpu/adreno.txt
+++ b/Documentation/devicetree/bindings/gpu/adreno.txt
@@@ -154,24 -154,10 +154,27 @@@ GPU Quirks
                                detection logic
  - qcom,gpu-quirk-dp2clockgating-disable:
                                Disable RB sampler data path clock gating optimization
+ - qcom,gpu-quirk-lmloadkill-disable:
+                               Use register setting to disable local memory(LM) feature
+                               to avoid corner case error
  
 +KGSL Memory Pools:
 +- qcom,gpu-mempools:          Container for sets of GPU mempools.Multiple sets
 +                              (pools) can be defined within qcom,gpu-mempools.
 +                              Each mempool defines a pool order, reserved pages,
 +                              allocation allowed.
 +Properties:
 +- compatible:                 Must be qcom,gpu-mempools.
 +- qcom,mempool-max-pages:     Max pages for all mempools, If not defined there is no limit.
 +- qcom,gpu-mempool:           Defines a set of mempools.
 +
 +Properties:
 +- reg:                                Index of the pool (0 = lowest pool order).
 +- qcom,mempool-page-size:     Size of page.
 +- qcom,mempool-reserved:      Number of pages reserved at init time for a pool.
 +- qcom,mempool-allocate:      Allocate memory from the system memory when the
 +                              reserved pool exhausted.
 +
  The following properties are optional as collecting data via coresight might
  not be supported for every chipset. The documentation for coresight
  properties can be found in:

diff --cc drivers/gpu/msm/adreno.c
Simple merge

diff --cc drivers/gpu/msm/adreno_a5xx.c
Simple merge