Commit e627c255 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2020-11-13' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Nearly didn't send you a PR this week at all, but a few things
  trickled in over the day, not a huge amount here, some i915, amdgpu
  and a bunch of misc fixes. I have a couple of nouveau fixes
  outstanding due to the PR having the wrong base, I'll figure it out
  next week.

  amdgpu:
   - Pageflip fix for DCN3
   - Declare TA firmware for green sardine
   - Headless navi fix

  i915:
   - Pull phys pread/pwrite implementations to the backend
   - Correctly set SFC capability for video engines

  bridge:
   - cdns Kconfig fix

  hyperv_fb:
   - fix missing include

  gma500:
   - oob access fix

  mcde:
   - unbalanced regulator fix"

* tag 'drm-fixes-2020-11-13' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu: enable DCN for navi10 headless SKU
  drm/amdgpu: add ta firmware load for green-sardine
  drm/i915: Correctly set SFC capability for video engines
  drm/i915/gem: Pull phys pread/pwrite implementations to the backend
  drm/i915/gem: Allow backends to override pread implementation
  drm/mcde: Fix unbalanced regulator
  drm/gma500: Fix out-of-bounds access to struct drm_device.vblank[]
  video: hyperv_fb: include vmalloc.h
  drm: bridge: cdns: Kconfig: Switch over dependency to ARCH_K3
  drm/amd/display: Add missing pflip irq
parents 6186313d 41f3ed2c

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

+1 −2
Original line number Diff line number Diff line
@@ -492,8 +492,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

#if defined(CONFIG_DRM_AMD_DC)

		else if (amdgpu_device_has_dc_support(adev) &&

			 !nv_is_headless_sku(adev->pdev))

		else if (amdgpu_device_has_dc_support(adev))

			amdgpu_device_ip_block_add(adev, &dm_ip_block);

#endif

		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
MODULE_FIRMWARE("amdgpu/renoir_asd.bin");

MODULE_FIRMWARE("amdgpu/renoir_ta.bin");

MODULE_FIRMWARE("amdgpu/green_sardine_asd.bin");

MODULE_FIRMWARE("amdgpu/green_sardine_ta.bin");



/* address block */

#define smnMP1_FIRMWARE_FLAGS		0x3010024

drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c

+2 −2
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ irq_source_info_dcn30[DAL_IRQ_SOURCES_NUMBER] = { 
	pflip_int_entry(1),

	pflip_int_entry(2),

	pflip_int_entry(3),

	[DC_IRQ_SOURCE_PFLIP5] = dummy_irq_entry(),

	[DC_IRQ_SOURCE_PFLIP6] = dummy_irq_entry(),

	pflip_int_entry(4),

	pflip_int_entry(5),

	[DC_IRQ_SOURCE_PFLIP_UNDERLAY0] = dummy_irq_entry(),

	gpio_pad_int_entry(0),

	gpio_pad_int_entry(1),

drivers/gpu/drm/bridge/cadence/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config DRM_CDNS_MHDP8546 
if DRM_CDNS_MHDP8546



config DRM_CDNS_MHDP8546_J721E

	depends on ARCH_K3_J721E_SOC || COMPILE_TEST

	depends on ARCH_K3 || COMPILE_TEST

	bool "J721E Cadence DPI/DP wrapper support"

	default y

	help

drivers/gpu/drm/gma500/psb_irq.c

+12 −22
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ int psb_irq_postinstall(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = dev->dev_private;

	unsigned long irqflags;

	unsigned int i;



	spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
@@ -359,20 +360,12 @@ int psb_irq_postinstall(struct drm_device *dev) 
	PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);

	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);



	if (dev->vblank[0].enabled)

		psb_enable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);

	else

		psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[1].enabled)

		psb_enable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);

	else

		psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[2].enabled)

		psb_enable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);

	for (i = 0; i < dev->num_crtcs; ++i) {

		if (dev->vblank[i].enabled)

			psb_enable_pipestat(dev_priv, i, PIPE_VBLANK_INTERRUPT_ENABLE);

		else

		psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);

			psb_disable_pipestat(dev_priv, i, PIPE_VBLANK_INTERRUPT_ENABLE);

	}



	if (dev_priv->ops->hotplug_enable)

		dev_priv->ops->hotplug_enable(dev, true);
@@ -385,6 +378,7 @@ void psb_irq_uninstall(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = dev->dev_private;

	unsigned long irqflags;

	unsigned int i;



	spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
@@ -393,14 +387,10 @@ void psb_irq_uninstall(struct drm_device *dev) 


	PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);



	if (dev->vblank[0].enabled)

		psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[1].enabled)

		psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);



	if (dev->vblank[2].enabled)

		psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);

	for (i = 0; i < dev->num_crtcs; ++i) {

		if (dev->vblank[i].enabled)

			psb_disable_pipestat(dev_priv, i, PIPE_VBLANK_INTERRUPT_ENABLE);

	}



	dev_priv->vdc_irq_mask &= _PSB_IRQ_SGX_FLAG |

				  _PSB_IRQ_MSVDX_FLAG |