[V2,2/5] drm/vkms: Rename crc_enabled to composer_enabled

Commit Message

Rodrigo Siqueira June 18, 2019, 2:43 a.m. UTC

Rename crc_enabled to composer_enabled since it does more than just
compute a CRC.

Signed-off-by: Rodrigo Siqueira <[e-mail]>
---
 drivers/gpu/drm/vkms/vkms_crc.c  | 2 +-
 drivers/gpu/drm/vkms/vkms_crtc.c | 2 +-
 drivers/gpu/drm/vkms/vkms_drv.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c
index 3c6a35aba494..8b215677581f 100644
--- a/drivers/gpu/drm/vkms/vkms_crc.c
+++ b/drivers/gpu/drm/vkms/vkms_crc.c
@@ -165,7 +165,7 @@  int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
 	ret = vkms_crc_parse_source(src_name, &enabled);
 
 	spin_lock_irq(&out->lock);
-	out->crc_enabled = enabled;
+	out->composer_enabled = enabled;
 	spin_unlock_irq(&out->lock);
 
 	return ret;
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index 14156ed70415..24a3ff0f7ff1 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -25,7 +25,7 @@  static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
 		DRM_ERROR("vkms failure on handling vblank");
 
 	state = output->crc_state;
-	if (state && output->crc_enabled) {
+	if (state && output->composer_enabled) {
 		u64 frame = drm_crtc_accurate_vblank_count(crtc);
 
 		/* update frame_start only if a queued vkms_crc_work_handle()
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 4e7450111d45..a887c05ff70e 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -72,7 +72,7 @@  struct vkms_output {
 	spinlock_t lock;
 
 	/* protected by @lock */
-	bool crc_enabled;
+	bool composer_enabled;
 	struct vkms_crtc_state *crc_state;
 
 	spinlock_t crc_lock;