target/linux/bcm27xx/patches-5.4/950-0293-drm-vc4-Add-Broadcast-RGB-connector-property.patch

   1 From 661cefed28f420f7ca6e52882d83a7a321d60256 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Fri, 14 Jun 2019 10:12:07 +0100
   4 Subject: [PATCH] drm/vc4: Add "Broadcast RGB" connector property
   5
   6 Some HDMI monitors do not abide by the full or limited
   7 (16-235) range RGB flags in the AVI infoframe. This can
   8 result in images looking washed out (if given limited and
   9 interpreting as full), or detail disappearing at the extremes
  10 (given full and interpreting as limited).
  11
  12 Copy the Intel i915 driver's approach of adding an override
  13 property ("Broadcast RGB") to force one mode or the other.
  14
  15 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  16 ---
  17  drivers/gpu/drm/vc4/vc4_firmware_kms.c | 190 +++++++++++++++++++++++--
  18  1 file changed, 177 insertions(+), 13 deletions(-)
  19
  20 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  21 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  22 @@ -287,6 +287,13 @@ to_vc4_fkms_encoder(struct drm_encoder *
  23         return container_of(encoder, struct vc4_fkms_encoder, base);
  24  }
  25
  26 +/* "Broadcast RGB" property.
  27 + * Allows overriding of HDMI full or limited range RGB
  28 + */
  29 +#define VC4_BROADCAST_RGB_AUTO 0
  30 +#define VC4_BROADCAST_RGB_FULL 1
  31 +#define VC4_BROADCAST_RGB_LIMITED 2
  32 +
  33  /* VC4 FKMS connector KMS struct */
  34  struct vc4_fkms_connector {
  35         struct drm_connector base;
  36 @@ -299,6 +306,8 @@ struct vc4_fkms_connector {
  37         struct vc4_dev *vc4_dev;
  38         u32 display_number;
  39         u32 display_type;
  40 +
  41 +       struct drm_property *broadcast_rgb_property;
  42  };
  43
  44  static inline struct vc4_fkms_connector *
  45 @@ -307,6 +316,16 @@ to_vc4_fkms_connector(struct drm_connect
  46         return container_of(connector, struct vc4_fkms_connector, base);
  47  }
  48
  49 +/* VC4 FKMS connector state */
  50 +struct vc4_fkms_connector_state {
  51 +       struct drm_connector_state base;
  52 +
  53 +       int broadcast_rgb;
  54 +};
  55 +
  56 +#define to_vc4_fkms_connector_state(x) \
  57 +                       container_of(x, struct vc4_fkms_connector_state, base)
  58 +
  59  static u32 vc4_get_display_type(u32 display_number)
  60  {
  61         const u32 display_types[] = {
  62 @@ -863,8 +882,6 @@ static void vc4_crtc_mode_set_nofb(struc
  63                       mode->picture_aspect_ratio, mode->flags);
  64         mb.timings.display = vc4_crtc->display_number;
  65
  66 -       mb.timings.video_id_code = frame.avi.video_code;
  67 -
  68         mb.timings.clock = mode->clock;
  69         mb.timings.hdisplay = mode->hdisplay;
  70         mb.timings.hsync_start = mode->hsync_start;
  71 @@ -902,11 +919,30 @@ static void vc4_crtc_mode_set_nofb(struc
  72                 break;
  73         }
  74
  75 -       if (!vc4_encoder->hdmi_monitor)
  76 +       if (!vc4_encoder->hdmi_monitor) {
  77                 mb.timings.flags |= TIMINGS_FLAGS_DVI;
  78 -       else if (drm_default_rgb_quant_range(mode) ==
  79 +               mb.timings.video_id_code = frame.avi.video_code;
  80 +       } else {
  81 +               struct vc4_fkms_connector_state *conn_state =
  82 +                       to_vc4_fkms_connector_state(vc4_crtc->connector->state);
  83 +
  84 +               /* Do not provide a VIC as the HDMI spec requires that we do not
  85 +                * signal the opposite of the defined range in the AVI
  86 +                * infoframe.
  87 +                */
  88 +               mb.timings.video_id_code = 0;
  89 +
  90 +               if (conn_state->broadcast_rgb == VC4_BROADCAST_RGB_AUTO) {
  91 +                       /* See CEA-861-E - 5.1 Default Encoding Parameters */
  92 +                       if (drm_default_rgb_quant_range(mode) ==
  93                                         HDMI_QUANTIZATION_RANGE_LIMITED)
  94 -               mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
  95 +                               mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
  96 +               } else {
  97 +                       if (conn_state->broadcast_rgb ==
  98 +                                               VC4_BROADCAST_RGB_LIMITED)
  99 +                               mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
 100 +               }
 101 +       }
 102
 103         /*
 104         FIXME: To implement
 105 @@ -1364,13 +1400,95 @@ static void vc4_fkms_connector_destroy(s
 106         drm_connector_cleanup(connector);
 107  }
 108
 109 +/**
 110 + * vc4_connector_duplicate_state - duplicate connector state
 111 + * @connector: digital connector
 112 + *
 113 + * Allocates and returns a copy of the connector state (both common and
 114 + * digital connector specific) for the specified connector.
 115 + *
 116 + * Returns: The newly allocated connector state, or NULL on failure.
 117 + */
 118 +struct drm_connector_state *
 119 +vc4_connector_duplicate_state(struct drm_connector *connector)
 120 +{
 121 +       struct vc4_fkms_connector_state *state;
 122 +
 123 +       state = kmemdup(connector->state, sizeof(*state), GFP_KERNEL);
 124 +       if (!state)
 125 +               return NULL;
 126 +
 127 +       __drm_atomic_helper_connector_duplicate_state(connector, &state->base);
 128 +       return &state->base;
 129 +}
 130 +
 131 +/**
 132 + * vc4_connector_atomic_get_property - hook for connector->atomic_get_property.
 133 + * @connector: Connector to get the property for.
 134 + * @state: Connector state to retrieve the property from.
 135 + * @property: Property to retrieve.
 136 + * @val: Return value for the property.
 137 + *
 138 + * Returns the atomic property value for a digital connector.
 139 + */
 140 +int vc4_connector_atomic_get_property(struct drm_connector *connector,
 141 +                                     const struct drm_connector_state *state,
 142 +                                     struct drm_property *property,
 143 +                                     uint64_t *val)
 144 +{
 145 +       struct vc4_fkms_connector *fkms_connector =
 146 +                                       to_vc4_fkms_connector(connector);
 147 +       struct vc4_fkms_connector_state *vc4_conn_state =
 148 +                                       to_vc4_fkms_connector_state(state);
 149 +
 150 +       if (property == fkms_connector->broadcast_rgb_property) {
 151 +               *val = vc4_conn_state->broadcast_rgb;
 152 +       } else {
 153 +               DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
 154 +                                property->base.id, property->name);
 155 +               return -EINVAL;
 156 +       }
 157 +
 158 +       return 0;
 159 +}
 160 +
 161 +/**
 162 + * vc4_connector_atomic_set_property - hook for connector->atomic_set_property.
 163 + * @connector: Connector to set the property for.
 164 + * @state: Connector state to set the property on.
 165 + * @property: Property to set.
 166 + * @val: New value for the property.
 167 + *
 168 + * Sets the atomic property value for a digital connector.
 169 + */
 170 +int vc4_connector_atomic_set_property(struct drm_connector *connector,
 171 +                                     struct drm_connector_state *state,
 172 +                                     struct drm_property *property,
 173 +                                     uint64_t val)
 174 +{
 175 +       struct vc4_fkms_connector *fkms_connector =
 176 +                                       to_vc4_fkms_connector(connector);
 177 +       struct vc4_fkms_connector_state *vc4_conn_state =
 178 +                                       to_vc4_fkms_connector_state(state);
 179 +
 180 +       if (property == fkms_connector->broadcast_rgb_property) {
 181 +               vc4_conn_state->broadcast_rgb = val;
 182 +               return 0;
 183 +       }
 184 +
 185 +       DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
 186 +                        property->base.id, property->name);
 187 +       return -EINVAL;
 188 +}
 189 +
 190  static const struct drm_connector_funcs vc4_fkms_connector_funcs = {
 191         .detect = vc4_fkms_connector_detect,
 192         .fill_modes = drm_helper_probe_single_connector_modes,
 193         .destroy = vc4_fkms_connector_destroy,
 194 -       .reset = drm_atomic_helper_connector_reset,
 195 -       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
 196 +       .atomic_duplicate_state = vc4_connector_duplicate_state,
 197         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 198 +       .atomic_get_property = vc4_connector_atomic_get_property,
 199 +       .atomic_set_property = vc4_connector_atomic_set_property,
 200  };
 201
 202  static const struct drm_connector_helper_funcs vc4_fkms_connector_helper_funcs = {
 203 @@ -1383,12 +1501,40 @@ static const struct drm_connector_helper
 204         .best_encoder = vc4_fkms_connector_best_encoder,
 205  };
 206
 207 +static const struct drm_prop_enum_list broadcast_rgb_names[] = {
 208 +       { VC4_BROADCAST_RGB_AUTO, "Automatic" },
 209 +       { VC4_BROADCAST_RGB_FULL, "Full" },
 210 +       { VC4_BROADCAST_RGB_LIMITED, "Limited 16:235" },
 211 +};
 212 +
 213 +static void
 214 +vc4_attach_broadcast_rgb_property(struct vc4_fkms_connector *fkms_connector)
 215 +{
 216 +       struct drm_device *dev = fkms_connector->base.dev;
 217 +       struct drm_property *prop;
 218 +
 219 +       prop = fkms_connector->broadcast_rgb_property;
 220 +       if (!prop) {
 221 +               prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
 222 +                                               "Broadcast RGB",
 223 +                                               broadcast_rgb_names,
 224 +                                               ARRAY_SIZE(broadcast_rgb_names));
 225 +               if (!prop)
 226 +                       return;
 227 +
 228 +               fkms_connector->broadcast_rgb_property = prop;
 229 +       }
 230 +
 231 +       drm_object_attach_property(&fkms_connector->base.base, prop, 0);
 232 +}
 233 +
 234  static struct drm_connector *
 235  vc4_fkms_connector_init(struct drm_device *dev, struct drm_encoder *encoder,
 236                         u32 display_num)
 237  {
 238         struct drm_connector *connector = NULL;
 239         struct vc4_fkms_connector *fkms_connector;
 240 +       struct vc4_fkms_connector_state *conn_state = NULL;
 241         struct vc4_dev *vc4_dev = to_vc4_dev(dev);
 242         int ret = 0;
 243
 244 @@ -1397,9 +1543,18 @@ vc4_fkms_connector_init(struct drm_devic
 245         fkms_connector = devm_kzalloc(dev->dev, sizeof(*fkms_connector),
 246                                       GFP_KERNEL);
 247         if (!fkms_connector) {
 248 -               ret = -ENOMEM;
 249 -               goto fail;
 250 +               return ERR_PTR(-ENOMEM);
 251 +       }
 252 +
 253 +       /*
 254 +        * Allocate enough memory to hold vc4_fkms_connector_state,
 255 +        */
 256 +       conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
 257 +       if (!conn_state) {
 258 +               kfree(fkms_connector);
 259 +               return ERR_PTR(-ENOMEM);
 260         }
 261 +
 262         connector = &fkms_connector->base;
 263
 264         fkms_connector->encoder = encoder;
 265 @@ -1407,6 +1562,9 @@ vc4_fkms_connector_init(struct drm_devic
 266         fkms_connector->display_type = vc4_get_display_type(display_num);
 267         fkms_connector->vc4_dev = vc4_dev;
 268
 269 +       __drm_atomic_helper_connector_reset(connector,
 270 +                                           &conn_state->base);
 271 +
 272         if (fkms_connector->display_type == DRM_MODE_ENCODER_DSI) {
 273                 drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
 274                                    DRM_MODE_CONNECTOR_DSI);
 275 @@ -1427,10 +1585,14 @@ vc4_fkms_connector_init(struct drm_devic
 276                 connector->interlace_allowed = 0;
 277         }
 278
 279 -       /* Create and attach TV margin props to this connector. */
 280 -       ret = drm_mode_create_tv_margin_properties(dev);
 281 -       if (ret)
 282 -               return ERR_PTR(ret);
 283 +       /* Create and attach TV margin props to this connector.
 284 +        * Already done for SDTV outputs.
 285 +        */
 286 +       if (fkms_connector->display_type != DRM_MODE_ENCODER_TVDAC) {
 287 +               ret = drm_mode_create_tv_margin_properties(dev);
 288 +               if (ret)
 289 +                       goto fail;
 290 +       }
 291
 292         drm_connector_attach_tv_margin_properties(connector);
 293
 294 @@ -1439,6 +1601,8 @@ vc4_fkms_connector_init(struct drm_devic
 295
 296         connector->doublescan_allowed = 0;
 297
 298 +       vc4_attach_broadcast_rgb_property(fkms_connector);
 299 +
 300         drm_connector_attach_encoder(connector, encoder);
 301
 302         return connector;