Merge "drm/msm/shd: fix missing return value" (dffd43cb) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/gpu/drm/msm/shd/shd_drm.c

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -241,6 +241,7 @@ static void shd_display_enable_base(struct drm_device *dev,
	struct drm_connector *connector;		struct drm_connector *connector;
	struct drm_crtc_state *crtc_state;		struct drm_crtc_state *crtc_state;
	struct drm_connector_state *conn_state;		struct drm_connector_state *conn_state;
			int ret;

	SDE_DEBUG("enable base display %d\n", base->intf_idx);		SDE_DEBUG("enable base display %d\n", base->intf_idx);

	@@ -273,7 +274,12 @@ static void shd_display_enable_base(struct drm_device *dev,
	conn_state->best_encoder = base->encoder;		conn_state->best_encoder = base->encoder;
	connector->encoder = base->encoder;		connector->encoder = base->encoder;

	drm_atomic_set_mode_for_crtc(crtc_state, &base->mode);		ret = drm_atomic_set_mode_for_crtc(crtc_state, &base->mode);
			if (ret) {
			SDE_ERROR("failed to set mode for crtc\n");
			goto out;
			}

	drm_mode_copy(&crtc_state->adjusted_mode, &base->mode);		drm_mode_copy(&crtc_state->adjusted_mode, &base->mode);
	drm_mode_copy(&base->crtc->mode, &base->mode);		drm_mode_copy(&base->crtc->mode, &base->mode);

	@@ -323,6 +329,8 @@ static void shd_display_enable_base(struct drm_device *dev,

	base->enabled = true;		base->enabled = true;
	base->enable_changed = true;		base->enable_changed = true;
			out:
			return;
	}		}

	static void shd_display_disable_base(struct drm_device *dev,		static void shd_display_disable_base(struct drm_device *dev,