git.openwrt.org Git - openwrt/staging/ansuel.git/blob

   1 From 5ba39f5b08d6df4aadbe60768b82b5e2d405c0d5 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Mon, 14 Nov 2022 19:32:10 +0000
   4 Subject: [PATCH 1117/1135] drm/vc4: hdmi: Add property to allow manual config
   5  of RGB or YCbCr
   6
   7 Add a custom property "Output format" that allows the overriding
   8 of the default colourspace choice in the way that the old
   9 firmware hdmi_pixel_encoding property did. If the chosen format is not
  10 supported, then it will still drop back to the older behaviour.
  11
  12 This won't be acceptable to upstream, but it adds back the missing
  13 functionality of hdmi_pixel_encoding.
  14
  15 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  16 ---
  17  drivers/gpu/drm/vc4/vc4_hdmi.c | 59 ++++++++++++++++++++++++++++++++++
  18  drivers/gpu/drm/vc4/vc4_hdmi.h |  8 +++++
  19  2 files changed, 67 insertions(+)
  20
  21 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  22 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  23 @@ -599,6 +599,7 @@ static int vc4_hdmi_connector_atomic_che
  24
  25         if (old_state->colorspace != new_state->colorspace ||
  26             old_vc4_state->broadcast_rgb != new_vc4_state->broadcast_rgb ||
  27 +           old_vc4_state->requested_output_format != new_vc4_state->requested_output_format ||
  28             !drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
  29                 struct drm_crtc_state *crtc_state;
  30
  31 @@ -625,6 +626,8 @@ static int vc4_hdmi_connector_get_proper
  32
  33         if (property == vc4_hdmi->broadcast_rgb_property) {
  34                 *val = vc4_conn_state->broadcast_rgb;
  35 +       } else if (property == vc4_hdmi->output_format_property) {
  36 +               *val = vc4_conn_state->requested_output_format;
  37         } else {
  38                 drm_dbg(drm, "Unknown property [PROP:%d:%s]\n",
  39                         property->base.id, property->name);
  40 @@ -648,6 +651,9 @@ static int vc4_hdmi_connector_set_proper
  41         if (property == vc4_hdmi->broadcast_rgb_property) {
  42                 vc4_conn_state->broadcast_rgb = val;
  43                 return 0;
  44 +       } else if (property == vc4_hdmi->output_format_property) {
  45 +               vc4_conn_state->requested_output_format = val;
  46 +               return 0;
  47         }
  48
  49         drm_dbg(drm, "Unknown property [PROP:%d:%s]\n",
  50 @@ -692,6 +698,7 @@ vc4_hdmi_connector_duplicate_state(struc
  51         new_state->tmds_char_rate = vc4_state->tmds_char_rate;
  52         new_state->output_bpc = vc4_state->output_bpc;
  53         new_state->output_format = vc4_state->output_format;
  54 +       new_state->requested_output_format = vc4_state->requested_output_format;
  55         new_state->broadcast_rgb = vc4_state->broadcast_rgb;
  56         __drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
  57
  58 @@ -740,6 +747,33 @@ vc4_hdmi_attach_broadcast_rgb_property(s
  59                                    VC4_HDMI_BROADCAST_RGB_AUTO);
  60  }
  61
  62 +static const struct drm_prop_enum_list output_format_names[] = {
  63 +       { VC4_HDMI_OUTPUT_AUTO, "Automatic" },
  64 +       { VC4_HDMI_OUTPUT_RGB, "RGB" },
  65 +       { VC4_HDMI_OUTPUT_YUV422, "YCbCr 4:2:2" },
  66 +       { VC4_HDMI_OUTPUT_YUV444, "YCbCr 4:4:4" },
  67 +};
  68 +
  69 +static void
  70 +vc4_hdmi_attach_output_format_property(struct drm_device *dev,
  71 +                                      struct vc4_hdmi *vc4_hdmi)
  72 +{
  73 +       struct drm_property *prop = vc4_hdmi->output_format_property;
  74 +
  75 +       if (!prop) {
  76 +               prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
  77 +                                               "Output format",
  78 +                                               output_format_names,
  79 +                                               ARRAY_SIZE(output_format_names));
  80 +               if (!prop)
  81 +                       return;
  82 +
  83 +               vc4_hdmi->output_format_property = prop;
  84 +       }
  85 +
  86 +       drm_object_attach_property(&vc4_hdmi->connector.base, prop, 0);
  87 +}
  88 +
  89  static int vc4_hdmi_connector_init(struct drm_device *dev,
  90                                    struct vc4_hdmi *vc4_hdmi)
  91  {
  92 @@ -790,6 +824,7 @@ static int vc4_hdmi_connector_init(struc
  93         }
  94
  95         vc4_hdmi_attach_broadcast_rgb_property(dev, vc4_hdmi);
  96 +       vc4_hdmi_attach_output_format_property(dev, vc4_hdmi);
  97
  98         drm_connector_attach_encoder(connector, encoder);
  99
 100 @@ -1960,6 +1995,10 @@ static void vc4_hdmi_encoder_atomic_mode
 101                       &crtc_state->adjusted_mode);
 102         vc4_hdmi->output_bpc = vc4_state->output_bpc;
 103         vc4_hdmi->output_format = vc4_state->output_format;
 104 +       vc4_hdmi->requested_output_format = vc4_state->requested_output_format;
 105 +       memcpy(&vc4_hdmi->saved_adjusted_mode,
 106 +              &crtc_state->adjusted_mode,
 107 +              sizeof(vc4_hdmi->saved_adjusted_mode));
 108         mutex_unlock(&vc4_hdmi->mutex);
 109  }
 110
 111 @@ -2118,6 +2157,26 @@ vc4_hdmi_encoder_compute_format(const st
 112         const struct drm_display_info *info = &connector->display_info;
 113         unsigned int format;
 114
 115 +       if (vc4_state->requested_output_format != VC4_HDMI_OUTPUT_AUTO) {
 116 +               drm_dbg(dev, "Trying with user requested output %u\n",
 117 +                       vc4_state->requested_output_format);
 118 +
 119 +               format = vc4_state->requested_output_format;
 120 +               if (vc4_hdmi_sink_supports_format_bpc(vc4_hdmi, info, mode,
 121 +                                                     format, bpc)) {
 122 +                       int ret;
 123 +
 124 +                       ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state,
 125 +                                                            mode, bpc, format);
 126 +                       if (!ret) {
 127 +                               vc4_state->output_format = format;
 128 +                               return 0;
 129 +                       }
 130 +               }
 131 +
 132 +               return -EINVAL;
 133 +       }
 134 +
 135         drm_dbg(dev, "Trying with an RGB output\n");
 136
 137         format = VC4_HDMI_OUTPUT_RGB;
 138 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 139 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 140 @@ -113,6 +113,7 @@ struct vc4_hdmi_audio {
 141  };
 142
 143  enum vc4_hdmi_output_format {
 144 +       VC4_HDMI_OUTPUT_AUTO,
 145         VC4_HDMI_OUTPUT_RGB,
 146         VC4_HDMI_OUTPUT_YUV422,
 147         VC4_HDMI_OUTPUT_YUV444,
 148 @@ -138,6 +139,7 @@ struct vc4_hdmi {
 149         struct delayed_work scrambling_work;
 150
 151         struct drm_property *broadcast_rgb_property;
 152 +       struct drm_property *output_format_property;
 153
 154         struct i2c_adapter *ddc;
 155         void __iomem *hdmicore_regs;
 156 @@ -230,6 +232,11 @@ struct vc4_hdmi {
 157          * for use outside of KMS hooks. Protected by @mutex.
 158          */
 159         enum vc4_hdmi_output_format output_format;
 160 +       /**
 161 +        * @requested_output_format: Copy of @vc4_connector_state.requested_output_format
 162 +        * for use outside of KMS hooks. Protected by @mutex.
 163 +        */
 164 +       enum vc4_hdmi_output_format requested_output_format;
 165
 166         /**
 167          * @plugged_cb: Callback provided by hdmi-codec to indicate that an
 168 @@ -273,6 +280,7 @@ struct vc4_hdmi_connector_state {
 169         unsigned int                    output_bpc;
 170         enum vc4_hdmi_output_format     output_format;
 171         enum vc4_hdmi_broadcast_rgb     broadcast_rgb;
 172 +       enum vc4_hdmi_output_format     requested_output_format;
 173  };
 174
 175  #define conn_state_to_vc4_hdmi_conn_state(_state)                      \