{
        struct intel_encoder *encoder = intel_attached_encoder(connector);
        struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
+       struct intel_panel *panel = &connector->panel;
        struct mipi_dsi_device *dsi_device;
-       u8 data = 0;
+       u8 data[2] = {};
        enum port port;
+       size_t len = panel->backlight.max > U8_MAX ? 2 : 1;
 
-       /* FIXME: Need to take care of 16 bit brightness level */
        for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {
                dsi_device = intel_dsi->dsi_hosts[port]->device;
                mipi_dsi_dcs_read(dsi_device, MIPI_DCS_GET_DISPLAY_BRIGHTNESS,
-                                 &data, sizeof(data));
+                                 &data, len);
                break;
        }
 
-       return data;
+       return (data[1] << 8) | data[0];
 }
 
 static void dcs_set_backlight(const struct drm_connector_state *conn_state, u32 level)
 {
        struct intel_dsi *intel_dsi = enc_to_intel_dsi(to_intel_encoder(conn_state->best_encoder));
+       struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel;
        struct mipi_dsi_device *dsi_device;
-       u8 data = level;
+       u8 data[2] = {};
        enum port port;
+       size_t len = panel->backlight.max > U8_MAX ? 2 : 1;
+
+       if (len == 1) {
+               data[0] = level;
+       } else {
+               data[0] = level >> 8;
+               data[1] = level;
+       }
 
-       /* FIXME: Need to take care of 16 bit brightness level */
        for_each_dsi_port(port, intel_dsi->dcs_backlight_ports) {
                dsi_device = intel_dsi->dsi_hosts[port]->device;
                mipi_dsi_dcs_write(dsi_device, MIPI_DCS_SET_DISPLAY_BRIGHTNESS,
-                                  &data, sizeof(data));
+                                  &data, len);
        }
 }