drm/amd/display: [FW Promotion] Release 0.0.216.0

 - Implement command interface to query ABM SW algorithm and
   HW caps. This is primarily intended as a debugging interface

 - Add new definitions for max number of histogram bins and ABM
   curve segments available in hardware

 - Add structures to retrieve caps to describe ABM HW caps
   since not all ASICs have the same number of cure segments and
   bins

Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Anthony Koo <anthony.koo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index 35096aa3d85b517f4b117a3f9caea0a5351903cf..abf248d46b1c2fa00b6cf4aafeb27431ef497782 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -81,6 +81,16 @@
  */
 #define NUM_BL_CURVE_SEGS               16
 
+/**
+ * Maximum number of segments in ABM ACE curve.
+ */
+#define ABM_MAX_NUM_OF_ACE_SEGMENTS         64
+
+/**
+ * Maximum number of bins in ABM histogram.
+ */
+#define ABM_MAX_NUM_OF_HG_BINS              64
+
 /* Maximum number of SubVP streams */
 #define DMUB_MAX_SUBVP_STREAMS 2
 
@@ -3865,6 +3875,82 @@ enum dmub_cmd_abm_type {
         * on restore we update state with passed in data.
         */
        DMUB_CMD__ABM_SAVE_RESTORE      = 7,
+
+       /**
+        * Query ABM caps.
+        */
+       DMUB_CMD__ABM_QUERY_CAPS        = 8,
+};
+
+struct abm_ace_curve {
+       /**
+        * @offsets: ACE curve offsets.
+        */
+       uint32_t offsets[ABM_MAX_NUM_OF_ACE_SEGMENTS];
+
+       /**
+        * @thresholds: ACE curve thresholds.
+        */
+       uint32_t thresholds[ABM_MAX_NUM_OF_ACE_SEGMENTS];
+
+       /**
+        * @slopes: ACE curve slopes.
+        */
+       uint32_t slopes[ABM_MAX_NUM_OF_ACE_SEGMENTS];
+};
+
+struct fixed_pt_format {
+       /**
+        * @sign_bit: Indicates whether one bit is reserved for the sign.
+        */
+       bool sign_bit;
+
+       /**
+        * @num_int_bits: Number of bits used for integer part.
+        */
+       uint8_t num_int_bits;
+
+       /**
+        * @num_frac_bits: Number of bits used for fractional part.
+        */
+       uint8_t num_frac_bits;
+
+       /**
+        * @pad: Explicit padding to 4 byte boundary.
+        */
+       uint8_t pad;
+};
+
+struct abm_caps {
+       /**
+        * @num_hg_bins: Number of histogram bins.
+        */
+       uint8_t num_hg_bins;
+
+       /**
+        * @num_ace_segments: Number of ACE curve segments.
+        */
+       uint8_t num_ace_segments;
+
+       /**
+        * @pad: Explicit padding to 4 byte boundary.
+        */
+       uint8_t pad[2];
+
+       /**
+        * @ace_thresholds_format: Format of the ACE thresholds. If not programmable, it is set to 0.
+        */
+       struct fixed_pt_format ace_thresholds_format;
+
+       /**
+        * @ace_offsets_format: Format of the ACE offsets. If not programmable, it is set to 0.
+        */
+       struct fixed_pt_format ace_offsets_format;
+
+       /**
+        * @ace_slopes_format: Format of the ACE slopes.
+        */
+       struct fixed_pt_format ace_slopes_format;
 };
 
 /**
@@ -4274,6 +4360,54 @@ struct dmub_rb_cmd_abm_pause {
        struct dmub_cmd_abm_pause_data abm_pause_data;
 };
 
+/**
+ * Data passed from driver to FW in a DMUB_CMD__ABM_QUERY_CAPS command.
+ */
+struct dmub_cmd_abm_query_caps_in {
+       /**
+        * Panel instance.
+        */
+       uint8_t panel_inst;
+
+       /**
+        * Explicit padding to 4 byte boundary.
+        */
+       uint8_t pad[3];
+};
+
+/**
+ * Data passed from FW to driver in a DMUB_CMD__ABM_QUERY_CAPS command.
+ */
+struct dmub_cmd_abm_query_caps_out {
+       /**
+        * SW Algorithm caps.
+        */
+       struct abm_caps sw_caps;
+
+       /**
+        * ABM HW caps.
+        */
+       struct abm_caps hw_caps;
+};
+
+/**
+ * Definition of a DMUB_CMD__ABM_QUERY_CAPS command.
+ */
+struct dmub_rb_cmd_abm_query_caps {
+       /**
+        * Command header.
+        */
+       struct dmub_cmd_header header;
+
+       /**
+        * Data passed between FW and driver in a DMUB_CMD__ABM_QUERY_CAPS command.
+        */
+       union {
+               struct dmub_cmd_abm_query_caps_in  abm_query_caps_in;
+               struct dmub_cmd_abm_query_caps_out abm_query_caps_out;
+       } data;
+};
+
 /**
  * Definition of a DMUB_CMD__ABM_SAVE_RESTORE command.
  */
@@ -4838,6 +4972,11 @@ union dmub_rb_cmd {
         */
        struct dmub_rb_cmd_abm_save_restore abm_save_restore;
 
+       /**
+        * Definition of a DMUB_CMD__ABM_QUERY_CAPS command.
+        */
+       struct dmub_rb_cmd_abm_query_caps abm_query_caps;
+
        /**
         * Definition of a DMUB_CMD__DP_AUX_ACCESS command.
         */