Merge tag 'drm-misc-next-2020-06-26' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Tue, 30 Jun 2020 04:03:38 +0000 (14:03 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 30 Jun 2020 04:04:00 +0000 (14:04 +1000)
drm-misc-next for v5.9:

Cross-subsystem Changes:
- Improve dma-buf docs.

Core Changes:
- Add NV15, Q410, Q401 yuv formats.
- Add uncompressed AFBC modifier.
- Add DP helepr for reading Ignore MSA from DPCD.
- Add missing panel type for some panels
- Optimize drm/mm hole handling.
- Constify connector to infoframe functions.
- Add debugfs for VRR monitor range.

Driver Changes:
- Assorted small bugfixes in panfrost, malidp, panel/otm8009a.
- Convert tfp410 dt bindings to yaml, and rework time calculations.
- Add support for a few more simple panels.
- Cleanups and optimizations for ast.
- Allow adv7511 and simple-bridge to be used without connector creation.
- Cleanups to dw-hdmi function prototypes.
- Remove enabled bool from tiny/repaper and mipi-dbi, atomic handles it.
- Remove unused header file from dw-mipi-dsi
- Begin removing ttm_bo->offset.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b1e53620-7937-895c-bfcf-ed208be59c7c@linux.intel.com
12 files changed:
1  2 
drivers/dma-buf/dma-buf.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
drivers/gpu/drm/ast/ast_mode.c
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/meson/meson_dw_hdmi.c
include/drm/drm_dp_helper.h
include/uapi/drm/drm_fourcc.h

Simple merge
index 8d9c6feba660b58c9fd6fd6aa37a8b69831364fd,2a7a6f62d627e17c011b48ec8d327da6ac777523..f138e6aa4c2bf6f5f552e73bee53d2b4c5b48a7e
@@@ -144,8 -141,8 +144,8 @@@ static void amdgpu_vm_sdma_copy_ptes(st
  
        src += p->num_dw_left * 4;
  
-       pe += amdgpu_gmc_sign_extend(bo->tbo.offset);
+       pe += amdgpu_bo_gpu_offset_no_check(bo);
 -      trace_amdgpu_vm_copy_ptes(pe, src, count, p->direct);
 +      trace_amdgpu_vm_copy_ptes(pe, src, count, p->immediate);
  
        amdgpu_vm_copy_pte(p->adev, ib, pe, src, count);
  }
@@@ -171,8 -168,8 +171,8 @@@ static void amdgpu_vm_sdma_set_ptes(str
  {
        struct amdgpu_ib *ib = p->job->ibs;
  
-       pe += amdgpu_gmc_sign_extend(bo->tbo.offset);
+       pe += amdgpu_bo_gpu_offset_no_check(bo);
 -      trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->direct);
 +      trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->immediate);
        if (count < 3) {
                amdgpu_vm_write_pte(p->adev, ib, pe, addr | flags,
                                    count, incr);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge