Commit dafee60d authored by Jyri Sarha's avatar Jyri Sarha Committed by Daniel Vetter
Browse files

drm: Make drm_atomic_replace_property_blob_from_id() more generic 



Change drm_atomic_replace_property_blob_from_id()'s first parameter
from drm_crtc to drm_device, so that the function can be used for other
drm_mode_objects too.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/851b8504c7f294a10645ba6f6d391ac9764068b7.1492768073.git.jsarha@ti.com
parent d1841d32

drivers/gpu/drm/drm_atomic.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -425,7 +425,7 @@ drm_atomic_replace_property_blob(struct drm_property_blob **blob, 
}

}





static int

static int

drm_atomic_replace_property_blob_from_id(struct drm_crtc *crtc,

drm_atomic_replace_property_blob_from_id(struct drm_device *dev,

					 struct drm_property_blob **blob,

					 struct drm_property_blob **blob,

					 uint64_t blob_id,

					 uint64_t blob_id,

					 ssize_t expected_size,

					 ssize_t expected_size,
@@ -434,7 +434,7 @@ drm_atomic_replace_property_blob_from_id(struct drm_crtc *crtc, 
	struct drm_property_blob *new_blob = NULL;

	struct drm_property_blob *new_blob = NULL;





	if (blob_id != 0) {

	if (blob_id != 0) {

		new_blob = drm_property_lookup_blob(crtc->dev, blob_id);

		new_blob = drm_property_lookup_blob(dev, blob_id);

		if (new_blob == NULL)

		if (new_blob == NULL)

			return -EINVAL;

			return -EINVAL;
@@ -483,7 +483,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, 
		drm_property_blob_put(mode);

		drm_property_blob_put(mode);

		return ret;

		return ret;

	} else if (property == config->degamma_lut_property) {

	} else if (property == config->degamma_lut_property) {

		ret = drm_atomic_replace_property_blob_from_id(crtc,

		ret = drm_atomic_replace_property_blob_from_id(dev,

					&state->degamma_lut,

					&state->degamma_lut,

					val,

					val,

					-1,

					-1,
@@ -491,7 +491,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, 
		state->color_mgmt_changed |= replaced;

		state->color_mgmt_changed |= replaced;

		return ret;

		return ret;

	} else if (property == config->ctm_property) {

	} else if (property == config->ctm_property) {

		ret = drm_atomic_replace_property_blob_from_id(crtc,

		ret = drm_atomic_replace_property_blob_from_id(dev,

					&state->ctm,

					&state->ctm,

					val,

					val,

					sizeof(struct drm_color_ctm),

					sizeof(struct drm_color_ctm),
@@ -499,7 +499,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, 
		state->color_mgmt_changed |= replaced;

		state->color_mgmt_changed |= replaced;

		return ret;

		return ret;

	} else if (property == config->gamma_lut_property) {

	} else if (property == config->gamma_lut_property) {

		ret = drm_atomic_replace_property_blob_from_id(crtc,

		ret = drm_atomic_replace_property_blob_from_id(dev,

					&state->gamma_lut,

					&state->gamma_lut,

					val,

					val,

					-1,

					-1,

CRA Git | Maintained and supported by SUSTech CRA and CCSE