1. 21 1月, 2021 8 次提交
  2. 20 1月, 2021 3 次提交
    • D
      Merge tag 'amd-drm-next-5.12-2021-01-20' of... · a6b8720c
      Daniel Vetter 提交于
      Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
      
      amd-drm-next-5.12-2021-01-20:
      
      amdgpu:
      - Fix non-x86 build
      - W=1 fixes from Lee Jones
      - Enable GPU reset on Navy Flounder
      - Kernel doc fixes
      - SMU workload profile fixes for APUs
      - Display updates
      - SR-IOV fixes
      - Vangogh SMU feature enablment and bug fixes
      - GPU reset support for Vangogh
      - Misc cleanups
      
      Conflicts:
      	drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
      
      Resolve the conflict by picking the initialization value from amd from
      f03e80d2 ("drm/amd/display: Initialize stack variable") over the
      one Linus picked in 61d79136 ("drm/amd/display: avoid
      uninitialized variable warning"). It shouldn't matter.
      
      From: Alex Deucher <alexdeucher@gmail.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20210120060951.22600-1-alexander.deucher@amd.comSigned-off-by: NDaniel Vetter <daniel.vetter@intel.com>
      a6b8720c
    • D
      Merge tag 'drm-misc-next-2021-01-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next · 71c46fc3
      Daniel Vetter 提交于
      drm-misc-next for v5.12:
      
      UAPI Changes:
      - Fix fourcc macro for amlogic video fbc.
      
      Cross-subsystem Changes:
      - Export pci_rebar_bytes_to_size.
      - Add a PCI quirk to increase bar0 for RX 5600 XT Pulse to max possible size.
      - Convert devicetree bindings to use the OF graph schema.
      - Update s6e63m0 bindings.
      - Make omapfb2 DSI_CM incompatible with drm/omap2 DSI-CM because of
        module conflicts.
      - Add Zack Rusin as vmwgfx maintainer.
      - Add CONFIG_DMABUF_DEBUG for validating dma-buf users don't loo kat struct page when importing or detaching.
      
      Core Changes:
      - Remove references to drm_device.pdev
      - Fix regression in ttm_bo_move_to_lru_tail().
      - Assorted docbook updates.
      - Do not send dp-mst hotplug events on error when probing.
      - Move some agp macros to agpsupport.c, so it's not always compiled.
      - Move drm_need_swiotlb.h to drm_cache.c
      - Only build drm_memory.o for legacy drivers, and move CONFIG_DRM_VM to legacy.
      - Nuke drm_device.hose
      - Warn when the ttm resource manager is non-empty when disabling.
      - Assorted small fixes.
      
      Driver Changes:
      - Small assorted fixes in radeon, v3d, hisilicon, mipi-dbi, panfrost, hibmc, vc4, amdgpu, vkms, vmwgfx.
      - Move hisilicon to use simple encode.
      - Add writeback connector to vkms.
      - Add support for BT2020 to DE3.
      - Use gem prime mmap helpers in vc4, and move the mmap function upwards.
      - Use managed drm device, and cleanup error paths and display registers in vmwgfx.
      - Use correct bus_format and connector_type for innolux_n116bge.
      - Fix a lot of warnings with W=1 (Lee Jones)
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/5c3ad775-48ce-33ee-e4c6-a5e1e540f845@linux.intel.com
      71c46fc3
    • H
      drm/amdgpu: fix build error without x86 kconfig (v2) · 4aef0ebc
      Huang Rui 提交于
      This patch is to fix below build error while we are using the kconfig
      without x86.
      
      drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function
      'vangogh_get_smu_metrics_data':
      drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10:
      error: 'boot_cpu_data' undeclared (first use in this function); did you
      mean 'boot_cpuid'?
        300 |          boot_cpu_data.x86_max_cores * sizeof(uint16_t));
            |          ^~~~~~~~~~~~~
            |          boot_cpuid
      drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function
      'vangogh_read_sensor':
      drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11:
      error: 'boot_cpu_data' undeclared (first use in this function); did you
      mean 'boot_cpuid'?
       1320 |   *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
            |           ^~~~~~~~~~~~~
            |           boot_cpuid
      drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function
      'vangogh_od_edit_dpm_table':
      drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19:
      error: 'boot_cpu_data' undeclared (first use in this function); did you
      mean 'boot_cpuid'?
       1460 |   if (input[0] >= boot_cpu_data.x86_max_cores) {
            |                   ^~~~~~~~~~~~~
            |                   boot_cpuid
      
      v2: fix #ifdef and add comment for APU only
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NHuang Rui <ray.huang@amd.com>
      Reviewed-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      4aef0ebc
  3. 19 1月, 2021 4 次提交
  4. 18 1月, 2021 25 次提交