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

Commit 11b83e3f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Remove now pointelss blob->data casts 



Now that blob->data is void* again we don't need the casts anymore.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180223192506.29992-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9c60583c

drivers/gpu/drm/drm_atomic.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -391,7 +391,6 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state, 
	if (blob) {

	if (blob) {

		if (blob->length != sizeof(struct drm_mode_modeinfo) ||

		if (blob->length != sizeof(struct drm_mode_modeinfo) ||

		    drm_mode_convert_umode(state->crtc->dev, &state->mode,

		    drm_mode_convert_umode(state->crtc->dev, &state->mode,

		                           (const struct drm_mode_modeinfo *)

					   blob->data))

					   blob->data))

			return -EINVAL;

			return -EINVAL;

drivers/gpu/drm/drm_atomic_helper.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3818,7 +3818,7 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, 
	}

	}





	/* Prepare GAMMA_LUT with the legacy values. */

	/* Prepare GAMMA_LUT with the legacy values. */

	blob_data = (struct drm_color_lut *) blob->data;

	blob_data = blob->data;

	for (i = 0; i < size; i++) {

	for (i = 0; i < size; i++) {

		blob_data[i].red = red[i];

		blob_data[i].red = red[i];

		blob_data[i].green = green[i];

		blob_data[i].green = green[i];

drivers/gpu/drm/drm_edid.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1554,8 +1554,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, 
	struct edid *override = NULL;

	struct edid *override = NULL;





	if (connector->override_edid)

	if (connector->override_edid)

		override = drm_edid_duplicate((const struct edid *)

		override = drm_edid_duplicate(connector->edid_blob_ptr->data);

					      connector->edid_blob_ptr->data);





	if (!override)

	if (!override)

		override = drm_load_edid_firmware(connector);

		override = drm_load_edid_firmware(connector);

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1351,7 +1351,7 @@ static struct drm_property_blob *setcmap_new_gamma_lut(struct drm_crtc *crtc, 
	if (IS_ERR(gamma_lut))

	if (IS_ERR(gamma_lut))

		return gamma_lut;

		return gamma_lut;





	lut = (struct drm_color_lut *)gamma_lut->data;

	lut = gamma_lut->data;

	if (cmap->start || cmap->len != size) {

	if (cmap->start || cmap->len != size) {

		u16 *r = crtc->gamma_store;

		u16 *r = crtc->gamma_store;

		u16 *g = r + crtc->gamma_size;

		u16 *g = r + crtc->gamma_size;

drivers/gpu/drm/drm_plane.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane 
	if (IS_ERR(blob))

	if (IS_ERR(blob))

		return -1;

		return -1;





	blob_data = (struct drm_format_modifier_blob *)blob->data;

	blob_data = blob->data;

	blob_data->version = FORMAT_BLOB_CURRENT;

	blob_data->version = FORMAT_BLOB_CURRENT;

	blob_data->count_formats = plane->format_count;

	blob_data->count_formats = plane->format_count;

	blob_data->formats_offset = sizeof(struct drm_format_modifier_blob);

	blob_data->formats_offset = sizeof(struct drm_format_modifier_blob);