Commit 5133c9e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2023-07-07' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Lots of fixes, mostly i915 and amdgpu. It's two weeks of i915, and I
  think three weeks of amdgpu.

  fbdev:
   - Fix module infos on sparc

  panel:
   - Fix mode on Starry-ili9882t

  i915:
   - Allow DC states along with PW2 only for PWB functionality [adlp+]
   - Fix SSC selection for MPLLA [mtl]
   - Use hw.adjusted mode when calculating io/fast wake times [psr]
   - Apply min softlimit correctly [guc/slpc]
   - Assign correct hdcp content type [hdcp]
   - Add missing forward declarations/includes to display power headers
   - Fix BDW PSR AUX CH data register offsets [psr]
   - Use mock device info for creating mock device

  amdgpu:
   - Misc cleanups
   - GFX 9.4.3 fixes
   - DEBUGFS build fix
   - Fix LPDDR5 reporting
   - ASPM fixes
   - DCN 3.1.4 fixes
   - DP MST fixes
   - DCN 3.2.x fixes
   - Display PSR TCON fixes
   - SMU 13.x fixes
   - RAS fixes
   - Vega12/20 SMU fixes
   - PSP flashing cleanup
   - GFX9 MCBP fixes
   - SR-IOV fixes
   - GPUVM clear mappings fix for always valid BOs
   - Add FAMS quirk for problematic monitor
   - Fix possible UAF
   - Better handle monentary temperature fluctuations
   - SDMA 4.4.2 fixes
   - Fencing fix"

* tag 'drm-next-2023-07-07' of git://anongit.freedesktop.org/drm/drm: (83 commits)
  drm/i915: use mock device info for creating mock device
  drm/i915/psr: Fix BDW PSR AUX CH data register offsets
  drm/amdgpu: Fix potential fence use-after-free v2
  drm/amd/pm: avoid unintentional shutdown due to temperature momentary fluctuation
  drm/amd/pm: expose swctf threshold setting for legacy powerplay
  drm/amd/display: 3.2.241
  drm/amd/display: Take full update path if number of planes changed
  drm/amd/display: Create debugging mechanism for Gaming FAMS
  drm/amd/display: Add monitor specific edid quirk
  drm/amd/display: For new fast update path, loop through each surface
  drm/amd/display: Remove Phantom Pipe Check When Calculating K1 and K2
  drm/amd/display: Limit new fast update path to addr and gamma / color
  drm/amd/display: Fix the delta clamping for shaper LUT
  drm/amdgpu: Keep non-psp path for partition switch
  drm/amd/display: program DPP shaper and 3D LUT if updated
  Revert "drm/amd/display: edp do not add non-edid timings"
  drm/amdgpu: share drm device for pci amdgpu device with 1st partition device
  drm/amd/pm: Add GFX v9.4.3 unique id to sysfs
  drm/amd/pm: Enable pp_feature attribute
  drm/amdgpu/vcn: Need to unpause dpg before stop dpg
  ...
parents 94e0d43e 6725f332

arch/sparc/video/fbdev.c

+3 −0
Original line number Diff line number Diff line
@@ -21,3 +21,6 @@ int fb_is_primary_device(struct fb_info *info) 
	return 0;

}

EXPORT_SYMBOL(fb_is_primary_device);



MODULE_DESCRIPTION("Sparc fbdev helpers");

MODULE_LICENSE("GPL");

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+7 −3
Original line number Diff line number Diff line
@@ -286,6 +286,9 @@ extern int amdgpu_user_partt_mode; 
#define AMDGPU_SMARTSHIFT_MAX_BIAS (100)

#define AMDGPU_SMARTSHIFT_MIN_BIAS (-100)



/* Extra time delay(in ms) to eliminate the influence of temperature momentary fluctuation */

#define AMDGPU_SWCTF_EXTRA_DELAY		50



struct amdgpu_xcp_mgr;

struct amdgpu_device;

struct amdgpu_irq_src;
@@ -1277,9 +1280,10 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 


#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));



#define BIT_MASK_UPPER(i) ((i) >= BITS_PER_LONG ? 0 : ~0UL << (i))

#define for_each_inst(i, inst_mask)        \

	for (i = ffs(inst_mask) - 1; inst_mask;                                \

	     inst_mask &= ~(1U << i), i = ffs(inst_mask) - 1)

	for (i = ffs(inst_mask); i-- != 0; \

	     i = ffs(inst_mask & BIT_MASK_UPPER(i + 1)))



#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))

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

+9 −0
Original line number Diff line number Diff line
@@ -1791,6 +1791,15 @@ const struct attribute_group amdgpu_vbios_version_attr_group = { 
	.attrs = amdgpu_vbios_version_attrs

};



int amdgpu_atombios_sysfs_init(struct amdgpu_device *adev)

{

	if (adev->mode_info.atom_context)

		return devm_device_add_group(adev->dev,

					     &amdgpu_vbios_version_attr_group);



	return 0;

}



/**

 * amdgpu_atombios_fini - free the driver info and callbacks for atombios

 *

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h

+1 −0
Original line number Diff line number Diff line
@@ -217,5 +217,6 @@ int amdgpu_atombios_get_data_table(struct amdgpu_device *adev, 


void amdgpu_atombios_fini(struct amdgpu_device *adev);

int amdgpu_atombios_init(struct amdgpu_device *adev);

int amdgpu_atombios_sysfs_init(struct amdgpu_device *adev);



#endif

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

+12 −6
Original line number Diff line number Diff line
@@ -327,10 +327,13 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
					mem_channel_number = igp_info->v11.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					/* channel width is 64 */

					if (vram_width)

						*vram_width = mem_channel_number * 64;

					mem_type = igp_info->v11.memorytype;

					if (mem_type == LpDdr5MemType)

						mem_channel_width = 32;

					else

						mem_channel_width = 64;

					if (vram_width)

						*vram_width = mem_channel_number * mem_channel_width;

					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;
@@ -345,10 +348,13 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
					mem_channel_number = igp_info->v21.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					/* channel width is 64 */

					if (vram_width)

						*vram_width = mem_channel_number * 64;

					mem_type = igp_info->v21.memorytype;

					if (mem_type == LpDdr5MemType)

						mem_channel_width = 32;

					else

						mem_channel_width = 64;

					if (vram_width)

						*vram_width = mem_channel_number * mem_channel_width;

					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;