apply coding rule 04/148904/2 accepted/tizen/4.0/unified/20170913.003218 accepted/tizen/unified/20170911.160103 submit/tizen/20170911.080123 submit/tizen_4.0/20170911.080340
authorSooChan Lim <sc1.lim@samsung.com>
Mon, 11 Sep 2017 06:03:59 +0000 (15:03 +0900)
committerSooChan Lim <sc1.lim@samsung.com>
Mon, 11 Sep 2017 06:12:22 +0000 (15:12 +0900)
Change-Id: I6189e2e2b078aeb385dfac63021a94795445ff89

src/tdm_vc4.c
src/tdm_vc4.h
src/tdm_vc4_display.c
src/tdm_vc4_format.c
src/tdm_vc4_pp.c
src/tdm_vc4_pp.h

index e97b89b..2972f2c 100644 (file)
@@ -43,8 +43,7 @@ _tdm_find_primary_gpu(void)
                if (!device)
                        continue;
 
-               pci = udev_device_get_parent_with_subsystem_devtype(device,
-                               "pci", NULL);
+               pci = udev_device_get_parent_with_subsystem_devtype(device, "pci", NULL);
                if (pci) {
                        id = udev_device_get_sysattr_value(pci, "boot_vga");
                        if (id && !strcmp(id, "1")) {
@@ -91,9 +90,8 @@ _tdm_vc4_udev_fd_handler(int fd, tdm_event_loop_mask mask, void *user_data)
 
        hotplug = udev_device_get_property_value(dev, "HOTPLUG");
 
-       if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 &&
-               hotplug && atoi(hotplug) == 1)
-       {
+       if (memcmp(&s.st_rdev, &udev_devnum, sizeof(dev_t)) == 0 &&
+                       hotplug && atoi(hotplug) == 1) {
                TDM_INFO("HotPlug");
                tdm_vc4_display_update_output_status(edata);
        }
@@ -122,16 +120,16 @@ _tdm_vc4_udev_init(tdm_vc4_data *edata)
        }
 
        if (udev_monitor_filter_add_match_subsystem_devtype(mon, "drm", "drm_minor") > 0 ||
-           udev_monitor_enable_receiving(mon) < 0) {
+               udev_monitor_enable_receiving(mon) < 0) {
                TDM_ERR("add match subsystem failed");
                goto failed;
        }
 
        edata->uevent_source =
                tdm_event_loop_add_fd_handler(edata->dpy, udev_monitor_get_fd(mon),
-                                             TDM_EVENT_LOOP_READABLE,
-                                             _tdm_vc4_udev_fd_handler,
-                                             edata, NULL);
+                                                                         TDM_EVENT_LOOP_READABLE,
+                                                                         _tdm_vc4_udev_fd_handler,
+                                                                         edata, NULL);
        if (!edata->uevent_source) {
                TDM_ERR("couldn't create udev event source");
                goto failed;
@@ -173,9 +171,8 @@ _tdm_vc4_open_drm(void)
        int fd = -1;
 
        fd = drmOpen(TDM_DRM_NAME, NULL);
-       if (fd < 0) {
+       if (fd < 0)
                TDM_WRN("Cannot open '%s' drm", TDM_DRM_NAME);
-       }
 
 #ifdef HAVE_UDEV
        if (fd < 0) {
@@ -331,7 +328,6 @@ tdm_vc4_init(tdm_display *dpy, tdm_error *error)
        /* The vc4 master fd can be opened by a tbm backend module in
         * tbm_bufmgr_init() time. In this case, we just get it from
         * TBM_vc4_MASTER_FD enviroment.
-        * 
         */
        vc4_data->drm_fd = tdm_helper_get_fd("TBM_DRM_MASTER_FD");
        if (vc4_data->drm_fd < 0)
index 8de6c1f..ad67ed5 100644 (file)
 #endif
 
 /* drm backend functions (display) */
-tdm_error    vc4_display_get_capability(tdm_backend_data *bdata, tdm_caps_display *caps);
-tdm_error    vc4_display_get_pp_capability(tdm_backend_data *bdata, tdm_caps_pp *caps);
+tdm_error      vc4_display_get_capability(tdm_backend_data *bdata, tdm_caps_display *caps);
+tdm_error      vc4_display_get_pp_capability(tdm_backend_data *bdata, tdm_caps_pp *caps);
 tdm_output** vc4_display_get_outputs(tdm_backend_data *bdata, int *count, tdm_error *error);
-tdm_error    vc4_display_get_fd(tdm_backend_data *bdata, int *fd);
-tdm_error    vc4_display_handle_events(tdm_backend_data *bdata);
-tdm_pp*      vc4_display_create_pp(tdm_backend_data *bdata, tdm_error *error);
-tdm_error    vc4_output_get_capability(tdm_output *output, tdm_caps_output *caps);
+tdm_error      vc4_display_get_fd(tdm_backend_data *bdata, int *fd);
+tdm_error      vc4_display_handle_events(tdm_backend_data *bdata);
+tdm_pp*          vc4_display_create_pp(tdm_backend_data *bdata, tdm_error *error);
+tdm_error      vc4_output_get_capability(tdm_output *output, tdm_caps_output *caps);
 tdm_layer**  vc4_output_get_layers(tdm_output *output, int *count, tdm_error *error);
-tdm_error    vc4_output_set_property(tdm_output *output, unsigned int id, tdm_value value);
-tdm_error    vc4_output_get_property(tdm_output *output, unsigned int id, tdm_value *value);
-tdm_error    vc4_output_wait_vblank(tdm_output *output, int interval, int sync, void *user_data);
-tdm_error    vc4_output_set_vblank_handler(tdm_output *output, tdm_output_vblank_handler func);
-tdm_error    vc4_output_commit(tdm_output *output, int sync, void *user_data);
-tdm_error    vc4_output_set_commit_handler(tdm_output *output, tdm_output_commit_handler func);
-tdm_error    vc4_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value);
-tdm_error    vc4_output_get_dpms(tdm_output *output, tdm_output_dpms *dpms_value);
-tdm_error    vc4_output_set_mode(tdm_output *output, const tdm_output_mode *mode);
-tdm_error    vc4_output_get_mode(tdm_output *output, const tdm_output_mode **mode);
-tdm_error    vc4_output_set_status_handler(tdm_output *output, tdm_output_status_handler func, void *user_data);
-tdm_error    vc4_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps);
-tdm_error    vc4_layer_set_property(tdm_layer *layer, unsigned int id, tdm_value value);
-tdm_error    vc4_layer_get_property(tdm_layer *layer, unsigned int id, tdm_value *value);
-tdm_error    vc4_layer_set_info(tdm_layer *layer, tdm_info_layer *info);
-tdm_error    vc4_layer_get_info(tdm_layer *layer, tdm_info_layer *info);
-tdm_error    vc4_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer);
-tdm_error    vc4_layer_unset_buffer(tdm_layer *layer);
-void         vc4_pp_destroy(tdm_pp *pp);
-tdm_error    vc4_pp_set_info(tdm_pp *pp, tdm_info_pp *info);
-tdm_error    vc4_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst);
-tdm_error    vc4_pp_commit(tdm_pp *pp);
-tdm_error    vc4_pp_set_done_handler(tdm_pp *pp, tdm_pp_done_handler func, void *user_data);
+tdm_error      vc4_output_set_property(tdm_output *output, unsigned int id, tdm_value value);
+tdm_error      vc4_output_get_property(tdm_output *output, unsigned int id, tdm_value *value);
+tdm_error      vc4_output_wait_vblank(tdm_output *output, int interval, int sync, void *user_data);
+tdm_error      vc4_output_set_vblank_handler(tdm_output *output, tdm_output_vblank_handler func);
+tdm_error      vc4_output_commit(tdm_output *output, int sync, void *user_data);
+tdm_error      vc4_output_set_commit_handler(tdm_output *output, tdm_output_commit_handler func);
+tdm_error      vc4_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value);
+tdm_error      vc4_output_get_dpms(tdm_output *output, tdm_output_dpms *dpms_value);
+tdm_error      vc4_output_set_mode(tdm_output *output, const tdm_output_mode *mode);
+tdm_error      vc4_output_get_mode(tdm_output *output, const tdm_output_mode **mode);
+tdm_error      vc4_output_set_status_handler(tdm_output *output, tdm_output_status_handler func, void *user_data);
+tdm_error      vc4_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps);
+tdm_error      vc4_layer_set_property(tdm_layer *layer, unsigned int id, tdm_value value);
+tdm_error      vc4_layer_get_property(tdm_layer *layer, unsigned int id, tdm_value *value);
+tdm_error      vc4_layer_set_info(tdm_layer *layer, tdm_info_layer *info);
+tdm_error      vc4_layer_get_info(tdm_layer *layer, tdm_info_layer *info);
+tdm_error      vc4_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer);
+tdm_error      vc4_layer_unset_buffer(tdm_layer *layer);
+void            vc4_pp_destroy(tdm_pp *pp);
+tdm_error      vc4_pp_set_info(tdm_pp *pp, tdm_info_pp *info);
+tdm_error      vc4_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst);
+tdm_error      vc4_pp_commit(tdm_pp *pp);
+tdm_error      vc4_pp_set_done_handler(tdm_pp *pp, tdm_pp_done_handler func, void *user_data);
 
 /* drm module internal macros, structures, functions */
 #define NEVER_GET_HERE() TDM_ERR("** NEVER GET HERE **")
 
-#define C(b,m)              (((b) >> (m)) & 0xFF)
-#define B(c,s)              ((((unsigned int)(c)) & 0xff) << (s))
-#define FOURCC(a,b,c,d)     (B(d,24) | B(c,16) | B(b,8) | B(a,0))
-#define FOURCC_STR(id)      C(id,0), C(id,8), C(id,16), C(id,24)
+#define C(b, m)                          (((b) >> (m)) & 0xFF)
+#define B(c, s)                          ((((unsigned int)(c)) & 0xff) << (s))
+#define FOURCC(a, b, c, d)      (B(d, 24) | B(c, 16) | B(b, 8) | B(a, 0))
+#define FOURCC_STR(id)   C(id, 0), C(id, 8), C(id, 16), C(id, 24)
 
-#define IS_RGB(format)      (format == TBM_FORMAT_XRGB8888 || format == TBM_FORMAT_ARGB8888 || \
-                             format == TBM_FORMAT_XBGR8888 || format == TBM_FORMAT_ABGR8888)
+#define IS_RGB(format)   (format == TBM_FORMAT_XRGB8888 || format == TBM_FORMAT_ARGB8888 || \
+                                                        format == TBM_FORMAT_XBGR8888 || format == TBM_FORMAT_ABGR8888)
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#define SWAP(a, b)  ({int t; t = a; a = b; b = t;})
-#define ROUNDUP(x)  (ceil (floor ((float)(height) / 4)))
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define SWAP(a, b)  ({int t; t = a; a = b; b = t; })
+#define ROUNDUP(x)  (ceil(floor((float)(height) / 4)))
 
-#define ALIGN_TO_16B(x)    ((((x) + (1 <<  4) - 1) >>  4) <<  4)
-#define ALIGN_TO_32B(x)    ((((x) + (1 <<  5) - 1) >>  5) <<  5)
+#define ALIGN_TO_16B(x)        ((((x) + (1 <<  4) - 1) >>  4) <<  4)
+#define ALIGN_TO_32B(x)        ((((x) + (1 <<  5) - 1) >>  5) <<  5)
 #define ALIGN_TO_128B(x)   ((((x) + (1 <<  7) - 1) >>  7) <<  7)
-#define ALIGN_TO_2KB(x)    ((((x) + (1 << 11) - 1) >> 11) << 11)
-#define ALIGN_TO_8KB(x)    ((((x) + (1 << 13) - 1) >> 13) << 13)
+#define ALIGN_TO_2KB(x)        ((((x) + (1 << 11) - 1) >> 11) << 11)
+#define ALIGN_TO_8KB(x)        ((((x) + (1 << 13) - 1) >> 13) << 13)
 #define ALIGN_TO_64KB(x)   ((((x) + (1 << 16) - 1) >> 16) << 16)
 
 #define RETURN_VAL_IF_FAIL(cond, val) {\
-    if (!(cond)) {\
-        TDM_ERR("'%s' failed", #cond);\
-        return val;\
-    }\
+       if (!(cond)) {\
+               TDM_ERR("'%s' failed", #cond);\
+               return val;\
+       } \
 }
 
 #define GOTO_IF_FAIL(cond, val) {\
-    if (!(cond)) {\
-        TDM_ERR("'%s' failed", #cond);\
-        goto val;\
-    }\
+       if (!(cond)) {\
+               TDM_ERR("'%s' failed", #cond);\
+               goto val;\
+       } \
 }
 
-typedef struct _tdm_vc4_data
-{
-    tdm_display *dpy;
+typedef struct _tdm_vc4_data {
+       tdm_display *dpy;
 
-    int drm_fd;
+       int drm_fd;
 
 #if LIBDRM_MAJOR_VERSION >= 2 && LIBDRM_MINOR_VERSION >= 4  && LIBDRM_MICRO_VERSION >= 47
-    int has_universal_plane;
+       int has_universal_plane;
 #endif
 
 #if HAVE_UDEV
-    struct udev_monitor *uevent_monitor;
-    tdm_event_loop_source *uevent_source;
+       struct udev_monitor *uevent_monitor;
+       tdm_event_loop_source *uevent_source;
 #endif
 
-    drmModeResPtr mode_res;
-    drmModePlaneResPtr plane_res;
+       drmModeResPtr mode_res;
+       drmModePlaneResPtr plane_res;
 
-    struct list_head output_list;
-    struct list_head buffer_list;
+       struct list_head output_list;
+       struct list_head buffer_list;
 } tdm_vc4_data;
 
-uint32_t     tdm_vc4_format_to_drm_format(tbm_format format);
+uint32_t        tdm_vc4_format_to_drm_format(tbm_format format);
 tbm_format   tdm_vc4_format_to_tbm_format(uint32_t format);
 
-void         tdm_vc4_display_update_output_status(tdm_vc4_data *vc4_data);
-tdm_error    tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data);
-void         tdm_vc4_display_destroy_output_list(tdm_vc4_data *vc4_data);
-tdm_error    tdm_vc4_display_create_layer_list(tdm_vc4_data *vc4_data);
+void            tdm_vc4_display_update_output_status(tdm_vc4_data *vc4_data);
+tdm_error      tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data);
+void            tdm_vc4_display_destroy_output_list(tdm_vc4_data *vc4_data);
+tdm_error      tdm_vc4_display_create_layer_list(tdm_vc4_data *vc4_data);
 
 #endif /* _TDM_VC4_H_ */
index 6e90214..47677e3 100644 (file)
@@ -15,9 +15,9 @@ typedef struct _tdm_vc4_layer_data tdm_vc4_layer_data;
 typedef struct _tdm_vc4_event_data tdm_vc4_event_data;
 
 typedef enum {
-        TDM_DRM_EVENT_TYPE_WAIT,
-        TDM_DRM_EVENT_TYPE_COMMIT,
-        TDM_DRM_EVENT_TYPE_PAGEFLIP,
+       TDM_DRM_EVENT_TYPE_WAIT,
+       TDM_DRM_EVENT_TYPE_COMMIT,
+       TDM_DRM_EVENT_TYPE_PAGEFLIP,
 } tdm_vc4_event_type;
 
 typedef struct _tdm_vc4_display_buffer {
@@ -95,11 +95,11 @@ _tdm_vc4_display_get_mode(tdm_vc4_output_data *output_data)
        for (i = 0; i < output_data->count_modes; i++) {
                drmModeModeInfoPtr vc4_mode = &output_data->vc4_modes[i];
                if ((vc4_mode->hdisplay == output_data->current_mode->hdisplay) &&
-                   (vc4_mode->vdisplay == output_data->current_mode->vdisplay) &&
-                   (vc4_mode->vrefresh == output_data->current_mode->vrefresh) &&
-                   (vc4_mode->flags == output_data->current_mode->flags) &&
-                   (vc4_mode->type == output_data->current_mode->type) &&
-                   !(strncmp(vc4_mode->name, output_data->current_mode->name, TDM_NAME_LEN)))
+                       (vc4_mode->vdisplay == output_data->current_mode->vdisplay) &&
+                       (vc4_mode->vrefresh == output_data->current_mode->vrefresh) &&
+                       (vc4_mode->flags == output_data->current_mode->flags) &&
+                       (vc4_mode->type == output_data->current_mode->type) &&
+                       !(strncmp(vc4_mode->name, output_data->current_mode->name, TDM_NAME_LEN)))
                        return vc4_mode;
        }
 
@@ -121,7 +121,7 @@ _tdm_vc4_display_find_buffer(tdm_vc4_data *vc4_data, tbm_surface_h buffer)
 
 static void
 _tdm_vc4_display_to_tdm_mode(drmModeModeInfoPtr vc4_mode,
-                             tdm_output_mode *tdm_mode)
+                                                        tdm_output_mode *tdm_mode)
 {
        tdm_mode->clock = vc4_mode->clock;
        tdm_mode->hdisplay = vc4_mode->hdisplay;
@@ -141,7 +141,7 @@ _tdm_vc4_display_to_tdm_mode(drmModeModeInfoPtr vc4_mode,
 }
 
 static tdm_error
-_tdm_vc4_display_get_cur_msc (int fd, int pipe, uint *msc)
+_tdm_vc4_display_get_cur_msc(int fd, int pipe, uint *msc)
 {
        drmVBlank vbl;
 
@@ -190,7 +190,7 @@ _tdm_vc4_display_wait_vblank(int fd, int pipe, uint *target_msc, void *data)
 
 static tdm_error
 _tdm_vc4_output_update_status(tdm_vc4_output_data *output_data,
-                              tdm_output_conn_status status)
+                                                         tdm_output_conn_status status)
 {
        RETURN_VAL_IF_FAIL(output_data, TDM_ERROR_INVALID_PARAMETER);
 
@@ -201,14 +201,14 @@ _tdm_vc4_output_update_status(tdm_vc4_output_data *output_data,
 
        if (output_data->status_func)
                output_data->status_func(output_data, status,
-                                        output_data->status_user_data);
+                                                                output_data->status_user_data);
 
        return TDM_ERROR_NONE;
 }
 
 static tdm_error
 _tdm_vc4_display_commit_primary_layer(tdm_vc4_layer_data *layer_data,
-                                      void *user_data, int *do_waitvblank)
+                                                                         void *user_data, int *do_waitvblank)
 {
        tdm_vc4_data *vc4_data = layer_data->vc4_data;
        tdm_vc4_output_data *output_data = layer_data->output_data;
@@ -232,8 +232,8 @@ _tdm_vc4_display_commit_primary_layer(tdm_vc4_layer_data *layer_data,
                }
 
                if (drmModeSetCrtc(vc4_data->drm_fd, output_data->crtc_id,
-                                  layer_data->display_buffer->fb_id, 0, 0,
-                                  &output_data->connector_id, 1, mode)) {
+                                                  layer_data->display_buffer->fb_id, 0, 0,
+                                                  &output_data->connector_id, 1, mode)) {
                        TDM_ERR("set crtc failed: %m");
                        return TDM_ERROR_OPERATION_FAILED;
                }
@@ -247,7 +247,7 @@ _tdm_vc4_display_commit_primary_layer(tdm_vc4_layer_data *layer_data,
 
                if (!layer_data->display_buffer) {
                        if (drmModeSetCrtc(vc4_data->drm_fd, output_data->crtc_id,
-                                          0, 0, 0, NULL, 0, NULL)) {
+                                                          0, 0, 0, NULL, 0, NULL)) {
                                TDM_ERR("unset crtc failed: %m");
                                return TDM_ERROR_OPERATION_FAILED;
                        }
@@ -268,7 +268,7 @@ _tdm_vc4_display_commit_primary_layer(tdm_vc4_layer_data *layer_data,
                        event_data->output_data = output_data;
                        event_data->user_data = user_data;
                        if (drmModePageFlip(vc4_data->drm_fd, output_data->crtc_id,
-                                           layer_data->display_buffer->fb_id, DRM_MODE_PAGE_FLIP_EVENT, event_data)) {
+                                                               layer_data->display_buffer->fb_id, DRM_MODE_PAGE_FLIP_EVENT, event_data)) {
                                TDM_ERR("pageflip failed: %m");
                                free(event_data);
                                return TDM_ERROR_OPERATION_FAILED;
@@ -313,7 +313,7 @@ _tdm_vc4_display_commit_layer(tdm_vc4_layer_data *layer_data)
 
        if (!layer_data->display_buffer) {
                if (drmModeSetPlane(vc4_data->drm_fd, layer_data->plane_id,
-                                   output_data->crtc_id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+                                                       output_data->crtc_id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
                        TDM_ERR("unset plane(%d) filed: %m", layer_data->plane_id);
 
                return TDM_ERROR_NONE;
@@ -326,10 +326,10 @@ _tdm_vc4_display_commit_layer(tdm_vc4_layer_data *layer_data)
        fh = ((unsigned int)layer_data->info.src_config.pos.h) << 16;
 
        if (drmModeSetPlane(vc4_data->drm_fd, layer_data->plane_id,
-                           output_data->crtc_id, layer_data->display_buffer->fb_id, 0,
-                           layer_data->info.dst_pos.x, layer_data->info.dst_pos.y,
-                           layer_data->info.dst_pos.w, layer_data->info.dst_pos.h,
-                           fx, fy, fw, fh) < 0) {
+                                               output_data->crtc_id, layer_data->display_buffer->fb_id, 0,
+                                               layer_data->info.dst_pos.x, layer_data->info.dst_pos.y,
+                                               layer_data->info.dst_pos.w, layer_data->info.dst_pos.h,
+                                               fx, fy, fw, fh) < 0) {
                TDM_ERR("set plane(%d) failed: %m", layer_data->plane_id);
                return TDM_ERROR_OPERATION_FAILED;
        }
@@ -347,8 +347,8 @@ _tdm_vc4_display_commit_layer(tdm_vc4_layer_data *layer_data)
 
 static void
 _tdm_vc4_display_cb_event(int fd, unsigned int sequence,
-                          unsigned int tv_sec, unsigned int tv_usec,
-                          void *user_data)
+                                                 unsigned int tv_sec, unsigned int tv_usec,
+                                                 void *user_data)
 {
        tdm_vc4_event_data *event_data = user_data;
        tdm_vc4_output_data *output_data;
@@ -364,17 +364,17 @@ _tdm_vc4_display_cb_event(int fd, unsigned int sequence,
        case TDM_DRM_EVENT_TYPE_PAGEFLIP:
                if (output_data->commit_func)
                        output_data->commit_func(output_data, sequence, tv_sec, tv_usec,
-                                                event_data->user_data);
+                                                                        event_data->user_data);
                break;
        case TDM_DRM_EVENT_TYPE_WAIT:
                if (output_data->vblank_func)
                        output_data->vblank_func(output_data, sequence, tv_sec, tv_usec,
-                                                event_data->user_data);
+                                                                        event_data->user_data);
                break;
        case TDM_DRM_EVENT_TYPE_COMMIT:
                if (output_data->commit_func)
                        output_data->commit_func(output_data, sequence, tv_sec, tv_usec,
-                                                event_data->user_data);
+                                                                        event_data->user_data);
                break;
        default:
                break;
@@ -431,12 +431,12 @@ _tdm_vc4_display_create_layer_list(tdm_vc4_data *vc4_data)
                layer_data->plane_id = vc4_data->plane_res->planes[i];
 
                layer_data->capabilities = TDM_LAYER_CAPABILITY_PRIMARY |
-                                          TDM_LAYER_CAPABILITY_GRAPHIC;
+                                                                  TDM_LAYER_CAPABILITY_GRAPHIC;
                output_data->primary_layer = layer_data;
 
                TDM_INFO("layer_data(%p) plane_id(%d) crtc_id(%d) capabilities(%x)",
-                        layer_data, layer_data->plane_id, layer_data->output_data->crtc_id,
-                        layer_data->capabilities);
+                                layer_data, layer_data->plane_id, layer_data->output_data->crtc_id,
+                                layer_data->capabilities);
 
                LIST_ADDTAIL(&layer_data->link, &output_data->layer_list);
 
@@ -453,9 +453,9 @@ _tdm_vc4_display_create_layer_list(tdm_vc4_data *vc4_data)
 
 static tdm_error
 _tdm_vc4_display_get_property(tdm_vc4_data *vc4_data,
-                              unsigned int obj_id, unsigned int obj_type,
-                              const char *name, unsigned int *value,
-                              int *is_immutable)
+                                                         unsigned int obj_id, unsigned int obj_type,
+                                                         const char *name, unsigned int *value,
+                                                         int *is_immutable)
 {
        drmModeObjectPropertiesPtr props = NULL;
        int i;
@@ -466,7 +466,7 @@ _tdm_vc4_display_get_property(tdm_vc4_data *vc4_data,
 
        for (i = 0; i < props->count_props; i++) {
                drmModePropertyPtr prop = drmModeGetProperty(vc4_data->drm_fd,
-                                         props->props[i]);
+                                                                 props->props[i]);
 
                if (!prop)
                        continue;
@@ -511,9 +511,9 @@ _tdm_vc4_display_create_layer_list_type(tdm_vc4_data *vc4_data)
        }
 
        ret = _tdm_vc4_display_get_property(vc4_data,
-                                           vc4_data->plane_res->planes[0],
-                                           DRM_MODE_OBJECT_PLANE, "type", &type,
-                                           NULL);
+                                                                               vc4_data->plane_res->planes[0],
+                                                                               DRM_MODE_OBJECT_PLANE, "type", &type,
+                                                                               NULL);
        if (ret != TDM_ERROR_NONE) {
                TDM_ERR("plane doesn't have 'type' property. Call a fallback function");
 
@@ -551,13 +551,13 @@ _tdm_vc4_display_create_layer_list_type(tdm_vc4_data *vc4_data)
                }
 
                ret = _tdm_vc4_display_get_property(vc4_data,
-                                                   vc4_data->plane_res->planes[i],
-                                                   DRM_MODE_OBJECT_PLANE, "type", &type,
-                                                   NULL);
+                                                                                       vc4_data->plane_res->planes[i],
+                                                                                       DRM_MODE_OBJECT_PLANE, "type", &type,
+                                                                                       NULL);
                if (ret != TDM_ERROR_NONE) {
                        drmModeFreePlane(plane);
                        TDM_ERR("plane(%d) doesn't have 'type' info",
-                               vc4_data->plane_res->planes[i]);
+                                       vc4_data->plane_res->planes[i]);
                        goto failed;
                }
 
@@ -600,15 +600,15 @@ _tdm_vc4_display_create_layer_list_type(tdm_vc4_data *vc4_data)
 
                if (types[i] == DRM_PLANE_TYPE_CURSOR) {
                        layer_data->capabilities = TDM_LAYER_CAPABILITY_CURSOR |
-                                                  TDM_LAYER_CAPABILITY_GRAPHIC;
+                                                                          TDM_LAYER_CAPABILITY_GRAPHIC;
                        layer_data->zpos = cpos_next++;
                } else if (types[i] == DRM_PLANE_TYPE_OVERLAY) {
                        layer_data->capabilities = TDM_LAYER_CAPABILITY_OVERLAY |
-                                                  TDM_LAYER_CAPABILITY_GRAPHIC;
+                                                                          TDM_LAYER_CAPABILITY_GRAPHIC;
                        layer_data->zpos = opos_next++;
                } else if (types[i] == DRM_PLANE_TYPE_PRIMARY) {
                        layer_data->capabilities = TDM_LAYER_CAPABILITY_PRIMARY |
-                                                  TDM_LAYER_CAPABILITY_GRAPHIC;
+                                                                          TDM_LAYER_CAPABILITY_GRAPHIC;
                        layer_data->zpos = 0;
                        output_data->primary_layer = layer_data;
                } else {
@@ -617,8 +617,8 @@ _tdm_vc4_display_create_layer_list_type(tdm_vc4_data *vc4_data)
                }
 
                TDM_INFO("layer_data(%p) plane_id(%d) crtc_id(%d) zpos(%d) capabilities(%x)",
-                        layer_data, layer_data->plane_id, layer_data->output_data->crtc_id,
-                        layer_data->zpos, layer_data->capabilities);
+                                layer_data, layer_data->plane_id, layer_data->output_data->crtc_id,
+                                layer_data->zpos, layer_data->capabilities);
 
                LIST_ADDTAIL(&layer_data->link, &output_data->layer_list);
        }
@@ -746,7 +746,7 @@ tdm_vc4_display_update_output_status(tdm_vc4_data *vc4_data)
                tdm_output_conn_status new_status;
 
                connector = drmModeGetConnector(vc4_data->drm_fd,
-                                               output_data->connector_id);
+                                                                               output_data->connector_id);
                if (!connector) {
                        TDM_ERR("no connector: %d", output_data->connector_id);
                        continue;
@@ -771,7 +771,7 @@ tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data)
        tdm_error ret;
 
        RETURN_VAL_IF_FAIL(LIST_IS_EMPTY(&vc4_data->output_list),
-                          TDM_ERROR_OPERATION_FAILED);
+                                          TDM_ERROR_OPERATION_FAILED);
 
        for (i = 0; i < vc4_data->mode_res->count_connectors; i++) {
                drmModeConnectorPtr connector;
@@ -779,7 +779,7 @@ tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data)
                int crtc_id = 0, c, j;
 
                connector = drmModeGetConnector(vc4_data->drm_fd,
-                                               vc4_data->mode_res->connectors[i]);
+                                                                               vc4_data->mode_res->connectors[i]);
                if (!connector) {
                        TDM_ERR("no connector");
                        ret = TDM_ERROR_OPERATION_FAILED;
@@ -854,7 +854,7 @@ tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data)
 
                for (j = 0; j < connector->count_props; j++) {
                        drmModePropertyPtr prop = drmModeGetProperty(vc4_data->drm_fd,
-                                                 connector->props[j]);
+                                                                         connector->props[j]);
                        if (!prop)
                                continue;
                        if (!strcmp(prop->name, "DPMS")) {
@@ -870,7 +870,7 @@ tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data)
 
                output_data->count_modes = connector->count_modes;
                output_data->vc4_modes = calloc(connector->count_modes,
-                                               sizeof(drmModeModeInfo));
+                                                                               sizeof(drmModeModeInfo));
                if (!output_data->vc4_modes) {
                        TDM_ERR("alloc failed");
                        free(output_data);
@@ -880,7 +880,7 @@ tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data)
                        goto failed_create;
                }
                output_data->output_modes = calloc(connector->count_modes,
-                                                  sizeof(tdm_output_mode));
+                                                                                  sizeof(tdm_output_mode));
                if (!output_data->output_modes) {
                        TDM_ERR("alloc failed");
                        free(output_data->vc4_modes);
@@ -893,16 +893,16 @@ tdm_vc4_display_create_output_list(tdm_vc4_data *vc4_data)
                for (j = 0; j < connector->count_modes; j++) {
                        output_data->vc4_modes[j] = connector->modes[j];
                        _tdm_vc4_display_to_tdm_mode(&output_data->vc4_modes[j],
-                                                    &output_data->output_modes[j]);
+                                                                                &output_data->output_modes[j]);
                }
 
                LIST_ADDTAIL(&output_data->link, &vc4_data->output_list);
 
                TDM_DBG("output_data(%p) connector_id(%d:%d:%d-%d) encoder_id(%d) crtc_id(%d) pipe(%d) dpms_id(%d)",
-                       output_data, output_data->connector_id, output_data->status,
-                       output_data->connector_type,
-                       output_data->connector_type_id, output_data->encoder_id, output_data->crtc_id,
-                       output_data->pipe, output_data->dpms_prop_id);
+                               output_data, output_data->connector_id, output_data->status,
+                               output_data->connector_type,
+                               output_data->connector_type_id, output_data->encoder_id, output_data->crtc_id,
+                               output_data->pipe, output_data->dpms_prop_id);
 
                drmModeFreeEncoder(encoder);
                drmModeFreeConnector(connector);
@@ -1083,7 +1083,7 @@ vc4_output_get_capability(tdm_output *output, tdm_caps_output *caps)
        }
 
        props = drmModeObjectGetProperties(vc4_data->drm_fd, output_data->crtc_id,
-                                          DRM_MODE_OBJECT_CRTC);
+                                                                          DRM_MODE_OBJECT_CRTC);
        if (!props) {
                ret = TDM_ERROR_OPERATION_FAILED;
                TDM_ERR("get crtc properties failed: %m\n");
@@ -1178,8 +1178,8 @@ vc4_output_set_property(tdm_output *output, unsigned int id, tdm_value value)
 
        vc4_data = output_data->vc4_data;
        ret = drmModeObjectSetProperty(vc4_data->drm_fd,
-                                      output_data->crtc_id, DRM_MODE_OBJECT_CRTC,
-                                      id, value.u32);
+                                                                  output_data->crtc_id, DRM_MODE_OBJECT_CRTC,
+                                                                  id, value.u32);
        if (ret < 0) {
                TDM_ERR("set property failed: %m");
                return TDM_ERROR_OPERATION_FAILED;
@@ -1202,7 +1202,7 @@ vc4_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
 
        vc4_data = output_data->vc4_data;
        props = drmModeObjectGetProperties(vc4_data->drm_fd, output_data->crtc_id,
-                                          DRM_MODE_OBJECT_CRTC);
+                                                                          DRM_MODE_OBJECT_CRTC);
        if (props == NULL) {
                TDM_ERR("get property failed: %m");
                return TDM_ERROR_OPERATION_FAILED;
@@ -1221,7 +1221,7 @@ vc4_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
 
 tdm_error
 vc4_output_wait_vblank(tdm_output *output, int interval, int sync,
-                       void *user_data)
+                                          void *user_data)
 {
        tdm_vc4_output_data *output_data = output;
        tdm_vc4_data *vc4_data;
@@ -1240,7 +1240,7 @@ vc4_output_wait_vblank(tdm_output *output, int interval, int sync,
        vc4_data = output_data->vc4_data;
 
        ret = _tdm_vc4_display_get_cur_msc(vc4_data->drm_fd, output_data->pipe,
-                                          &target_msc);
+                                                                          &target_msc);
        if (ret != TDM_ERROR_NONE)
                goto failed_vblank;
 
@@ -1251,7 +1251,7 @@ vc4_output_wait_vblank(tdm_output *output, int interval, int sync,
        event_data->user_data = user_data;
 
        ret = _tdm_vc4_display_wait_vblank(vc4_data->drm_fd, output_data->pipe,
-                                          &target_msc, event_data);
+                                                                          &target_msc, event_data);
        if (ret != TDM_ERROR_NONE)
                goto failed_vblank;
 
@@ -1263,7 +1263,7 @@ failed_vblank:
 
 tdm_error
 vc4_output_set_vblank_handler(tdm_output *output,
-                              tdm_output_vblank_handler func)
+                                                         tdm_output_vblank_handler func)
 {
        tdm_vc4_output_data *output_data = output;
 
@@ -1291,7 +1291,7 @@ vc4_output_commit(tdm_output *output, int sync, void *user_data)
        LIST_FOR_EACH_ENTRY(layer_data, &output_data->layer_list, link) {
                if (layer_data == output_data->primary_layer) {
                        ret = _tdm_vc4_display_commit_primary_layer(layer_data, user_data,
-                                       &do_waitvblank);
+                                                       &do_waitvblank);
                        if (ret != TDM_ERROR_NONE)
                                return ret;
                } else {
@@ -1311,7 +1311,7 @@ vc4_output_commit(tdm_output *output, int sync, void *user_data)
                }
 
                ret = _tdm_vc4_display_get_cur_msc(vc4_data->drm_fd, output_data->pipe,
-                                                  &target_msc);
+                                                                                  &target_msc);
                if (ret != TDM_ERROR_NONE) {
                        free(event_data);
                        return ret;
@@ -1324,7 +1324,7 @@ vc4_output_commit(tdm_output *output, int sync, void *user_data)
                event_data->user_data = user_data;
 
                ret = _tdm_vc4_display_wait_vblank(vc4_data->drm_fd, output_data->pipe,
-                                                  &target_msc, event_data);
+                                                                                  &target_msc, event_data);
                if (ret != TDM_ERROR_NONE) {
                        free(event_data);
                        return ret;
@@ -1336,7 +1336,7 @@ vc4_output_commit(tdm_output *output, int sync, void *user_data)
 
 tdm_error
 vc4_output_set_commit_handler(tdm_output *output,
-                              tdm_output_commit_handler func)
+                                                         tdm_output_commit_handler func)
 {
        tdm_vc4_output_data *output_data = output;
 
@@ -1364,8 +1364,8 @@ vc4_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
 
        vc4_data = output_data->vc4_data;
        ret = drmModeObjectSetProperty(vc4_data->drm_fd,
-                                      output_data->connector_id, DRM_MODE_OBJECT_CONNECTOR,
-                                      output_data->dpms_prop_id, dpms_value);
+                                                                  output_data->connector_id, DRM_MODE_OBJECT_CONNECTOR,
+                                                                  output_data->dpms_prop_id, dpms_value);
        if (ret < 0) {
                TDM_ERR("set dpms failed: %m");
                return TDM_ERROR_OPERATION_FAILED;
@@ -1387,7 +1387,7 @@ vc4_output_get_dpms(tdm_output *output, tdm_output_dpms *dpms_value)
 
        vc4_data = output_data->vc4_data;
        props = drmModeObjectGetProperties(vc4_data->drm_fd, output_data->connector_id,
-                                          DRM_MODE_OBJECT_CONNECTOR);
+                                                                          DRM_MODE_OBJECT_CONNECTOR);
        if (props == NULL) {
                TDM_ERR("get property failed: %m");
                return TDM_ERROR_OPERATION_FAILED;
@@ -1433,8 +1433,8 @@ vc4_output_get_mode(tdm_output *output, const tdm_output_mode **mode)
 
 tdm_error
 vc4_output_set_status_handler(tdm_output *output,
-                              tdm_output_status_handler func,
-                              void *user_data)
+                                                         tdm_output_status_handler func,
+                                                         void *user_data)
 {
        tdm_vc4_output_data *output_data = output;
 
@@ -1484,7 +1484,7 @@ vc4_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps)
        for (i = 0; i < caps->format_count; i++) {
                /* TODO: kernel reports wrong formats */
                if (plane->formats[i] != DRM_FORMAT_XRGB8888 &&
-                   plane->formats[i] != DRM_FORMAT_ARGB8888)
+                       plane->formats[i] != DRM_FORMAT_ARGB8888)
                        continue;
                caps->formats[i] = tdm_vc4_format_to_tbm_format(plane->formats[i]);
                format_count++;
@@ -1493,7 +1493,7 @@ vc4_layer_get_capability(tdm_layer *layer, tdm_caps_layer *caps)
        caps->format_count = format_count;
 
        props = drmModeObjectGetProperties(vc4_data->drm_fd, layer_data->plane_id,
-                                          DRM_MODE_OBJECT_PLANE);
+                                                                          DRM_MODE_OBJECT_PLANE);
        if (!props) {
                ret = TDM_ERROR_OPERATION_FAILED;
                TDM_ERR("get plane properties failed: %m\n");
@@ -1547,8 +1547,8 @@ vc4_layer_set_property(tdm_layer *layer, unsigned int id, tdm_value value)
 
        vc4_data = layer_data->vc4_data;
        ret = drmModeObjectSetProperty(vc4_data->drm_fd,
-                                      layer_data->plane_id, DRM_MODE_OBJECT_PLANE,
-                                      id, value.u32);
+                                                                  layer_data->plane_id, DRM_MODE_OBJECT_PLANE,
+                                                                  id, value.u32);
        if (ret < 0) {
                TDM_ERR("set property failed: %m");
                return TDM_ERROR_OPERATION_FAILED;
@@ -1571,7 +1571,7 @@ vc4_layer_get_property(tdm_layer *layer, unsigned int id, tdm_value *value)
 
        vc4_data = layer_data->vc4_data;
        props = drmModeObjectGetProperties(vc4_data->drm_fd, layer_data->plane_id,
-                                          DRM_MODE_OBJECT_PLANE);
+                                                                          DRM_MODE_OBJECT_PLANE);
        if (props == NULL) {
                TDM_ERR("get property failed: %m");
                return TDM_ERROR_OPERATION_FAILED;
@@ -1639,7 +1639,7 @@ vc4_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer)
                display_buffer->buffer = buffer;
 
                err = tdm_buffer_add_destroy_handler(buffer, _tdm_vc4_display_cb_destroy_buffer,
-                                                    vc4_data);
+                                                                                        vc4_data);
                if (err != TDM_ERROR_NONE) {
                        TDM_ERR("add destroy handler fail");
                        free(display_buffer);
@@ -1671,13 +1671,13 @@ vc4_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer)
                        tbm_surface_internal_get_plane_data(buffer, i, &size, &offsets[i], &pitches[i]);
 
                ret = drmModeAddFB2(vc4_data->drm_fd, width, height, format,
-                                   handles, pitches, offsets, &display_buffer->fb_id, 0);
+                                                       handles, pitches, offsets, &display_buffer->fb_id, 0);
                if (ret < 0) {
                        TDM_ERR("add fb failed: %m");
                        return TDM_ERROR_OPERATION_FAILED;
                }
                TDM_DBG("vc4_data->drm_fd : %d, display_buffer->fb_id:%u", vc4_data->drm_fd,
-                       display_buffer->fb_id);
+                               display_buffer->fb_id);
 
                if (IS_RGB(format))
                        display_buffer->width = pitches[0] >> 2;
index 93fda10..d3e860d 100644 (file)
@@ -9,7 +9,7 @@
 
 typedef struct {
        tbm_format  tbm_format;
-       uint32_t    drm_format;
+       uint32_t        drm_format;
 } tbm_vc4_format_data;
 
 static const tbm_vc4_format_data formats[] = {
index db18cd5..2abcc6c 100644 (file)
@@ -58,28 +58,28 @@ _tdm_vc4_pp_pixman_get_format(tbm_format tbmfmt)
 
 int
 _tdm_vc4_pp_pixman_convert(pixman_op_t op,
-                           unsigned char *srcbuf, unsigned char *dstbuf,
-                           pixman_format_code_t src_format, pixman_format_code_t dst_format,
-                           int sbw, int sbh, int sx, int sy, int sw, int sh,
-                           int dbw, int dbh, int dx, int dy, int dw, int dh,
-                           int rotate, int hflip, int vflip)
+                                                  unsigned char *srcbuf, unsigned char *dstbuf,
+                                                  pixman_format_code_t src_format, pixman_format_code_t dst_format,
+                                                  int sbw, int sbh, int sx, int sy, int sw, int sh,
+                                                  int dbw, int dbh, int dx, int dy, int dw, int dh,
+                                                  int rotate, int hflip, int vflip)
 {
-       pixman_image_t    *src_img;
-       pixman_image_t    *dst_img;
+       pixman_image_t  *src_img;
+       pixman_image_t  *dst_img;
        struct pixman_f_transform ft;
        pixman_transform_t transform;
-       int                src_stride, dst_stride;
-       int                src_bpp;
-       int                dst_bpp;
-       double             scale_x, scale_y;
-       int                rotate_step;
-       int                ret = 0;
+       int                             src_stride, dst_stride;
+       int                             src_bpp;
+       int                             dst_bpp;
+       double                   scale_x, scale_y;
+       int                             rotate_step;
+       int                             ret = 0;
 
        RETURN_VAL_IF_FAIL(srcbuf != NULL, 0);
        RETURN_VAL_IF_FAIL(dstbuf != NULL, 0);
 
        TDM_DBG("src(%dx%d: %d,%d %dx%d) dst(%dx%d: %d,%d %dx%d) flip(%d,%d), rot(%d)",
-               sbw, sbh, sx, sy, sw, sh, dbw, dbh, dx, dy, dw, dh, hflip, vflip, rotate);
+                       sbw, sbh, sx, sy, sw, sh, dbw, dbh, dx, dy, dw, dh, hflip, vflip, rotate);
 
        src_bpp = PIXMAN_FORMAT_BPP(src_format) / 8;
        RETURN_VAL_IF_FAIL(src_bpp > 0, 0);
@@ -93,9 +93,9 @@ _tdm_vc4_pp_pixman_convert(pixman_op_t op,
        dst_stride = dbw * dst_bpp;
 
        src_img = pixman_image_create_bits(src_format, sbw, sbh, (uint32_t *)srcbuf,
-                                          src_stride);
+                                                                          src_stride);
        dst_img = pixman_image_create_bits(dst_format, dbw, dbh, (uint32_t *)dstbuf,
-                                          dst_stride);
+                                                                          dst_stride);
 
        GOTO_IF_FAIL(src_img != NULL, CANT_CONVERT);
        GOTO_IF_FAIL(dst_img != NULL, CANT_CONVERT);
@@ -201,7 +201,7 @@ _tdm_vc4_pp_convert(tdm_vc4_pp_buffer *buffer, tdm_info_pp *info)
                        dst_format = PIXMAN_a8b8g8r8;
                else if (dst_info.format == TBM_FORMAT_YVU420) {
                        TDM_ERR("can't convert %c%c%c%c to %c%c%c%c",
-                               FOURCC_STR(src_info.format), FOURCC_STR(dst_info.format));
+                                       FOURCC_STR(src_info.format), FOURCC_STR(dst_info.format));
                        goto fail_convert;
                }
        }
@@ -228,15 +228,15 @@ _tdm_vc4_pp_convert(tdm_vc4_pp_buffer *buffer, tdm_info_pp *info)
        }
 
        _tdm_vc4_pp_pixman_convert(PIXMAN_OP_SRC,
-                                  src_info.planes[0].ptr, dst_info.planes[0].ptr,
-                                  src_format, dst_format,
-                                  sbw, src_info.height,
-                                  info->src_config.pos.x, info->src_config.pos.y,
-                                  info->src_config.pos.w, info->src_config.pos.h,
-                                  dbw, dst_info.height,
-                                  info->dst_config.pos.x, info->dst_config.pos.y,
-                                  info->dst_config.pos.w, info->dst_config.pos.h,
-                                  rotate, hflip, 0);
+                                                          src_info.planes[0].ptr, dst_info.planes[0].ptr,
+                                                          src_format, dst_format,
+                                                          sbw, src_info.height,
+                                                          info->src_config.pos.x, info->src_config.pos.y,
+                                                          info->src_config.pos.w, info->src_config.pos.h,
+                                                          dbw, dst_info.height,
+                                                          info->dst_config.pos.x, info->dst_config.pos.y,
+                                                          info->dst_config.pos.w, info->dst_config.pos.h,
+                                                          rotate, hflip, 0);
        tbm_surface_unmap(buffer->src);
        tbm_surface_unmap(buffer->dst);
 
@@ -346,7 +346,7 @@ vc4_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst)
        RETURN_VAL_IF_FAIL(dst, TDM_ERROR_INVALID_PARAMETER);
 
        if (tbm_surface_internal_get_num_bos(src) > 1 ||
-           tbm_surface_internal_get_num_bos(dst) > 1) {
+               tbm_surface_internal_get_num_bos(dst) > 1) {
                TDM_ERR("can't handle multiple tbm bos");
                return TDM_ERROR_OPERATION_FAILED;
        }
@@ -380,9 +380,9 @@ vc4_pp_commit(tdm_pp *pp)
 
                if (pp_data->done_func)
                        pp_data->done_func(pp_data,
-                                          b->src,
-                                          b->dst,
-                                          pp_data->done_user_data);
+                                                          b->src,
+                                                          b->dst,
+                                                          pp_data->done_user_data);
                free(b);
        }
 
index 864eb77..4133332 100644 (file)
@@ -3,11 +3,11 @@
 
 #include "tdm_vc4.h"
 
-tdm_error    tdm_vc4_pp_get_capability(tdm_vc4_data *drm_data, tdm_caps_pp *caps);
-tdm_pp*      tdm_vc4_pp_create(tdm_vc4_data *drm_data, tdm_error *error);
-void         tdm_vc4_pp_handler(unsigned int prop_id, unsigned int *buf_idx,
-                                   unsigned int tv_sec, unsigned int tv_usec, void *data);
-void         tdm_vc4_pp_cb(int fd, unsigned int prop_id, unsigned int *buf_idx,
-                              unsigned int tv_sec, unsigned int tv_usec,
-                              void *user_data);
+tdm_error      tdm_vc4_pp_get_capability(tdm_vc4_data *drm_data, tdm_caps_pp *caps);
+tdm_pp*          tdm_vc4_pp_create(tdm_vc4_data *drm_data, tdm_error *error);
+void            tdm_vc4_pp_handler(unsigned int prop_id, unsigned int *buf_idx,
+                                                                  unsigned int tv_sec, unsigned int tv_usec, void *data);
+void            tdm_vc4_pp_cb(int fd, unsigned int prop_id, unsigned int *buf_idx,
+                                                         unsigned int tv_sec, unsigned int tv_usec,
+                                                         void *user_data);
 #endif /* _TDM_VC4_PP_H_ */