Commit 687a0ed3 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Short summary of fixes pull (less than what git shortlog provides):

 * In mcde, set up fbdev after device registration and removde the last access
to dev->dev_private. Fixes an error message and a segmentation fault.

 * Set the connector type for LogicPT Type 28 and newhaven_nhd_43_480272ef_atxl
panels.

 * In uvesafb, fix the handling of the noblank option.

 * Fix panel orientation for Asus T101HA and Acer S1003.

 * Fix DMA configuration for sun4i if IOMMU is present.

 * Fix regression in VT restoration. Unbreaks userspace (i.e., Xorg) VT handling.

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200625082717.GA14856@linux-uq9g
parents 5b83c254 dc5bdb68

drivers/gpu/drm/drm_fb_helper.c

+49 −14
Original line number Diff line number Diff line
@@ -227,18 +227,9 @@ int drm_fb_helper_debug_leave(struct fb_info *info) 
}

EXPORT_SYMBOL(drm_fb_helper_debug_leave);



/**

 * drm_fb_helper_restore_fbdev_mode_unlocked - restore fbdev configuration

 * @fb_helper: driver-allocated fbdev helper, can be NULL

 *

 * This should be called from driver's drm &drm_driver.lastclose callback

 * when implementing an fbcon on top of kms using this helper. This ensures that

 * the user isn't greeted with a black screen when e.g. X dies.

 *

 * RETURNS:

 * Zero if everything went ok, negative error code otherwise.

 */

int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)

static int

__drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper,

					    bool force)

{

	bool do_delayed;

	int ret;
@@ -250,7 +241,16 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) 
		return 0;



	mutex_lock(&fb_helper->lock);

	if (force) {

		/*

		 * Yes this is the _locked version which expects the master lock

		 * to be held. But for forced restores we're intentionally

		 * racing here, see drm_fb_helper_set_par().

		 */

		ret = drm_client_modeset_commit_locked(&fb_helper->client);

	} else {

		ret = drm_client_modeset_commit(&fb_helper->client);

	}



	do_delayed = fb_helper->delayed_hotplug;

	if (do_delayed)
@@ -262,6 +262,22 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) 


	return ret;

}



/**

 * drm_fb_helper_restore_fbdev_mode_unlocked - restore fbdev configuration

 * @fb_helper: driver-allocated fbdev helper, can be NULL

 *

 * This should be called from driver's drm &drm_driver.lastclose callback

 * when implementing an fbcon on top of kms using this helper. This ensures that

 * the user isn't greeted with a black screen when e.g. X dies.

 *

 * RETURNS:

 * Zero if everything went ok, negative error code otherwise.

 */

int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)

{

	return __drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper, false);

}

EXPORT_SYMBOL(drm_fb_helper_restore_fbdev_mode_unlocked);



#ifdef CONFIG_MAGIC_SYSRQ
@@ -1318,6 +1334,7 @@ int drm_fb_helper_set_par(struct fb_info *info) 
{

	struct drm_fb_helper *fb_helper = info->par;

	struct fb_var_screeninfo *var = &info->var;

	bool force;



	if (oops_in_progress)

		return -EBUSY;
@@ -1327,7 +1344,25 @@ int drm_fb_helper_set_par(struct fb_info *info) 
		return -EINVAL;

	}



	drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);

	/*

	 * Normally we want to make sure that a kms master takes precedence over

	 * fbdev, to avoid fbdev flickering and occasionally stealing the

	 * display status. But Xorg first sets the vt back to text mode using

	 * the KDSET IOCTL with KD_TEXT, and only after that drops the master

	 * status when exiting.

	 *

	 * In the past this was caught by drm_fb_helper_lastclose(), but on

	 * modern systems where logind always keeps a drm fd open to orchestrate

	 * the vt switching, this doesn't work.

	 *

	 * To not break the userspace ABI we have this special case here, which

	 * is only used for the above case. Everything else uses the normal

	 * commit function, which ensures that we never steal the display from

	 * an active drm master.

	 */

	force = var->activate & FB_ACTIVATE_KD_TEXT;



	__drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper, force);



	return 0;

}

drivers/gpu/drm/drm_panel_orientation_quirks.c

+7 −7
Original line number Diff line number Diff line
@@ -30,12 +30,6 @@ struct drm_dmi_panel_orientation_data { 
	int orientation;

};



static const struct drm_dmi_panel_orientation_data acer_s1003 = {

	.width = 800,

	.height = 1280,

	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,

};



static const struct drm_dmi_panel_orientation_data asus_t100ha = {

	.width = 800,

	.height = 1280,
@@ -114,13 +108,19 @@ static const struct dmi_system_id orientation_data[] = { 
		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "One S1003"),

		},

		.driver_data = (void *)&acer_s1003,

		.driver_data = (void *)&lcd800x1280_rightside_up,

	}, {	/* Asus T100HA */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100HAN"),

		},

		.driver_data = (void *)&asus_t100ha,

	}, {	/* Asus T101HA */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T101HA"),

		},

		.driver_data = (void *)&lcd800x1280_rightside_up,

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

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),

drivers/gpu/drm/mcde/mcde_display.c

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static void mcde_display_enable(struct drm_simple_display_pipe *pipe, 
	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_plane *plane = &pipe->plane;

	struct drm_device *drm = crtc->dev;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	const struct drm_display_mode *mode = &cstate->mode;

	struct drm_framebuffer *fb = plane->state->fb;

	u32 format = fb->format->format;

drivers/gpu/drm/mcde/mcde_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ static int mcde_modeset_init(struct drm_device *drm) 


	drm_mode_config_reset(drm);

	drm_kms_helper_poll_init(drm);

	drm_fbdev_generic_setup(drm, 32);



	return 0;

}
@@ -264,6 +263,8 @@ static int mcde_drm_bind(struct device *dev) 
	if (ret < 0)

		goto unbind;



	drm_fbdev_generic_setup(drm, 32);



	return 0;



unbind:

drivers/gpu/drm/panel/panel-simple.c

+2 −0
Original line number Diff line number Diff line
@@ -2495,6 +2495,7 @@ static const struct panel_desc logicpd_type_28 = { 
	.bus_format = MEDIA_BUS_FMT_RGB888_1X24,

	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE |

		     DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE,

	.connector_type = DRM_MODE_CONNECTOR_DPI,

};



static const struct panel_desc mitsubishi_aa070mc01 = {
@@ -2663,6 +2664,7 @@ static const struct panel_desc newhaven_nhd_43_480272ef_atxl = { 
	.bus_format = MEDIA_BUS_FMT_RGB888_1X24,

	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE |

		     DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE,

	.connector_type = DRM_MODE_CONNECTOR_DPI,

};



static const struct display_timing nlt_nl192108ac18_02d_timing = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE