drm/komeda: Rename main engine clk name "mclk" to "aclk"

[linux.git] / drivers / gpu / drm / arm / display / komeda / komeda_kms.h

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
index ac3d9209b4d92fc30369c1cc23581db4200fa291..5f71e669d92bca698b5b09c5c480eeb8b59c8aa8 100644 (file)
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
@@ -7,11 +7,13 @@
 #ifndef _KOMEDA_KMS_H_
 #define _KOMEDA_KMS_H_
 
+#include <linux/list.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_device.h>
 #include <drm/drm_writeback.h>
+#include <drm/drm_print.h>
 #include <video/videomode.h>
 #include <video/display_timing.h>
 
@@ -31,6 +33,9 @@ struct komeda_plane {
         * Layers with same capabilities.
         */
        struct komeda_layer *layer;
+
+       /** @prop_img_enhancement: for on/off image enhancement */
+       struct drm_property *prop_img_enhancement;
 };
 
 /**
@@ -42,8 +47,11 @@ struct komeda_plane {
 struct komeda_plane_state {
        /** @base: &drm_plane_state */
        struct drm_plane_state base;
+       /** @zlist_node: zorder list node */
+       struct list_head zlist_node;
 
-       /* private properties */
+       /* @img_enhancement: on/off image enhancement */
+       u8 img_enhancement : 1;
 };
 
 /**
@@ -73,8 +81,14 @@ struct komeda_crtc {
         */
        struct komeda_pipeline *slave;
 
+       /** @wb_conn: komeda write back connector */
+       struct komeda_wb_connector *wb_conn;
+
        /** @disable_done: this flip_done is for tracing the disable */
        struct completion *disable_done;
+
+       /** @clock_ratio_property: property for ratio of (aclk << 32)/pxlclk */
+       struct drm_property *clock_ratio_property;
 };
 
 /**
@@ -97,6 +111,9 @@ struct komeda_crtc_state {
         * the active pipelines in once display instance
         */
        u32 active_pipes;
+
+       /** @clock_ratio: ratio of (aclk << 32)/pxlclk */
+       u64 clock_ratio;
 };
 
 /** struct komeda_kms_dev - for gather KMS related things */
@@ -116,6 +133,29 @@ struct komeda_kms_dev {
 #define to_kcrtc(p)    container_of(p, struct komeda_crtc, base)
 #define to_kcrtc_st(p) container_of(p, struct komeda_crtc_state, base)
 #define to_kdev(p)     container_of(p, struct komeda_kms_dev, base)
+#define to_wb_conn(x)  container_of(x, struct drm_writeback_connector, base)
+
+static inline bool is_writeback_only(struct drm_crtc_state *st)
+{
+       struct komeda_wb_connector *wb_conn = to_kcrtc(st->crtc)->wb_conn;
+       struct drm_connector *conn = wb_conn ? &wb_conn->base.base : NULL;
+
+       return conn && (st->connector_mask == BIT(drm_connector_index(conn)));
+}
+
+static inline bool
+is_only_changed_connector(struct drm_crtc_state *st, struct drm_connector *conn)
+{
+       struct drm_crtc_state *old_st;
+       u32 changed_connectors;
+
+       old_st = drm_atomic_get_old_crtc_state(st->state, st->crtc);
+       changed_connectors = st->connector_mask ^ old_st->connector_mask;
+
+       return BIT(drm_connector_index(conn)) == changed_connectors;
+}
+
+unsigned long komeda_calc_aclk(struct komeda_crtc_state *kcrtc_st);
 
 int komeda_kms_setup_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev);
 
@@ -123,6 +163,8 @@ int komeda_kms_add_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev);
 int komeda_kms_add_planes(struct komeda_kms_dev *kms, struct komeda_dev *mdev);
 int komeda_kms_add_private_objs(struct komeda_kms_dev *kms,
                                struct komeda_dev *mdev);
+int komeda_kms_add_wb_connectors(struct komeda_kms_dev *kms,
+                                struct komeda_dev *mdev);
 void komeda_kms_cleanup_private_objs(struct komeda_kms_dev *kms);
 
 void komeda_crtc_handle_event(struct komeda_crtc   *kcrtc,