Commit 4940c154 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2023-10-06' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular weekly pull, all seems pretty normal, i915 and amdgpu mostly.

  There is one small new uAPI addition for nouveau but getting it in now
  avoids a bunch of userspace dances, and it's for a userspace that
  hasn't yet released, so should have no side effects.

  i915:
   - Fix for OpenGL CTS regression on Compute Shaders
   - Fix for default engines initialization
   - Fix TLB invalidation for Multi-GT devices

  amdgpu:
   - Add missing unique_id for GC 11.0.3
   - Fix memory leak in FRU error path
   - Fix PCIe link reporting on some SMU 11 parts
   - Fix ACPI _PR3 detection
   - Fix DISPCLK WDIVIDER handling in OTG code

  tests:
   - Fix kunit release

  panel:
   - panel-orientation: Add quirk for One Mix 25

  nouveau:
   - Report IB limit via getparams
   - Replace some magic numbers with constants
   - small clean up"

* tag 'drm-fixes-2023-10-06' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: apply edge-case DISPCLK WDIVIDER changes to master OTG pipes only
  drm/amd: Fix detection of _PR3 on the PCIe root port
  drm/amd: Fix logic error in sienna_cichlid_update_pcie_parameters()
  drm/amdgpu: Fix a memory leak
  drm/amd/pm: add unique_id for gc 11.0.3
  drm/i915: Invalidate the TLBs on each GT
  drm/i915: Register engines early to avoid type confusion
  drm/i915: Don't set PIPE_CONTROL_FLUSH_L3 for aux inval
  drm/nouveau: exec: report max pushs through getparam
  drm/nouveau: chan: use channel class definitions
  drm/nouveau: chan: use struct nvif_mclass
  drm: panel-orientation-quirks: Add quirk for One Mix 2S
  drm/tests: Fix kunit_release_action ctx argument
parents b78b18fb 67f35a41

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

+1 −1
Original line number Diff line number Diff line
@@ -2093,7 +2093,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
		adev->flags |= AMD_IS_PX;



	if (!(adev->flags & AMD_IS_APU)) {

		parent = pci_upstream_bridge(adev->pdev);

		parent = pcie_find_root_port(adev->pdev);

		adev->has_pr3 = parent ? pci_pr3_present(parent) : false;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
		csum += pia[size - 1];

	if (csum) {

		DRM_ERROR("Bad Product Info Area checksum: 0x%02x", csum);

		kfree(pia);

		return -EIO;

	}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr, struct 
			int32_t N;

			int32_t j;



			if (!pipe_ctx->stream)

			if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))

				continue;

			/* Virtual encoders don't have this function */

			if (!stream_enc->funcs->get_fifo_cal_average_level)
@@ -188,7 +188,7 @@ void dcn20_update_clocks_update_dentist(struct clk_mgr_internal *clk_mgr, struct 
			int32_t N;

			int32_t j;



			if (!pipe_ctx->stream)

			if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))

				continue;

			/* Virtual encoders don't have this function */

			if (!stream_enc->funcs->get_fifo_cal_average_level)

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static void dcn32_update_clocks_update_dentist( 
			int32_t N;

			int32_t j;



			if (!pipe_ctx->stream)

			if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))

				continue;

			/* Virtual encoders don't have this function */

			if (!stream_enc->funcs->get_fifo_cal_average_level)
@@ -401,7 +401,7 @@ static void dcn32_update_clocks_update_dentist( 
			int32_t N;

			int32_t j;



			if (!pipe_ctx->stream)

			if (!resource_is_pipe_type(pipe_ctx, OTG_MASTER))

				continue;

			/* Virtual encoders don't have this function */

			if (!stream_enc->funcs->get_fifo_cal_average_level)

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -2040,6 +2040,7 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ 
		case IP_VERSION(11, 0, 0):

		case IP_VERSION(11, 0, 1):

		case IP_VERSION(11, 0, 2):

		case IP_VERSION(11, 0, 3):

			*states = ATTR_STATE_SUPPORTED;

			break;

		default: