aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2018-02-23 14:25:02 -0500
committerVille Syrjälä <ville.syrjala@linux.intel.com>2018-03-16 09:44:01 -0400
commit11b83e3fbc419678828982fbbf5c07ef9bf202f0 (patch)
treeab7a696e56d91134c989f67ffe5b696be13effff
parent9c60583c0b0fd6f3a5b61fda3eb604ce218b9d25 (diff)
drm: Remove now pointelss blob->data casts
Now that blob->data is void* again we don't need the casts anymore. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180223192506.29992-2-ville.syrjala@linux.intel.com Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/drm_atomic.c3
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c2
-rw-r--r--drivers/gpu/drm/drm_edid.c3
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c2
-rw-r--r--drivers/gpu/drm/drm_plane.c2
5 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 34b7d420e555..01060669dd49 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -391,8 +391,7 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
391 if (blob) { 391 if (blob) {
392 if (blob->length != sizeof(struct drm_mode_modeinfo) || 392 if (blob->length != sizeof(struct drm_mode_modeinfo) ||
393 drm_mode_convert_umode(state->crtc->dev, &state->mode, 393 drm_mode_convert_umode(state->crtc->dev, &state->mode,
394 (const struct drm_mode_modeinfo *) 394 blob->data))
395 blob->data))
396 return -EINVAL; 395 return -EINVAL;
397 396
398 state->mode_blob = drm_property_blob_get(blob); 397 state->mode_blob = drm_property_blob_get(blob);
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 00c78c1c9681..c35654591c12 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3818,7 +3818,7 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
3818 } 3818 }
3819 3819
3820 /* Prepare GAMMA_LUT with the legacy values. */ 3820 /* Prepare GAMMA_LUT with the legacy values. */
3821 blob_data = (struct drm_color_lut *) blob->data; 3821 blob_data = blob->data;
3822 for (i = 0; i < size; i++) { 3822 for (i = 0; i < size; i++) {
3823 blob_data[i].red = red[i]; 3823 blob_data[i].red = red[i];
3824 blob_data[i].green = green[i]; 3824 blob_data[i].green = green[i];
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index a797bbf1cab8..49147b2aa288 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1554,8 +1554,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
1554 struct edid *override = NULL; 1554 struct edid *override = NULL;
1555 1555
1556 if (connector->override_edid) 1556 if (connector->override_edid)
1557 override = drm_edid_duplicate((const struct edid *) 1557 override = drm_edid_duplicate(connector->edid_blob_ptr->data);
1558 connector->edid_blob_ptr->data);
1559 1558
1560 if (!override) 1559 if (!override)
1561 override = drm_load_edid_firmware(connector); 1560 override = drm_load_edid_firmware(connector);
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 035784ddd133..0646b108030b 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1351,7 +1351,7 @@ static struct drm_property_blob *setcmap_new_gamma_lut(struct drm_crtc *crtc,
1351 if (IS_ERR(gamma_lut)) 1351 if (IS_ERR(gamma_lut))
1352 return gamma_lut; 1352 return gamma_lut;
1353 1353
1354 lut = (struct drm_color_lut *)gamma_lut->data; 1354 lut = gamma_lut->data;
1355 if (cmap->start || cmap->len != size) { 1355 if (cmap->start || cmap->len != size) {
1356 u16 *r = crtc->gamma_store; 1356 u16 *r = crtc->gamma_store;
1357 u16 *g = r + crtc->gamma_size; 1357 u16 *g = r + crtc->gamma_size;
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 46fbd019a337..977a66dfc5f1 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -104,7 +104,7 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane
104 if (IS_ERR(blob)) 104 if (IS_ERR(blob))
105 return -1; 105 return -1;
106 106
107 blob_data = (struct drm_format_modifier_blob *)blob->data; 107 blob_data = blob->data;
108 blob_data->version = FORMAT_BLOB_CURRENT; 108 blob_data->version = FORMAT_BLOB_CURRENT;
109 blob_data->count_formats = plane->format_count; 109 blob_data->count_formats = plane->format_count;
110 blob_data->formats_offset = sizeof(struct drm_format_modifier_blob); 110 blob_data->formats_offset = sizeof(struct drm_format_modifier_blob);