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

Merge tag 'drm-fixes-2022-06-17' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular drm fixes for rc3. Nothing too serious, i915, amdgpu and
  exynos all have a few small driver fixes, and two ttm fixes, and one
  compiler warning.

  atomic:
   - fix spurious compiler warning

  ttm:
   - add NULL ptr check in swapout code
   - fix bulk move handling

  i915:
   - Fix page fault on error state read
   - Fix memory leaks in per-gt sysfs
   - Fix multiple fence handling
   - Remove accidental static from a local variable

  amdgpu:
   - Fix regression in GTT size reporting
   - OLED backlight fix

  exynos:
   - Check a null pointer instead of IS_ERR()
   - Rework initialization code of Exynos MIC driver"

* tag 'drm-fixes-2022-06-17' of git://anongit.freedesktop.org/drm/drm:
  drm/amd/display: Cap OLED brightness per max frame-average luminance
  drm/amdgpu: Fix GTT size reporting in amdgpu_ioctl
  drm/exynos: mic: Rework initialization
  drm/exynos: fix IS_ERR() vs NULL check in probe
  drm/ttm: fix bulk move handling v2
  drm/i915/uc: remove accidental static from a local variable
  drm/i915: Individualize fences before adding to dma_resv obj
  drm/i915/gt: Fix memory leaks in per-gt sysfs
  drm/i915/reset: Fix error_state_read ptr + offset use
  drm/ttm: fix missing NULL check in ttm_device_swapout
  drm/atomic: fix warning of unused variable
parents 0639b599 65cf7c02

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

+0 −2
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			    atomic64_read(&adev->visible_pin_size),

			    vram_gtt.vram_size);

		vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;

		vram_gtt.gtt_size *= PAGE_SIZE;

		vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);

		return copy_to_user(out, &vram_gtt,

				    min((size_t)size, sizeof(vram_gtt))) ? -EFAULT : 0;
@@ -675,7 +674,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;



		mem.gtt.total_heap_size = gtt_man->size;

		mem.gtt.total_heap_size *= PAGE_SIZE;

		mem.gtt.usable_heap_size = mem.gtt.total_heap_size -

			atomic64_read(&adev->gart_pin_size);

		mem.gtt.heap_usage = ttm_resource_manager_usage(gtt_man);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −4
Original line number Diff line number Diff line
@@ -2812,7 +2812,7 @@ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = { 


static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)

{

	u32 max_cll, min_cll, max, min, q, r;

	u32 max_avg, min_cll, max, min, q, r;

	struct amdgpu_dm_backlight_caps *caps;

	struct amdgpu_display_manager *dm;

	struct drm_connector *conn_base;
@@ -2842,7 +2842,7 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) 
	caps = &dm->backlight_caps[i];

	caps->ext_caps = &aconnector->dc_link->dpcd_sink_ext_caps;

	caps->aux_support = false;

	max_cll = conn_base->hdr_sink_metadata.hdmi_type1.max_cll;

	max_avg = conn_base->hdr_sink_metadata.hdmi_type1.max_fall;

	min_cll = conn_base->hdr_sink_metadata.hdmi_type1.min_cll;



	if (caps->ext_caps->bits.oled == 1 /*||
@@ -2870,8 +2870,8 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) 
	 * The results of the above expressions can be verified at

	 * pre_computed_values.

	 */

	q = max_cll >> 5;

	r = max_cll % 32;

	q = max_avg >> 5;

	r = max_avg % 32;

	max = (1 << q) * pre_computed_values[r];



	// min luminance: maxLum * (CV/255)^2 / 100

drivers/gpu/drm/exynos/exynos_drm_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -176,15 +176,15 @@ static struct exynos_drm_driver_info exynos_drm_drivers[] = { 
	}, {

		DRV_PTR(mixer_driver, CONFIG_DRM_EXYNOS_MIXER),

		DRM_COMPONENT_DRIVER

	}, {

		DRV_PTR(mic_driver, CONFIG_DRM_EXYNOS_MIC),

		DRM_COMPONENT_DRIVER

	}, {

		DRV_PTR(dp_driver, CONFIG_DRM_EXYNOS_DP),

		DRM_COMPONENT_DRIVER

	}, {

		DRV_PTR(dsi_driver, CONFIG_DRM_EXYNOS_DSI),

		DRM_COMPONENT_DRIVER

	}, {

		DRV_PTR(mic_driver, CONFIG_DRM_EXYNOS_MIC),

		DRM_COMPONENT_DRIVER

	}, {

		DRV_PTR(hdmi_driver, CONFIG_DRM_EXYNOS_HDMI),

		DRM_COMPONENT_DRIVER

drivers/gpu/drm/exynos/exynos_drm_mic.c

+12 −30
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <drm/drm_print.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_crtc.h"



/* Sysreg registers for MIC */

#define DSD_CFG_MUX	0x1004
@@ -100,9 +101,7 @@ struct exynos_mic { 


	bool i80_mode;

	struct videomode vm;

	struct drm_encoder *encoder;

	struct drm_bridge bridge;

	struct drm_bridge *next_bridge;



	bool enabled;

};
@@ -229,8 +228,6 @@ static void mic_set_reg_on(struct exynos_mic *mic, bool enable) 
	writel(reg, mic->reg + MIC_OP);

}



static void mic_disable(struct drm_bridge *bridge) { }



static void mic_post_disable(struct drm_bridge *bridge)

{

	struct exynos_mic *mic = bridge->driver_private;
@@ -297,34 +294,30 @@ static void mic_pre_enable(struct drm_bridge *bridge) 
	mutex_unlock(&mic_mutex);

}



static void mic_enable(struct drm_bridge *bridge) { }



static int mic_attach(struct drm_bridge *bridge,

		      enum drm_bridge_attach_flags flags)

{

	struct exynos_mic *mic = bridge->driver_private;



	return drm_bridge_attach(bridge->encoder, mic->next_bridge,

				 &mic->bridge, flags);

}



static const struct drm_bridge_funcs mic_bridge_funcs = {

	.disable = mic_disable,

	.post_disable = mic_post_disable,

	.mode_set = mic_mode_set,

	.pre_enable = mic_pre_enable,

	.enable = mic_enable,

	.attach = mic_attach,

};



static int exynos_mic_bind(struct device *dev, struct device *master,

			   void *data)

{

	struct exynos_mic *mic = dev_get_drvdata(dev);

	struct drm_device *drm_dev = data;

	struct exynos_drm_crtc *crtc = exynos_drm_crtc_get_by_type(drm_dev,

						       EXYNOS_DISPLAY_TYPE_LCD);

	struct drm_encoder *e, *encoder = NULL;



	drm_for_each_encoder(e, drm_dev)

		if (e->possible_crtcs == drm_crtc_mask(&crtc->base))

			encoder = e;

	if (!encoder)

		return -ENODEV;



	mic->bridge.driver_private = mic;



	return 0;

	return drm_bridge_attach(encoder, &mic->bridge, NULL, 0);

}



static void exynos_mic_unbind(struct device *dev, struct device *master,
@@ -388,7 +381,6 @@ static int exynos_mic_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct exynos_mic *mic;

	struct device_node *remote;

	struct resource res;

	int ret, i;
@@ -432,16 +424,6 @@ static int exynos_mic_probe(struct platform_device *pdev) 
		}

	}



	remote = of_graph_get_remote_node(dev->of_node, 1, 0);

	mic->next_bridge = of_drm_find_bridge(remote);

	if (IS_ERR(mic->next_bridge)) {

		DRM_DEV_ERROR(dev, "mic: Failed to find next bridge\n");

		ret = PTR_ERR(mic->next_bridge);

		goto err;

	}



	of_node_put(remote);



	platform_set_drvdata(pdev, mic);



	mic->bridge.funcs = &mic_bridge_funcs;

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+2 −1
Original line number Diff line number Diff line
@@ -999,7 +999,8 @@ static int eb_validate_vmas(struct i915_execbuffer *eb) 
			}

		}



		err = dma_resv_reserve_fences(vma->obj->base.resv, 1);

		/* Reserve enough slots to accommodate composite fences */

		err = dma_resv_reserve_fences(vma->obj->base.resv, eb->num_batches);

		if (err)

			return err;