Merge branch 'backlight-rework' into drm-intel-next-queued

Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c
index dd6e9688fbef..bdeb65ed3658 100644
--- a/drivers/gpu/drm/radeon/ni_dma.c
+++ b/drivers/gpu/drm/radeon/ni_dma.c
@@ -24,6 +24,7 @@
 #include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
+#include "radeon_trace.h"
 #include "nid.h"
 
 u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev);
@@ -245,8 +246,7 @@ bool cayman_dma_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring)
  * @addr: dst addr to write into pe
  * @count: number of page entries to update
  * @incr: increase next addr by incr bytes
- * @flags: access flags
- * @r600_flags: hw access flags 
+ * @flags: hw access flags 
  *
  * Update the page tables using the DMA (cayman/TN).
  */
@@ -256,11 +256,12 @@ void cayman_dma_vm_set_page(struct radeon_device *rdev,
                             uint64_t addr, unsigned count,
                             uint32_t incr, uint32_t flags)
 {
-        uint32_t r600_flags = cayman_vm_page_flags(rdev, flags);
         uint64_t value;
         unsigned ndw;
 
-        if ((flags & RADEON_VM_PAGE_SYSTEM) || (count == 1)) {
+        trace_radeon_vm_set_page(pe, addr, count, incr, flags);
+
+        if ((flags & R600_PTE_SYSTEM) || (count == 1)) {
                 while (count) {
                         ndw = count * 2;
                         if (ndw > 0xFFFFE)
@@ -271,16 +272,16 @@ void cayman_dma_vm_set_page(struct radeon_device *rdev,
                         ib->ptr[ib->length_dw++] = pe;
                         ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
                         for (; ndw > 0; ndw -= 2, --count, pe += 8) {
-                                if (flags & RADEON_VM_PAGE_SYSTEM) {
+                                if (flags & R600_PTE_SYSTEM) {
                                         value = radeon_vm_map_gart(rdev, addr);
                                         value &= 0xFFFFFFFFFFFFF000ULL;
-                                } else if (flags & RADEON_VM_PAGE_VALID) {
+                                } else if (flags & R600_PTE_VALID) {
                                         value = addr;
                                 } else {
                                         value = 0;
                                 }
                                 addr += incr;
-                                value |= r600_flags;
+                                value |= flags;
                                 ib->ptr[ib->length_dw++] = value;
                                 ib->ptr[ib->length_dw++] = upper_32_bits(value);
                         }
@@ -291,7 +292,7 @@ void cayman_dma_vm_set_page(struct radeon_device *rdev,
                         if (ndw > 0xFFFFE)
                                 ndw = 0xFFFFE;
 
-                        if (flags & RADEON_VM_PAGE_VALID)
+                        if (flags & R600_PTE_VALID)
                                 value = addr;
                         else
                                 value = 0;
@@ -299,7 +300,7 @@ void cayman_dma_vm_set_page(struct radeon_device *rdev,
                         ib->ptr[ib->length_dw++] = DMA_PTE_PDE_PACKET(ndw);
                         ib->ptr[ib->length_dw++] = pe; /* dst addr */
                         ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
-                        ib->ptr[ib->length_dw++] = r600_flags; /* mask */
+                        ib->ptr[ib->length_dw++] = flags; /* mask */
                         ib->ptr[ib->length_dw++] = 0;
                         ib->ptr[ib->length_dw++] = value; /* value */
                         ib->ptr[ib->length_dw++] = upper_32_bits(value);