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

Commit 4479ed41 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into drm-next 

A bunch of smatch fixes for the dc code.

* 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux:
  amd/display: Fix potential null dereference in dce_calcs.c
  amdgpu/dm: Remove unused forward declaration
  drm/amdgpu: Remove unused dc_stream from amdgpu_crtc
  amdgpu/dc: Fix double unlock in amdgpu_dm_commit_planes
  amdgpu/dc: Fix missing null checks in amdgpu_dm.c
  amdgpu/dc: Fix potential null dereferences in amdgpu_dm.c
  amdgpu/dc: fix more indentation warnings
  amdgpu/dc: handle allocation failures in dc_commit_planes_to_stream.
  amdgpu/dc: fix indentation warning from smatch.
  amdgpu/dc: fix non-ansi function decls.
  drm/amd/display: remove some unneeded code
  drm/amd/display: checking for NULL instead of IS_ERR()
  drm/amd/display: small cleanup in destruct()
parents 26c860d5 f368d3bf

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+0 −2
Original line number Diff line number Diff line
@@ -436,8 +436,6 @@ struct amdgpu_crtc { 
	enum amdgpu_interrupt_state vsync_timer_enabled;



	int otg_inst;

	/* After Set Mode stream will be non-NULL */

	const struct dc_stream *stream;

	struct drm_pending_vblank_event *event;

};

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+27 −12
Original line number Diff line number Diff line
@@ -430,10 +430,12 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
	/* Display Core create. */

	adev->dm.dc = dc_create(&init_data);



	if (adev->dm.dc)

	if (adev->dm.dc) {

		DRM_INFO("Display Core initialized!\n");

	else

	} else {

		DRM_INFO("Display Core failed to initialize!\n");

		goto error;

	}



	INIT_WORK(&adev->dm.mst_hotplug_work, hotplug_notify_work_func);
@@ -1296,7 +1298,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm) 
			&amdgpu_dm_backlight_ops,

			&props);



	if (NULL == dm->backlight_dev)

	if (IS_ERR(dm->backlight_dev))

		DRM_ERROR("DM: Backlight registration failed!\n");

	else

		DRM_DEBUG_DRIVER("DM: Registered Backlight device: %s\n", bl_name);
@@ -2273,7 +2275,7 @@ decide_crtc_timing_for_drm_display_mode(struct drm_display_mode *drm_mode, 
	}

}



static void create_fake_sink(struct amdgpu_dm_connector *aconnector)

static int create_fake_sink(struct amdgpu_dm_connector *aconnector)

{

	struct dc_sink *sink = NULL;

	struct dc_sink_init_data sink_init_data = { 0 };
@@ -2282,14 +2284,18 @@ static void create_fake_sink(struct amdgpu_dm_connector *aconnector) 
	sink_init_data.sink_signal = aconnector->dc_link->connector_signal;



	sink = dc_sink_create(&sink_init_data);

	if (!sink)

	if (!sink) {

		DRM_ERROR("Failed to create sink!\n");

		return -ENOMEM;

	}



	sink->sink_signal = SIGNAL_TYPE_VIRTUAL;

	aconnector->fake_enable = true;



	aconnector->dc_sink = sink;

	aconnector->dc_link->local_sink = sink;



	return 0;

}



static struct dc_stream_state *
@@ -2323,7 +2329,8 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, 
		if (aconnector->mst_port)

			goto stream_create_fail;



		create_fake_sink(aconnector);

		if (create_fake_sink(aconnector))

			goto stream_create_fail;

	}



	stream = dc_create_stream_for_sink(aconnector->dc_sink);
@@ -2423,6 +2430,8 @@ dm_crtc_duplicate_state(struct drm_crtc *crtc) 
		return NULL;



	state = kzalloc(sizeof(*state), GFP_KERNEL);

	if (!state)

		return NULL;



	__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
@@ -3419,6 +3428,8 @@ create_i2c(struct ddc_service *ddc_service, 
	struct amdgpu_i2c_adapter *i2c;



	i2c = kzalloc(sizeof(struct amdgpu_i2c_adapter), GFP_KERNEL);

	if (!i2c)

		return NULL;

	i2c->base.owner = THIS_MODULE;

	i2c->base.class = I2C_CLASS_DDC;

	i2c->base.dev.parent = &adev->pdev->dev;
@@ -3449,6 +3460,11 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, 
	DRM_DEBUG_DRIVER("%s()\n", __func__);



	i2c = create_i2c(link->ddc, link->link_index, &res);

	if (!i2c) {

		DRM_ERROR("Failed to create i2c adapter data\n");

		return -ENOMEM;

	}



	aconnector->i2c = i2c;

	res = i2c_add_adapter(&i2c->base);
@@ -3888,7 +3904,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			DRM_ERROR("%s: acrtc %d, already busy\n",

				  __func__,

				  acrtc_attach->crtc_id);

			spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

			/* In commit tail framework this cannot happen */

			WARN_ON(1);

		}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

+0 −2
Original line number Diff line number Diff line
@@ -199,8 +199,6 @@ struct amdgpu_framebuffer; 
struct amdgpu_display_manager;

struct dc_validation_set;

struct dc_plane_state;

/* TODO rename to dc_stream_state */

struct  dc_stream;



struct dm_plane_state {

	struct drm_plane_state base;

drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static const struct command_table_helper command_table_helper_funcs = { 
 * const struct command_table_helper **h - [out] struct of functions

 *

 */

const struct command_table_helper *dal_cmd_tbl_helper_dce110_get_table()

const struct command_table_helper *dal_cmd_tbl_helper_dce110_get_table(void)

{

	return &command_table_helper_funcs;

}

drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static const struct command_table_helper command_table_helper_funcs = { 
 * const struct command_table_helper **h - [out] struct of functions

 *

 */

const struct command_table_helper *dal_cmd_tbl_helper_dce112_get_table2()

const struct command_table_helper *dal_cmd_tbl_helper_dce112_get_table2(void)

{

	return &command_table_helper_funcs;

}