Commit 22565ae7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-09-23-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular fixes for the week, i915, mediatek, hisilicon, mgag200 and
  panel have some small fixes.

  amdgpu has more stack size fixes for clang build, and fixes for new
  IPs, but all with low regression chances since they are for stuff new
  in v6.0.

  i915:
   - avoid a general protection failure when using perf/OA
   - avoid kernel warnings on driver release

  amdgpu:
   - SDMA 6.x fix
   - GPUVM TF fix
   - DCN 3.2.x fixes
   - DCN 3.1.x fixes
   - SMU 13.x fixes
   - Clang stack size fixes for recently enabled DML code
   - Fix drm dirty callback change on non-atomic cases
   - USB4 display fix

  mediatek:
   - dsi: Add atomic {destroy,duplicate}_state, reset callbacks
   - dsi: Move mtk_dsi_stop() call back to mtk_dsi_poweroff()
   - Fix wrong dither settings

  hisilicon:
   - Depend on MMU

  mgag200:
   - Fix console on G200ER

  panel:
   - Fix innolux_g121i1_l01 bus format"

* tag 'drm-fixes-2022-09-23-1' of git://anongit.freedesktop.org/drm/drm: (30 commits)
  MAINTAINERS: switch graphics to airlied other addresses
  drm/mediatek: dsi: Move mtk_dsi_stop() call back to mtk_dsi_poweroff()
  drm/amd/display: Reduce number of arguments of dml314's CalculateFlipSchedule()
  drm/amd/display: Reduce number of arguments of dml314's CalculateWatermarksAndDRAMSpeedChangeSupport()
  drm/amdgpu: don't register a dirty callback for non-atomic
  drm/amd/pm: drop the pptable related workarounds for SMU 13.0.0
  drm/amd/pm: add support for 3794 pptable for SMU13.0.0
  drm/amd/display: correct num_dsc based on HW cap
  drm/amd/display: Disable OTG WA for the plane_state NULL case on DCN314
  drm/amd/display: Add shift and mask for ICH_RESET_AT_END_OF_LINE
  drm/amd/display: increase dcn315 pstate change latency
  drm/amd/display: Fix DP MST timeslot issue when fallback happened
  drm/amd/display: Display distortion after hotplug 5K tiled display
  drm/amd/display: Update dummy P-state search to use DCN32 DML
  drm/amd/display: skip audio setup when audio stream is enabled
  drm/amd/display: update gamut remap if plane has changed
  drm/amd/display: Assume an LTTPR is always present on fixed_vs links
  drm/amd/display: fix dcn315 memory channel count and width read
  drm/amd/display: Fix double cursor on non-video RGB MPO
  drm/amd/display: Only consider pixle rate div policy for DCN32+
  ...
parents bf682942 8288206c

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -671,7 +671,8 @@ F: fs/afs/ 
F:	include/trace/events/afs.h









AGPGART DRIVER









M:	David Airlie <airlied@linux.ie>









M:	David Airlie <airlied@redhat.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm









F:	drivers/char/agp/








@@ -6753,7 +6754,7 @@ F:	Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml







F:	drivers/gpu/drm/panel/panel-widechips-ws2401.c

















DRM DRIVERS









M:	David Airlie <airlied@linux.ie>









M:	David Airlie <airlied@gmail.com>









M:	Daniel Vetter <daniel@ffwll.ch>









L:	dri-devel@lists.freedesktop.org









S:	Maintained








@@ -21567,7 +21568,7 @@ F:	drivers/gpio/gpio-virtio.c







F:	include/uapi/linux/virtio_gpio.h

















VIRTIO GPU DRIVER









M:	David Airlie <airlied@linux.ie>









M:	David Airlie <airlied@redhat.com>









M:	Gerd Hoffmann <kraxel@redhat.com>









R:	Gurchetan Singh <gurchetansingh@chromium.org>









R:	Chia-I Wu <olvaffe@gmail.com>

























drivers/gpu/drm/amd/amdgpu/amdgpu_display.c



+10
−1






























Original line number
Diff line number
Diff line







@@ -39,6 +39,7 @@







#include <linux/pm_runtime.h>









#include <drm/drm_crtc_helper.h>









#include <drm/drm_damage_helper.h>









#include <drm/drm_drv.h>









#include <drm/drm_edid.h>









#include <drm/drm_gem_framebuffer_helper.h>









#include <drm/drm_fb_helper.h>








@@ -497,6 +498,11 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,







static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {









	.destroy = drm_gem_fb_destroy,









	.create_handle = drm_gem_fb_create_handle,









};



















static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = {









	.destroy = drm_gem_fb_destroy,









	.create_handle = drm_gem_fb_create_handle,









	.dirty = drm_atomic_helper_dirtyfb,









};


















@@ -1102,6 +1108,9 @@ static int amdgpu_display_gem_fb_verify_and_init(struct drm_device *dev,







	if (ret)









		goto err;



















	if (drm_drv_uses_atomic_modeset(dev))









		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs_atomic);









	else









		ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);









	if (ret)









		goto err;
































drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -181,6 +181,9 @@ int amdgpu_mes_init(struct amdgpu_device *adev)







	for (i = 0; i < AMDGPU_MES_MAX_SDMA_PIPES; i++) {









		if (adev->ip_versions[SDMA0_HWIP][0] < IP_VERSION(6, 0, 0))









			adev->mes.sdma_hqd_mask[i] = i ? 0 : 0x3fc;









		/* zero sdma_hqd_mask for non-existent engine */









		else if (adev->sdma.num_instances == 1)









			adev->mes.sdma_hqd_mask[i] = i ? 0 : 0xfc;









		else









			adev->mes.sdma_hqd_mask[i] = 0xfc;









	}
































drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -2484,8 +2484,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,







		/* Intentionally setting invalid PTE flag









		 * combination to force a no-retry-fault









		 */









		flags = AMDGPU_PTE_EXECUTABLE | AMDGPU_PDE_PTE |









			AMDGPU_PTE_TF;









		flags = AMDGPU_PTE_SNOOPED | AMDGPU_PTE_PRT;









		value = 0;









	} else if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_NEVER) {









		/* Redirect the access to the dummy page */
































drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c



+5
−2






























Original line number
Diff line number
Diff line







@@ -1103,12 +1103,15 @@ static void gmc_v9_0_get_vm_pde(struct amdgpu_device *adev, int level,







			*flags |= AMDGPU_PDE_BFS(0x9);



















	} else if (level == AMDGPU_VM_PDB0) {









		if (*flags & AMDGPU_PDE_PTE)









		if (*flags & AMDGPU_PDE_PTE) {









			*flags &= ~AMDGPU_PDE_PTE;









		else









			if (!(*flags & AMDGPU_PTE_VALID))









				*addr |= 1 << PAGE_SHIFT;









		} else {









			*flags |= AMDGPU_PTE_TF;









		}









	}









}



















static void gmc_v9_0_get_vm_pte(struct amdgpu_device *adev,









				struct amdgpu_bo_va_mapping *mapping,