Commit b34c1d53 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2022-09-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * edid: Fix EDID 1.4 range-descriptor parsing
 * panfrost: Fix devfreq OPP
 * ttm: Fix ghost-object bulk moves

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YxniKN4rK4qPp+J9@linux-uq9g
parents c0521598 d76034a4

drivers/gpu/drm/drm_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ static int vrr_range_show(struct seq_file *m, void *data) 
	if (connector->status != connector_status_connected)

		return -ENODEV;



	seq_printf(m, "Min: %u\n", (u8)connector->display_info.monitor_range.min_vfreq);

	seq_printf(m, "Max: %u\n", (u8)connector->display_info.monitor_range.max_vfreq);

	seq_printf(m, "Min: %u\n", connector->display_info.monitor_range.min_vfreq);

	seq_printf(m, "Max: %u\n", connector->display_info.monitor_range.max_vfreq);



	return 0;

}

drivers/gpu/drm/drm_edid.c

+18 −6
Original line number Diff line number Diff line
@@ -5971,12 +5971,14 @@ static void drm_parse_cea_ext(struct drm_connector *connector, 
}



static

void get_monitor_range(const struct detailed_timing *timing,

		       void *info_monitor_range)

void get_monitor_range(const struct detailed_timing *timing, void *c)

{

	struct drm_monitor_range_info *monitor_range = info_monitor_range;

	struct detailed_mode_closure *closure = c;

	struct drm_display_info *info = &closure->connector->display_info;

	struct drm_monitor_range_info *monitor_range = &info->monitor_range;

	const struct detailed_non_pixel *data = &timing->data.other_data;

	const struct detailed_data_monitor_range *range = &data->data.range;

	const struct edid *edid = closure->drm_edid->edid;



	if (!is_display_descriptor(timing, EDID_DETAIL_MONITOR_RANGE))

		return;
@@ -5992,18 +5994,28 @@ void get_monitor_range(const struct detailed_timing *timing, 


	monitor_range->min_vfreq = range->min_vfreq;

	monitor_range->max_vfreq = range->max_vfreq;



	if (edid->revision >= 4) {

		if (data->pad2 & DRM_EDID_RANGE_OFFSET_MIN_VFREQ)

			monitor_range->min_vfreq += 255;

		if (data->pad2 & DRM_EDID_RANGE_OFFSET_MAX_VFREQ)

			monitor_range->max_vfreq += 255;

	}

}



static void drm_get_monitor_range(struct drm_connector *connector,

				  const struct drm_edid *drm_edid)

{

	struct drm_display_info *info = &connector->display_info;

	const struct drm_display_info *info = &connector->display_info;

	struct detailed_mode_closure closure = {

		.connector = connector,

		.drm_edid = drm_edid,

	};



	if (!version_greater(drm_edid, 1, 1))

		return;



	drm_for_each_detailed_block(drm_edid, get_monitor_range,

				    &info->monitor_range);

	drm_for_each_detailed_block(drm_edid, get_monitor_range, &closure);



	DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n",

		      info->monitor_range.min_vfreq,

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+11 −0
Original line number Diff line number Diff line
@@ -131,6 +131,17 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) 
		return PTR_ERR(opp);



	panfrost_devfreq_profile.initial_freq = cur_freq;



	/*

	 * Set the recommend OPP this will enable and configure the regulator

	 * if any and will avoid a switch off by regulator_late_cleanup()

	 */

	ret = dev_pm_opp_set_opp(dev, opp);

	if (ret) {

		DRM_DEV_ERROR(dev, "Couldn't set recommended OPP\n");

		return ret;

	}



	dev_pm_opp_put(opp);



	/*

drivers/gpu/drm/ttm/ttm_bo_util.c

+8 −5
Original line number Diff line number Diff line
@@ -236,16 +236,19 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, 
	if (bo->type != ttm_bo_type_sg)

		fbo->base.base.resv = &fbo->base.base._resv;



	if (fbo->base.resource) {

		ttm_resource_set_bo(fbo->base.resource, &fbo->base);

		bo->resource = NULL;

	}



	dma_resv_init(&fbo->base.base._resv);

	fbo->base.base.dev = NULL;

	ret = dma_resv_trylock(&fbo->base.base._resv);

	WARN_ON(!ret);



	if (fbo->base.resource) {

		ttm_resource_set_bo(fbo->base.resource, &fbo->base);

		bo->resource = NULL;

		ttm_bo_set_bulk_move(&fbo->base, NULL);

	} else {

		fbo->base.bulk_move = NULL;

	}



	ret = dma_resv_reserve_fences(&fbo->base.base._resv, 1);

	if (ret) {

		kfree(fbo);

include/drm/drm_connector.h

+2 −2
Original line number Diff line number Diff line
@@ -319,8 +319,8 @@ enum drm_panel_orientation { 
 *             EDID's detailed monitor range

 */

struct drm_monitor_range_info {

	u8 min_vfreq;

	u8 max_vfreq;

	u16 min_vfreq;

	u16 max_vfreq;

};



/**