projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sh-for-4.8' of git://git.libc.org/linux-sh
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
sti
/
sti_plane.h
diff --git
a/drivers/gpu/drm/sti/sti_plane.h
b/drivers/gpu/drm/sti/sti_plane.h
index
c50a3b9
..
e0ea1dd
100644
(file)
--- a/
drivers/gpu/drm/sti/sti_plane.h
+++ b/
drivers/gpu/drm/sti/sti_plane.h
@@
-11,8
+11,6
@@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_plane_helper.h>
-extern struct drm_plane_funcs sti_plane_helpers_funcs;
-
#define to_sti_plane(x) container_of(x, struct sti_plane, drm_plane)
#define STI_PLANE_TYPE_SHIFT 8
#define to_sti_plane(x) container_of(x, struct sti_plane, drm_plane)
#define STI_PLANE_TYPE_SHIFT 8
@@
-57,7
+55,7
@@
struct sti_fps_info {
unsigned int last_frame_counter;
unsigned int curr_field_counter;
unsigned int last_field_counter;
unsigned int last_frame_counter;
unsigned int curr_field_counter;
unsigned int last_field_counter;
-
struct timespec
last_timestamp;
+
ktime_t
last_timestamp;
char fps_str[FPS_LENGTH];
char fips_str[FPS_LENGTH];
};
char fps_str[FPS_LENGTH];
char fips_str[FPS_LENGTH];
};
@@
-83,6
+81,11
@@
const char *sti_plane_to_str(struct sti_plane *plane);
void sti_plane_update_fps(struct sti_plane *plane,
bool new_frame,
bool new_field);
void sti_plane_update_fps(struct sti_plane *plane,
bool new_frame,
bool new_field);
+
+int sti_plane_set_property(struct drm_plane *drm_plane,
+ struct drm_property *property,
+ uint64_t val);
+
void sti_plane_init_property(struct sti_plane *plane,
enum drm_plane_type type);
#endif
void sti_plane_init_property(struct sti_plane *plane,
enum drm_plane_type type);
#endif