]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
drm: xlnx: mixer: Correcting the cursor width and height
authorSaurabh Sengar <saurabh.singh@xilinx.com>
Fri, 23 Feb 2018 18:21:30 +0000 (23:51 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 15 Mar 2018 14:20:40 +0000 (15:20 +0100)
Passing the device tree values to cursor height and width, which was
wrongly set to 0 before.

Signed-off-by: Saurabh Sengar <saurabhs@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/gpu/drm/xlnx/xlnx_mixer.c

index 5f1379296a25f2893122cc8125375bac7fcb3e60..fab2c7652dcb785a81bca6565e8b34919f6b16d6 100644 (file)
@@ -2108,10 +2108,9 @@ static int xlnx_mix_plane_create(struct device *dev, struct xlnx_mix *mixer)
        mixer->max_width = XVMIX_DISP_MAX_WIDTH;
        mixer->max_height = XVMIX_DISP_MAX_HEIGHT;
        if (mixer->hw_logo_layer) {
-               mixer->max_cursor_width =
-                       mixer->hw_logo_layer->mixer_layer->layer_regs.width;
-               mixer->max_cursor_height =
-                       mixer->hw_logo_layer->mixer_layer->layer_regs.height;
+               layer_data = &mixer_hw->layer_data[XVMIX_LOGO_LAYER_IDX];
+               mixer->max_cursor_width = layer_data->hw_config.max_width;
+               mixer->max_cursor_height = layer_data->hw_config.max_height;
        }
        return 0;
 }