Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdfba4b3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 02fda0ce on remote branch 

Change-Id: I4fa1616564c2456588d0ee45e96d4da8c68193f5
parents 9c35fb4e 02fda0ce

drivers/gpu/drm/drm_edid.c

+92 −92
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static const struct drm_display_mode edid_cea_modes[] = { 
	 .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 64 - 1920x1080@100Hz */

	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,

		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0,

		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	 .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 65 - 1280x720@24Hz */
@@ -1067,7 +1067,7 @@ static const struct drm_display_mode edid_cea_modes[] = { 
	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 77 - 1920x1080@100Hz */

	{ DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,

		   2492, 2640, 0, 1080, 1084, 1094, 1125, 0,

		   2492, 2640, 0, 1080, 1084, 1089, 1125, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 78 - 1920x1080@120Hz */
@@ -1154,72 +1154,72 @@ static const struct drm_display_mode edid_cea_modes[] = { 
	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

		   4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 95 - 3840x2160p@30Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 96 - 3840x2160p@50Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

		   4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 97 - 3840x2160p@60Hz 16:9 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 98 - 4096x2160p@24Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5116,

		   5204, 5500, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 99 - 4096x2160p@25Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5064,

		   5152, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 100 - 4096x2160p@30Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 4184,

		   4272, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 101 - 4096x2160p@50Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5064,

		   5152, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 102 - 4096x2160p@60Hz 256:135 */

	{ DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 4184,

		   4272, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, },

	/* 103 - 3840x2160p@24Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

		   5204, 5500, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 104 - 3840x2160p@25Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

		   4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 105 - 3840x2160p@30Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 106 - 3840x2160p@50Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

		   4984, 5280, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

	/* 107 - 3840x2160p@60Hz 64:27 */

	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

		   4104, 4400, 0, 2160, 2168, 2178, 2250, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),

	.vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

};



/*

drivers/gpu/drm/drm_modes.c

+43 −0
Original line number Diff line number Diff line
@@ -949,6 +949,7 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1, 
	    mode1->vsync_end == mode2->vsync_end &&

	    mode1->vtotal == mode2->vtotal &&

	    mode1->vscan == mode2->vscan &&

	    mode1->picture_aspect_ratio == mode2->picture_aspect_ratio &&

	    (mode1->flags & ~DRM_MODE_FLAG_3D_MASK) ==

	     (mode2->flags & ~DRM_MODE_FLAG_3D_MASK))

		return true;
@@ -1445,6 +1446,27 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, 
	out->vrefresh = in->vrefresh;

	out->flags = in->flags;

	out->type = in->type;

	out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK;



	switch (in->picture_aspect_ratio) {

	case HDMI_PICTURE_ASPECT_4_3:

		out->flags |= DRM_MODE_FLAG_PIC_AR_4_3;

		break;

	case HDMI_PICTURE_ASPECT_16_9:

		out->flags |= DRM_MODE_FLAG_PIC_AR_16_9;

		break;

	case HDMI_PICTURE_ASPECT_64_27:

		out->flags |= DRM_MODE_FLAG_PIC_AR_64_27;

		break;

	case DRM_MODE_PICTURE_ASPECT_256_135:

		out->flags |= DRM_MODE_FLAG_PIC_AR_256_135;

		break;

	case HDMI_PICTURE_ASPECT_RESERVED:

	default:

		out->flags |= DRM_MODE_FLAG_PIC_AR_NONE;

		break;

	}



	strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);

	out->name[DRM_DISPLAY_MODE_LEN-1] = 0;

}
@@ -1490,6 +1512,27 @@ int drm_mode_convert_umode(struct drm_display_mode *out, 
	strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);

	out->name[DRM_DISPLAY_MODE_LEN-1] = 0;



	/* Clearing picture aspect ratio bits from out flags */

	out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK;



	switch (in->flags & DRM_MODE_FLAG_PIC_AR_MASK) {

	case DRM_MODE_FLAG_PIC_AR_4_3:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_4_3;

		break;

	case DRM_MODE_FLAG_PIC_AR_16_9:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9;

		break;

	case DRM_MODE_FLAG_PIC_AR_64_27:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27;

		break;

	case DRM_MODE_FLAG_PIC_AR_256_135:

		out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135;

		break;

	default:

		out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;

		break;

	}



	out->status = drm_mode_validate_basic(out);

	if (out->status != MODE_OK)

		goto out;

drivers/gpu/msm/kgsl.c

+8 −3
Original line number Diff line number Diff line
@@ -3975,6 +3975,7 @@ long kgsl_ioctl_gpuobj_set_info(struct kgsl_device_private *dev_priv, 
	struct kgsl_process_private *private = dev_priv->process_priv;

	struct kgsl_gpuobj_set_info *param = data;

	struct kgsl_mem_entry *entry;

	int ret = 0;



	if (param->id == 0)

		return -EINVAL;
@@ -3987,12 +3988,16 @@ long kgsl_ioctl_gpuobj_set_info(struct kgsl_device_private *dev_priv, 
		copy_metadata(entry, param->metadata, param->metadata_len);



	if (param->flags & KGSL_GPUOBJ_SET_INFO_TYPE) {

		if (param->type <= (KGSL_MEMTYPE_MASK >> KGSL_MEMTYPE_SHIFT)) {

			entry->memdesc.flags &= ~((uint64_t) KGSL_MEMTYPE_MASK);

		entry->memdesc.flags |= param->type << KGSL_MEMTYPE_SHIFT;

			entry->memdesc.flags |= (uint64_t)((param->type <<

				KGSL_MEMTYPE_SHIFT) & KGSL_MEMTYPE_MASK);

		} else

			ret = -EINVAL;

	}



	kgsl_mem_entry_put(entry);

	return 0;

	return ret;

}



long kgsl_ioctl_cff_syncmem(struct kgsl_device_private *dev_priv,

drivers/media/platform/msm/vidc/msm_vidc_common.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1135,8 +1135,7 @@ static void handle_event_change(enum hal_command_response cmd, void *data) 
	case HAL_EVENT_SEQ_CHANGED_SUFFICIENT_RESOURCES:

		rc = msm_comm_g_ctrl_for_id(inst,

			V4L2_CID_MPEG_VIDC_VIDEO_CONTINUE_DATA_TRANSFER);

		if (!is_thumbnail_session(inst) &&

			(IS_ERR_VALUE(rc) || rc == false))

		if ((IS_ERR_VALUE(rc) || rc == false))

			event = V4L2_EVENT_SEQ_CHANGED_INSUFFICIENT;

		else

			event = V4L2_EVENT_SEQ_CHANGED_SUFFICIENT;