Commit 595609b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2023-12-15' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "More regular fixes, amdgpu, i915, mediatek and nouveau are most of
  them this week. Nothing too major, then a few misc bits and pieces in
  core, panel and ivpu.

  drm:
   - fix uninit problems in crtc
   - fix fd ownership check
   - edid: add modes in fallback paths

  panel:
   - move LG panel into DSI yaml
   - ltk050h3146w: set burst mode

  mediatek:
   - mtk_disp_gamma: Fix breakage due to merge issue
   - fix kernel oops if no crtc is found
   - Add spinlock for setting vblank event in atomic_begin
   - Fix access violation in mtk_drm_crtc_dma_dev_get

  i915:
   - Fix selftest engine reset count storage for multi-tile
   - Fix out-of-bounds reads for engine reset counts
   - Fix ADL+ remapped stride with CCS
   - Fix intel_atomic_setup_scalers() plane_state handling
   - Fix ADL+ tiled plane stride when the POT stride is smaller than the original
   - Fix eDP 1.4 rate select method link configuration

  amdgpu:
   - Fix suspend fix that got accidently mangled last week
   - Fix OD regression
   - PSR fixes
   - OLED Backlight regression fix
   - JPEG 4.0.5 fix
   - Misc display fixes
   - SDMA 5.2 fix
   - SDMA 2.4 regression fix
   - GPUVM race fix

  nouveau:
   - fix gk20a instobj hierarchy
   - fix headless iors inheritance regression

  ivpu:
   - fix WA initialisation"

* tag 'drm-fixes-2023-12-15' of git://anongit.freedesktop.org/drm/drm: (31 commits)
  drm/nouveau/kms/nv50-: Don't allow inheritance of headless iors
  drm/nouveau: Fixup gk20a instobj hierarchy
  drm/amdgpu: warn when there are still mappings when a BO is destroyed v2
  drm/amdgpu: fix tear down order in amdgpu_vm_pt_free
  drm/amd: Fix a probing order problem on SDMA 2.4
  drm/amdgpu/sdma5.2: add begin/end_use ring callbacks
  drm/panel: ltk050h3146w: Set burst mode for ltk050h3148w
  dt-bindings: panel-simple-dsi: move LG 5" HD TFT LCD panel into DSI yaml
  drm/amd/display: Disable PSR-SU on Parade 0803 TCON again
  drm/amd/display: Populate dtbclk from bounding box
  drm/amd/display: Revert "Fix conversions between bytes and KB"
  drm/amdgpu/jpeg: configure doorbell for each playback
  drm/amd/display: Restore guard against default backlight value < 1 nit
  drm/amd/display: fix hw rotated modes when PSR-SU is enabled
  drm/amd/pm: fix pp_*clk_od typo
  drm/amdgpu: fix buffer funcs setting order on suspend harder
  drm/mediatek: Fix access violation in mtk_drm_crtc_dma_dev_get
  drm/edid: also call add modes in EDID connector update fallback
  drm/i915/edp: don't write to DP_LINK_BW_SET when using rate select
  drm/i915: Fix ADL+ tiled plane stride when the POT stride is smaller than the original
  ...
parents 3f716859 7ba84cbf

Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ properties: 
      - lg,acx467akm-7

        # LG Corporation 7" WXGA TFT LCD panel

      - lg,ld070wx3-sl01

        # LG Corporation 5" HD TFT LCD panel

      - lg,lh500wx1-sd03

        # One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel

      - osddisplays,osd101t2587-53ts

        # Panasonic 10" WUXGA TFT LCD panel

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ properties: 
      - lemaker,bl035-rgb-002

        # LG 7" (800x480 pixels) TFT LCD panel

      - lg,lb070wv8

        # LG Corporation 5" HD TFT LCD panel

      - lg,lh500wx1-sd03

        # LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel

      - lg,lp079qx1-sp0v

        # LG 9.7" (2048x1536 pixels) TFT LCD panel

drivers/accel/ivpu/ivpu_hw_37xx.c

+9 −3
Original line number Diff line number Diff line
@@ -53,10 +53,12 @@ 


#define ICB_0_1_IRQ_MASK ((((u64)ICB_1_IRQ_MASK) << 32) | ICB_0_IRQ_MASK)



#define BUTTRESS_IRQ_MASK ((REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE)) | \

			   (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, ATS_ERR)) | \

#define BUTTRESS_IRQ_MASK ((REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, ATS_ERR)) | \

			   (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, UFI_ERR)))



#define BUTTRESS_ALL_IRQ_MASK (BUTTRESS_IRQ_MASK | \

			       (REG_FLD(VPU_37XX_BUTTRESS_INTERRUPT_STAT, FREQ_CHANGE)))



#define BUTTRESS_IRQ_ENABLE_MASK ((u32)~BUTTRESS_IRQ_MASK)

#define BUTTRESS_IRQ_DISABLE_MASK ((u32)-1)
@@ -74,8 +76,12 @@ static void ivpu_hw_wa_init(struct ivpu_device *vdev) 
	vdev->wa.clear_runtime_mem = false;

	vdev->wa.d3hot_after_power_off = true;



	if (ivpu_device_id(vdev) == PCI_DEVICE_ID_MTL && ivpu_revision(vdev) < 4)

	REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, BUTTRESS_ALL_IRQ_MASK);

	if (REGB_RD32(VPU_37XX_BUTTRESS_INTERRUPT_STAT) == BUTTRESS_ALL_IRQ_MASK) {

		/* Writing 1s does not clear the interrupt status register */

		vdev->wa.interrupt_clear_with_0 = true;

		REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, 0x0);

	}



	IVPU_PRINT_WA(punit_disabled);

	IVPU_PRINT_WA(clear_runtime_mem);

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

+0 −2
Original line number Diff line number Diff line
@@ -4516,8 +4516,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 


	amdgpu_ras_suspend(adev);



	amdgpu_ttm_set_buffer_funcs_status(adev, false);



	amdgpu_device_ip_suspend_phase1(adev);



	if (!adev->in_s0ix)

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

+2 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) 


	abo = ttm_to_amdgpu_bo(bo);



	WARN_ON(abo->vm_bo);



	if (abo->kfd_bo)

		amdgpu_amdkfd_release_notify(abo);