]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Remove the blob->data casts
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 23 Feb 2018 19:25:05 +0000 (21:25 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 16 Mar 2018 13:44:01 +0000 (15:44 +0200)
Now that blob->data is void* again we don't need to cast it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180223192506.29992-5-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_color.c

index aa66e952a95d377eac1f659510853a61cba9fbf7..58d779e94af7715e22c73716aac0756c39e74b48 100644 (file)
@@ -145,8 +145,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)
                i9xx_load_ycbcr_conversion_matrix(intel_crtc);
                return;
        } else if (crtc_state->ctm) {
-               struct drm_color_ctm *ctm =
-                       (struct drm_color_ctm *)crtc_state->ctm->data;
+               struct drm_color_ctm *ctm = crtc_state->ctm->data;
                uint64_t input[9] = { 0, };
 
                if (intel_crtc_state->limited_color_range) {
@@ -255,8 +254,7 @@ static void cherryview_load_csc_matrix(struct drm_crtc_state *state)
        uint32_t mode;
 
        if (state->ctm) {
-               struct drm_color_ctm *ctm =
-                       (struct drm_color_ctm *) state->ctm->data;
+               struct drm_color_ctm *ctm = state->ctm->data;
                uint16_t coeffs[9] = { 0, };
                int i;
 
@@ -323,7 +321,7 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,
        }
 
        if (blob) {
-               struct drm_color_lut *lut = (struct drm_color_lut *) blob->data;
+               struct drm_color_lut *lut = blob->data;
                for (i = 0; i < 256; i++) {
                        uint32_t word =
                                (drm_color_lut_extract(lut[i].red, 8) << 16) |
@@ -393,8 +391,7 @@ static void bdw_load_degamma_lut(struct drm_crtc_state *state)
                   PAL_PREC_SPLIT_MODE | PAL_PREC_AUTO_INCREMENT);
 
        if (state->degamma_lut) {
-               struct drm_color_lut *lut =
-                       (struct drm_color_lut *) state->degamma_lut->data;
+               struct drm_color_lut *lut = state->degamma_lut->data;
 
                for (i = 0; i < lut_size; i++) {
                        uint32_t word =
@@ -428,8 +425,7 @@ static void bdw_load_gamma_lut(struct drm_crtc_state *state, u32 offset)
                   offset);
 
        if (state->gamma_lut) {
-               struct drm_color_lut *lut =
-                       (struct drm_color_lut *) state->gamma_lut->data;
+               struct drm_color_lut *lut = state->gamma_lut->data;
 
                for (i = 0; i < lut_size; i++) {
                        uint32_t word =
@@ -561,7 +557,7 @@ static void cherryview_load_luts(struct drm_crtc_state *state)
        }
 
        if (state->degamma_lut) {
-               lut = (struct drm_color_lut *) state->degamma_lut->data;
+               lut = state->degamma_lut->data;
                lut_size = INTEL_INFO(dev_priv)->color.degamma_lut_size;
                for (i = 0; i < lut_size; i++) {
                        /* Write LUT in U0.14 format. */
@@ -576,7 +572,7 @@ static void cherryview_load_luts(struct drm_crtc_state *state)
        }
 
        if (state->gamma_lut) {
-               lut = (struct drm_color_lut *) state->gamma_lut->data;
+               lut = state->gamma_lut->data;
                lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size;
                for (i = 0; i < lut_size; i++) {
                        /* Write LUT in U0.10 format. */