mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-27 03:49:57 -04:00
drm/amd/display: use drm_err in create_validate_stream_for_sink()
make the drm device available in create_validate_stream_for_sink() so that drm_err() can be used Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
93717be16e
commit
769e07136a
@@ -6535,7 +6535,7 @@ decide_crtc_timing_for_drm_display_mode(struct drm_display_mode *drm_mode,
|
||||
}
|
||||
|
||||
static struct dc_sink *
|
||||
create_fake_sink(struct dc_link *link)
|
||||
create_fake_sink(struct drm_device *dev, struct dc_link *link)
|
||||
{
|
||||
struct dc_sink_init_data sink_init_data = { 0 };
|
||||
struct dc_sink *sink = NULL;
|
||||
@@ -6545,7 +6545,7 @@ create_fake_sink(struct dc_link *link)
|
||||
|
||||
sink = dc_sink_create(&sink_init_data);
|
||||
if (!sink) {
|
||||
DRM_ERROR("Failed to create sink!\n");
|
||||
drm_err(dev, "Failed to create sink!\n");
|
||||
return NULL;
|
||||
}
|
||||
sink->sink_signal = SIGNAL_TYPE_VIRTUAL;
|
||||
@@ -6901,6 +6901,7 @@ create_stream_for_sink(struct drm_connector *connector,
|
||||
const struct dc_stream_state *old_stream,
|
||||
int requested_bpc)
|
||||
{
|
||||
struct drm_device *dev = connector->dev;
|
||||
struct amdgpu_dm_connector *aconnector = NULL;
|
||||
struct drm_display_mode *preferred_mode = NULL;
|
||||
const struct drm_connector_state *con_state = &dm_state->base;
|
||||
@@ -6924,7 +6925,7 @@ create_stream_for_sink(struct drm_connector *connector,
|
||||
memset(&saved_mode, 0, sizeof(saved_mode));
|
||||
|
||||
if (connector == NULL) {
|
||||
DRM_ERROR("connector is NULL!\n");
|
||||
drm_err(dev, "connector is NULL!\n");
|
||||
return stream;
|
||||
}
|
||||
|
||||
@@ -6942,7 +6943,7 @@ create_stream_for_sink(struct drm_connector *connector,
|
||||
}
|
||||
|
||||
if (!aconnector || !aconnector->dc_sink) {
|
||||
sink = create_fake_sink(link);
|
||||
sink = create_fake_sink(dev, link);
|
||||
if (!sink)
|
||||
return stream;
|
||||
|
||||
@@ -6954,7 +6955,7 @@ create_stream_for_sink(struct drm_connector *connector,
|
||||
stream = dc_create_stream_for_sink(sink);
|
||||
|
||||
if (stream == NULL) {
|
||||
DRM_ERROR("Failed to create stream for sink!\n");
|
||||
drm_err(dev, "Failed to create stream for sink!\n");
|
||||
goto finish;
|
||||
}
|
||||
|
||||
@@ -7638,7 +7639,7 @@ create_validate_stream_for_sink(struct drm_connector *connector,
|
||||
dm_state, old_stream,
|
||||
requested_bpc);
|
||||
if (stream == NULL) {
|
||||
DRM_ERROR("Failed to create stream for sink!\n");
|
||||
drm_err(adev_to_drm(adev), "Failed to create stream for sink!\n");
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user