Commit 028192fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-04-15' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Eggs season holidays are among us, and I think I'd expect some smaller
  pulls for two weeks then.

  This seems eerily quiet. One i915 fix, amdgpu has a bunch and msm. I
  didn't see a misc pull this week, so I expect that will catch up next
  week.

  i915:
   - Correct legacy mmap disabling to use GRAPHICS_VER_FULL

  msm:
   - system suspend fix
   - kzalloc return checks
   - misc display fix
   - iommu_present removal

  amdgpu:
   - Fix for alpha properly in pre-multiplied mode
   - Fix VCN 3.1.2 firmware name
   - Suspend/resume fix
   - Add a gfxoff quirk for Mac vega20 board
   - DCN 3.1.6 spread spectrum fix"

* tag 'drm-fixes-2022-04-15' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: remove dtbclk_ss compensation for dcn316
  drm/amdgpu: Enable gfxoff quirk on MacBook Pro
  drm/amdgpu: Ensure HDA function is suspended before ASIC reset
  drm/amdgpu: fix VCN 3.1.2 firmware name
  drm/amd/display: don't ignore alpha property on pre-multiplied mode
  drm/msm/gpu: Avoid -Wunused-function with !CONFIG_PM_SLEEP
  drm/msm/dp: add fail safe mode outside of event_mutex context
  drm/msm/dsi: Use connector directly in msm_dsi_manager_connector_init()
  drm/msm: Stop using iommu_present()
  drm/msm/mdp5: check the return of kzalloc()
  drm/msm: Fix range size vs end confusion
  drm/i915: Sunset igpu legacy mmap support based on GRAPHICS_VER_FULL
  drm/msm/dpu: Use indexed array initializer to prevent mismatches
  drm/msm/disp: check the return value of kzalloc()
  dt-bindings: display/msm: another fix for the dpu-qcm2290 example
  drm/msm: Add missing put_task_struct() in debugfs path
  drm/msm/gpu: Remove mutex from wait_event condition
  drm/msm/gpu: Park scheduler threads for system suspend
  drm/msm/gpu: Rename runtime suspend/resume functions
parents 38a5e3fb 8e401ff5

Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ examples: 
    mdss: mdss@5e00000 {

        #address-cells = <1>;

        #size-cells = <1>;

        compatible = "qcom,qcm2290-mdss", "qcom,mdss";

        compatible = "qcom,qcm2290-mdss";

        reg = <0x05e00000 0x1000>;

        reg-names = "mdss";

        power-domains = <&dispcc MDSS_GDSC>;
@@ -180,7 +180,7 @@ examples: 
                 <&apps_smmu 0x421 0x0>;

        ranges;



        mdss_mdp: mdp@5e01000 {

        mdss_mdp: display-controller@5e01000 {

                compatible = "qcom,qcm2290-dpu";

                reg = <0x05e01000 0x8f000>,

                      <0x05eb0000 0x2008>;

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

+12 −6
Original line number Diff line number Diff line
@@ -2323,18 +2323,23 @@ static int amdgpu_pmops_suspend(struct device *dev) 
{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);

	int r;



	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = true;

	else

		adev->in_s3 = true;

	r = amdgpu_device_suspend(drm_dev, true);

	if (r)

		return r;

	return amdgpu_device_suspend(drm_dev, true);

}



static int amdgpu_pmops_suspend_noirq(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);



	if (!adev->in_s0ix)

		r = amdgpu_asic_reset(adev);

	return r;

		return amdgpu_asic_reset(adev);



	return 0;

}



static int amdgpu_pmops_resume(struct device *dev)
@@ -2575,6 +2580,7 @@ static const struct dev_pm_ops amdgpu_pm_ops = { 
	.prepare = amdgpu_pmops_prepare,

	.complete = amdgpu_pmops_complete,

	.suspend = amdgpu_pmops_suspend,

	.suspend_noirq = amdgpu_pmops_suspend_noirq,

	.resume = amdgpu_pmops_resume,

	.freeze = amdgpu_pmops_freeze,

	.thaw = amdgpu_pmops_thaw,

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define FIRMWARE_ALDEBARAN	"amdgpu/aldebaran_vcn.bin"

#define FIRMWARE_BEIGE_GOBY	"amdgpu/beige_goby_vcn.bin"

#define FIRMWARE_YELLOW_CARP	"amdgpu/yellow_carp_vcn.bin"

#define FIRMWARE_VCN_3_1_2	"amdgpu/vcn_3_1_2_vcn.bin"

#define FIRMWARE_VCN_3_1_2	"amdgpu/vcn_3_1_2.bin"



MODULE_FIRMWARE(FIRMWARE_RAVEN);

MODULE_FIRMWARE(FIRMWARE_PICASSO);

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

+2 −0
Original line number Diff line number Diff line
@@ -1205,6 +1205,8 @@ static const struct amdgpu_gfxoff_quirk amdgpu_gfxoff_quirk_list[] = { 
	{ 0x1002, 0x15dd, 0x103c, 0x83e7, 0xd3 },

	/* GFXOFF is unstable on C6 parts with a VBIOS 113-RAVEN-114 */

	{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc6 },

	/* Apple MacBook Pro (15-inch, 2019) Radeon Pro Vega 20 4 GB */

	{ 0x1002, 0x69af, 0x106b, 0x019a, 0xc0 },

	{ 0, 0, 0, 0, 0 },

};

drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ void dce_clock_read_ss_info(struct clk_mgr_internal *clk_mgr_dce) 
				clk_mgr_dce->dprefclk_ss_percentage =

						info.spread_spectrum_percentage;

			}

			if (clk_mgr_dce->base.ctx->dc->debug.ignore_dpref_ss)

			if (clk_mgr_dce->base.ctx->dc->config.ignore_dpref_ss)

				clk_mgr_dce->dprefclk_ss_percentage = 0;

		}

	}