Commit 744ed8cb authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-fixes-2019-06-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Sean writes:

meson: A few G12A fixes across the driver (Neil)
quirks: A couple quirks for GPD devices (Hans)
gem_shmem: Use writecombine when vmapping non-dmabuf BOs (Boris)
panfrost: A couple tweaks to requiring devfreq (Neil & Ezequiel)
edid: Ensure we return the override mode when ddc probe fails (Jani)

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Ezequiel Garcia <ezequiel@collabora.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190613143946.GA24233@art_vandelay
parents febe8030 48eaeb76

drivers/gpu/drm/drm_edid.c

+47 −8
Original line number Diff line number Diff line
@@ -1570,6 +1570,50 @@ static void connector_bad_edid(struct drm_connector *connector, 
	}

}



/* Get override or firmware EDID */

static struct edid *drm_get_override_edid(struct drm_connector *connector)

{

	struct edid *override = NULL;



	if (connector->override_edid)

		override = drm_edid_duplicate(connector->edid_blob_ptr->data);



	if (!override)

		override = drm_load_edid_firmware(connector);



	return IS_ERR(override) ? NULL : override;

}



/**

 * drm_add_override_edid_modes - add modes from override/firmware EDID

 * @connector: connector we're probing

 *

 * Add modes from the override/firmware EDID, if available. Only to be used from

 * drm_helper_probe_single_connector_modes() as a fallback for when DDC probe

 * failed during drm_get_edid() and caused the override/firmware EDID to be

 * skipped.

 *

 * Return: The number of modes added or 0 if we couldn't find any.

 */

int drm_add_override_edid_modes(struct drm_connector *connector)

{

	struct edid *override;

	int num_modes = 0;



	override = drm_get_override_edid(connector);

	if (override) {

		drm_connector_update_edid_property(connector, override);

		num_modes = drm_add_edid_modes(connector, override);

		kfree(override);



		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] adding %d modes via fallback override/firmware EDID\n",

			      connector->base.id, connector->name, num_modes);

	}



	return num_modes;

}

EXPORT_SYMBOL(drm_add_override_edid_modes);



/**

 * drm_do_get_edid - get EDID data using a custom EDID block read function

 * @connector: connector we're probing
@@ -1597,15 +1641,10 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, 
{

	int i, j = 0, valid_extensions = 0;

	u8 *edid, *new;

	struct edid *override = NULL;



	if (connector->override_edid)

		override = drm_edid_duplicate(connector->edid_blob_ptr->data);



	if (!override)

		override = drm_load_edid_firmware(connector);

	struct edid *override;



	if (!IS_ERR_OR_NULL(override))

	override = drm_get_override_edid(connector);

	if (override)

		return override;



	if ((edid = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)

drivers/gpu/drm/drm_gem_shmem_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem) 
	if (obj->import_attach)

		shmem->vaddr = dma_buf_vmap(obj->import_attach->dmabuf);

	else

		shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT, VM_MAP, PAGE_KERNEL);

		shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT,

				    VM_MAP, pgprot_writecombine(PAGE_KERNEL));



	if (!shmem->vaddr) {

		DRM_DEBUG_KMS("Failed to vmap pages\n");

drivers/gpu/drm/drm_panel_orientation_quirks.c

+32 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ static const struct drm_dmi_panel_orientation_data asus_t100ha = { 
	.orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP,

};



static const struct drm_dmi_panel_orientation_data gpd_micropc = {

	.width = 720,

	.height = 1280,

	.bios_dates = (const char * const []){ "04/26/2019",

		NULL },

	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,

};



static const struct drm_dmi_panel_orientation_data gpd_pocket = {

	.width = 1200,

	.height = 1920,
@@ -50,6 +58,14 @@ static const struct drm_dmi_panel_orientation_data gpd_pocket = { 
	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,

};



static const struct drm_dmi_panel_orientation_data gpd_pocket2 = {

	.width = 1200,

	.height = 1920,

	.bios_dates = (const char * const []){ "06/28/2018", "08/28/2018",

		"12/07/2018", NULL },

	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,

};



static const struct drm_dmi_panel_orientation_data gpd_win = {

	.width = 720,

	.height = 1280,
@@ -99,6 +115,14 @@ static const struct dmi_system_id orientation_data[] = { 
		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100HAN"),

		},

		.driver_data = (void *)&asus_t100ha,

	}, {	/* GPD MicroPC (generic strings, also match on bios date) */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),

		  DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),

		  DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),

		},

		.driver_data = (void *)&gpd_micropc,

	}, {	/*

		 * GPD Pocket, note that the the DMI data is less generic then

		 * it seems, devices with a board-vendor of "AMI Corporation"
@@ -112,6 +136,14 @@ static const struct dmi_system_id orientation_data[] = { 
		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),

		},

		.driver_data = (void *)&gpd_pocket,

	}, {	/* GPD Pocket 2 (generic strings, also match on bios date) */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),

		  DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),

		  DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),

		},

		.driver_data = (void *)&gpd_pocket2,

	}, {	/* GPD Win (same note on DMI match as GPD Pocket) */

		.matches = {

		  DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),

drivers/gpu/drm/drm_probe_helper.c

+7 −0
Original line number Diff line number Diff line
@@ -479,6 +479,13 @@ retry: 


	count = (*connector_funcs->get_modes)(connector);



	/*

	 * Fallback for when DDC probe failed in drm_get_edid() and thus skipped

	 * override/firmware EDID.

	 */

	if (count == 0 && connector->status == connector_status_connected)

		count = drm_add_override_edid_modes(connector);



	if (count == 0 && connector->status == connector_status_connected)

		count = drm_add_modes_noedid(connector, 1024, 768);

	count += drm_helper_probe_add_cmdline_mode(connector);

drivers/gpu/drm/meson/meson_crtc.c

+2 −4
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ static void meson_g12a_crtc_atomic_enable(struct drm_crtc *crtc, 
			priv->io_base + _REG(VPP_OUT_H_V_SIZE));



	drm_crtc_vblank_on(crtc);



	priv->viu.osd1_enabled = true;

}



static void meson_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -137,8 +135,6 @@ static void meson_crtc_atomic_enable(struct drm_crtc *crtc, 
			    priv->io_base + _REG(VPP_MISC));



	drm_crtc_vblank_on(crtc);



	priv->viu.osd1_enabled = true;

}



static void meson_g12a_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -256,6 +252,8 @@ static void meson_g12a_crtc_enable_osd1(struct meson_drm *priv) 
	writel_relaxed(priv->viu.osb_blend1_size,

		       priv->io_base +

		       _REG(VIU_OSD_BLEND_BLEND1_SIZE));

	writel_bits_relaxed(3 << 8, 3 << 8,

			    priv->io_base + _REG(OSD1_BLEND_SRC_CTRL));

}



static void meson_crtc_enable_vd1(struct meson_drm *priv)

CRA Git | Maintained and supported by SUSTech CRA and CCSE