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

Merge tag 'drm-msm-fixes-2022-04-30' of https://gitlab.freedesktop.org/drm/msm into drm-fixes 



single lockdep fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGtkzqzxDLp82OaKXVrWd7nWZtkxKsuOK1wOGCDz7qF-dA@mail.gmail.com
parents ca5e2f4d 3f65b1e2

drivers/gpu/drm/msm/dp/dp_display.c

+0 −6
Original line number Diff line number Diff line
@@ -580,12 +580,6 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data) 
			dp->dp_display.connector_type, state);

	mutex_unlock(&dp->event_mutex);



	/*

	 * add fail safe mode outside event_mutex scope

	 * to avoid potiential circular lock with drm thread

	 */

	dp_panel_add_fail_safe_mode(dp->dp_display.connector);



	/* uevent will complete connection part */

	return 0;

};

drivers/gpu/drm/msm/dp/dp_panel.c

+0 −11
Original line number Diff line number Diff line
@@ -151,15 +151,6 @@ static int dp_panel_update_modes(struct drm_connector *connector, 
	return rc;

}



void dp_panel_add_fail_safe_mode(struct drm_connector *connector)

{

	/* fail safe edid */

	mutex_lock(&connector->dev->mode_config.mutex);

	if (drm_add_modes_noedid(connector, 640, 480))

		drm_set_preferred_mode(connector, 640, 480);

	mutex_unlock(&connector->dev->mode_config.mutex);

}



int dp_panel_read_sink_caps(struct dp_panel *dp_panel,

	struct drm_connector *connector)

{
@@ -215,8 +206,6 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel, 
			rc = -ETIMEDOUT;

			goto end;

		}



		dp_panel_add_fail_safe_mode(connector);

	}



	if (panel->aux_cfg_update_done) {

drivers/gpu/drm/msm/dp/dp_panel.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ int dp_panel_init_panel_info(struct dp_panel *dp_panel); 
int dp_panel_deinit(struct dp_panel *dp_panel);

int dp_panel_timing_cfg(struct dp_panel *dp_panel);

void dp_panel_dump_regs(struct dp_panel *dp_panel);

void dp_panel_add_fail_safe_mode(struct drm_connector *connector);

int dp_panel_read_sink_caps(struct dp_panel *dp_panel,

		struct drm_connector *connector);

u32 dp_panel_get_mode_bpp(struct dp_panel *dp_panel, u32 mode_max_bpp,