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

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

Pull drm fixes from Dave Airlie:
 "Things are quieting down as expected, just a small set of fixes, i915,
  exynos, amdgpu, vrr, bridge and hdlcd. Nothing scary at all.

  i915:
   - Fix GuC SLPC unset command
   - Fix misidentification of some Apple MacBook Pro laptops as Jasper Lake

  amdgpu:
   - Suspend regression fix

  exynos:
   - irq handling fixes
   - Fix two regressions to TE-gpio handling

  arm/hdlcd:
   - Select DRM_GEM_CMEA_HELPER for HDLCD

  bridge:
   - ti-sn65dsi86: Properly undo autosuspend

  vrr:
   - Fix potential NULL-pointer deref"

* tag 'drm-fixes-2022-03-04' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu: fix suspend/resume hang regression
  drm/vrr: Set VRR capable prop only if it is attached to connector
  drm/arm: arm hdlcd select DRM_GEM_CMA_HELPER
  drm/bridge: ti-sn65dsi86: Properly undo autosuspend
  drm/i915: s/JSP2/ICP2/ PCH
  drm/i915/guc/slpc: Correct the param count for unset param
  drm/exynos: Search for TE-gpio in DSI panel's node
  drm/exynos: Don't fail if no TE-gpio is defined for DSI driver
  drm/exynos: gsc: Use platform_get_irq() to get the interrupt
  drm/exynos/fimc: Use platform_get_irq() to get the interrupt
  drm/exynos/exynos_drm_fimd: Use platform_get_irq_byname() to get the interrupt
  drm/exynos: mixer: Use platform_get_irq() to get the interrupt
  drm/exynos/exynos7_drm_decon: Use platform_get_irq_byname() to get the interrupt
parents 0b7344a6 8fdb1967

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

+2 −1
Original line number Diff line number Diff line
@@ -777,7 +777,8 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm) 
	amdgpu_vm_eviction_lock(vm);

	ret = !vm->evicting;

	amdgpu_vm_eviction_unlock(vm);

	return ret;



	return ret && list_empty(&vm->evicted);

}



/**

drivers/gpu/drm/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config DRM_HDLCD 
	depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)

	depends on COMMON_CLK

	select DRM_KMS_HELPER

	select DRM_GEM_CMA_HELPER

	help

	  Choose this option if you have an ARM High Definition Colour LCD

	  controller.

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+3 −2
Original line number Diff line number Diff line
@@ -1802,6 +1802,7 @@ static inline void ti_sn_gpio_unregister(void) {} 


static void ti_sn65dsi86_runtime_disable(void *data)

{

	pm_runtime_dont_use_autosuspend(data);

	pm_runtime_disable(data);

}
@@ -1861,11 +1862,11 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, 
				     "failed to get reference clock\n");



	pm_runtime_enable(dev);

	pm_runtime_set_autosuspend_delay(pdata->dev, 500);

	pm_runtime_use_autosuspend(pdata->dev);

	ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);

	if (ret)

		return ret;

	pm_runtime_set_autosuspend_delay(pdata->dev, 500);

	pm_runtime_use_autosuspend(pdata->dev);



	ti_sn65dsi86_debugfs_init(pdata);

drivers/gpu/drm/drm_connector.c

+3 −0
Original line number Diff line number Diff line
@@ -2330,6 +2330,9 @@ EXPORT_SYMBOL(drm_connector_atomic_hdr_metadata_equal); 
void drm_connector_set_vrr_capable_property(

		struct drm_connector *connector, bool capable)

{

	if (!connector->vrr_capable_property)

		return;



	drm_object_property_set_value(&connector->base,

				      connector->vrr_capable_property,

				      capable);

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+3 −9
Original line number Diff line number Diff line
@@ -678,7 +678,6 @@ static int decon_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct decon_context *ctx;

	struct device_node *i80_if_timings;

	struct resource *res;

	int ret;



	if (!dev->of_node)
@@ -728,16 +727,11 @@ static int decon_probe(struct platform_device *pdev) 
		goto err_iounmap;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,

					   ctx->i80_if ? "lcd_sys" : "vsync");

	if (!res) {

		dev_err(dev, "irq request failed.\n");

		ret = -ENXIO;

	ret =  platform_get_irq_byname(pdev, ctx->i80_if ? "lcd_sys" : "vsync");

	if (ret < 0)

		goto err_iounmap;

	}



	ret = devm_request_irq(dev, res->start, decon_irq_handler,

							0, "drm_decon", ctx);

	ret = devm_request_irq(dev, ret, decon_irq_handler, 0, "drm_decon", ctx);

	if (ret) {

		dev_err(dev, "irq request failed.\n");

		goto err_iounmap;