xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/vkms: Rename vkms_crc.c into vkms_composer.c

Browse Source 
As a preparation work for introducing writeback to vkms, this patch
renames the file vkms_crc.c into vkms_composer.c. Accordingly, it also
adjusts the functions and data structures to match the changes.

No functional change.

Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/dea62063077ebf5cc1dfce8876e56788d15367e6.1561491964.git.rodrigosiqueiramelo@gmail.com
This commit is contained in:
Rodrigo Siqueira
2019-06-25 22:37:05 -03:00
parent e9d85f731d
commit a4e7e98e90
6 changed files with 101 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/vkms/vkms_drv.h
View File

@@ -20,7 +20,7 @@
extern bool enable_cursor;
struct vkms_crc_data {
struct vkms_composer {
struct drm_framebuffer fb;
struct drm_rect src, dst;
unsigned int offset;
@@ -31,29 +31,29 @@ struct vkms_crc_data {
/**
* vkms_plane_state - Driver specific plane state
* @base: base plane state
* @crc_data: data required for CRC computation
* @composer: data required for composing computation
*/
struct vkms_plane_state {
struct drm_plane_state base;
struct vkms_crc_data *crc_data;
struct vkms_composer *composer;
};
/**
* vkms_crtc_state - Driver specific CRTC state
* @base: base CRTC state
* @crc_work: work struct to compute and add CRC entries
* @composer_work: work struct to compose and add CRC entries
* @n_frame_start: start frame number for computed CRC
* @n_frame_end: end frame number for computed CRC
*/
struct vkms_crtc_state {
struct drm_crtc_state base;
struct work_struct crc_work;
struct work_struct composer_work;
int num_active_planes;
/* stack of active planes for crc computation, should be in z order */
struct vkms_plane_state **active_planes;
/* below three are protected by vkms_output.crc_lock */
/* below three are protected by vkms_output.composer_lock */
bool crc_pending;
u64 frame_start;
u64 frame_end;
@@ -66,16 +66,16 @@ struct vkms_output {
struct hrtimer vblank_hrtimer;
ktime_t period_ns;
struct drm_pending_vblank_event *event;
/* ordered wq for crc_work */
struct workqueue_struct *crc_workq;
/* protects concurrent access to crc_data */
/* ordered wq for composer_work */
struct workqueue_struct *composer_workq;
/* protects concurrent access to composer */
spinlock_t lock;
/* protected by @lock */
bool crc_enabled;
struct vkms_crtc_state *crc_state;
bool composer_enabled;
struct vkms_crtc_state *composer_state;
spinlock_t crc_lock;
spinlock_t composer_lock;
};
struct vkms_device {
@@ -143,6 +143,8 @@ const char *const *vkms_get_crc_sources(struct drm_crtc *crtc,
int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name);
int vkms_verify_crc_source(struct drm_crtc *crtc, const char *source_name,
size_t *values_cnt);
void vkms_crc_work_handle(struct work_struct *work);
/* Composer Support */
void vkms_composer_worker(struct work_struct *work);
#endif /* _VKMS_DRV_H_ */