Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 65 additions & 18 deletions drivers/gpu/drm/apple/dcp-display-metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,49 +215,96 @@ static void dcp_panel_color(struct edid *edid, const struct dcp_display_metadata
dcp_metadata_color(edid, &named);
}

/* Build only a base block: the authoritative firmware mode list stays separate. */
/* EDID 1.4 dummy descriptor: a placeholder for an unused 18-byte slot. */
#define DCP_EDID_DETAIL_DUMMY 0x10

/*
* The descriptor only names the sink's preferred timing: a sync polarity the
* firmware does not report is given as positive, and the authoritative mode
* list stays separate.
*/
static void dcp_metadata_timing_polarity(struct drm_display_mode *mode)
{
if (!(mode->flags & (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NHSYNC)))
mode->flags |= DRM_MODE_FLAG_PHSYNC;
if (!(mode->flags & (DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_NVSYNC)))
mode->flags |= DRM_MODE_FLAG_PVSYNC;
}

/* Whether @mode fits an EDID detailed timing. */
bool dcp_metadata_timing_fits(const struct drm_display_mode *mode)
{
const struct dcp_display_metadata none = {};
struct detailed_timing timing;
struct drm_display_mode m = *mode;

dcp_metadata_timing_polarity(&m);
return !dcp_metadata_timing(&timing, &m, &none);
}

/*
* Build only a base block: the authoritative firmware mode list stays
* separate. What the sink leaves out stays undefined, as in its own EDID: no
* image size, the sRGB primaries, no manufacture week. Without a timing that
* fits a detailed timing descriptor, the first descriptor is a dummy one.
*/
static int dcp_metadata_block(struct edid *edid, const struct dcp_display_metadata *metadata,
const struct drm_display_mode *mode)
{
bool sized = metadata->width_cm && metadata->width_cm <= 255 &&
metadata->height_cm && metadata->height_cm <= 255;
bool dated = metadata->year >= 1990 && metadata->year <= 2245 &&
(metadata->week <= 53 || metadata->week == 255);
struct dcp_display_metadata image = *metadata;
u32 manufacturer = 0;
u8 checksum = 0;
int ret;

if (!metadata->width_cm || metadata->width_cm > 255 ||
!metadata->height_cm || metadata->height_cm > 255 ||
metadata->product > U16_MAX || metadata->week > 53 ||
metadata->year < 1990 || metadata->year > 2245 ||
metadata->gamma < 65536 || metadata->gamma > (354U << 16) / 100 ||
strnlen(metadata->manufacturer, 4) != 3)
if (metadata->product > U16_MAX || strnlen(metadata->manufacturer, 4) != 3)
return -EINVAL;
for (unsigned int i = 0; i < 3; i++) {
if (metadata->manufacturer[i] < 'A' || metadata->manufacturer[i] > 'Z')
return -EINVAL;
manufacturer = manufacturer << 5 | (metadata->manufacturer[i] - '@');
}
if (!sized) {
image.width_cm = 0;
image.height_cm = 0;
}

memset(edid, 0, sizeof(*edid));
memcpy(edid->header, "\x00\xff\xff\xff\xff\xff\xff\x00", 8);
edid->product_id.manufacturer_name = cpu_to_be16(manufacturer);
edid->product_id.product_code = cpu_to_le16(metadata->product);
edid->product_id.serial_number = cpu_to_le32(metadata->serial);
edid->product_id.week_of_manufacture = metadata->week;
edid->product_id.year_of_manufacture = metadata->year - 1990;
edid->product_id.week_of_manufacture = dated ? metadata->week : 0;
edid->product_id.year_of_manufacture = dated ? metadata->year - 1990 : 0;
edid->version = 1;
edid->revision = 4;
/* No claim about connector interface, bit depth, HDR, audio or VRR. */
edid->input = DRM_EDID_INPUT_DIGITAL;
edid->width_cm = metadata->width_cm;
edid->height_cm = metadata->height_cm;
ret = dcp_metadata_color(edid, metadata);
if (ret)
return ret;
edid->width_cm = image.width_cm;
edid->height_cm = image.height_cm;
dcp_panel_color(edid, metadata, dcp_color_space_lookup("srgb"));
edid->features = DRM_EDID_FEATURE_PREFERRED_TIMING | DRM_EDID_FEATURE_RGB;
memset(edid->standard_timings, 1, sizeof(edid->standard_timings));
ret = dcp_metadata_timing(&edid->detailed_timings[0], mode, metadata);
if (!ret)
ret = dcp_metadata_text(&edid->detailed_timings[1], EDID_DETAIL_MONITOR_NAME,
metadata->name);
ret = -EINVAL;
if (mode) {
struct drm_display_mode m = *mode;

dcp_metadata_timing_polarity(&m);
ret = dcp_metadata_timing(&edid->detailed_timings[0], &m, &image);
}
if (ret) {
memset(&edid->detailed_timings[0], 0, sizeof(edid->detailed_timings[0]));
edid->detailed_timings[0].data.other_data.type = DCP_EDID_DETAIL_DUMMY;
edid->features &= ~DRM_EDID_FEATURE_PREFERRED_TIMING;
}
ret = metadata->name[0] ?
dcp_metadata_text(&edid->detailed_timings[1], EDID_DETAIL_MONITOR_NAME,
metadata->name) :
dcp_metadata_text(&edid->detailed_timings[1], EDID_DETAIL_MONITOR_STRING,
"DCP display");
if (!ret)
ret = dcp_metadata_text(&edid->detailed_timings[2], EDID_DETAIL_MONITOR_STRING,
"DCP metadata");
Expand Down
11 changes: 11 additions & 0 deletions drivers/gpu/drm/apple/dcp-display-metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#ifndef APPLE_DCP_DISPLAY_METADATA_H
#define APPLE_DCP_DISPLAY_METADATA_H

#include <linux/bits.h>
#include <linux/types.h>

/* Values reported by DisplayAttributes, not a copy of the sink's EDID. */
Expand All @@ -17,8 +18,17 @@ struct dcp_display_metadata {
/* Optional HDR capability: false and zero when not reported */
bool pq, static_metadata_type1, bt2020_rgb;
u32 max_luminance, max_fall, min_luminance; /* 16.16 cd/m2 */
/* DCP_METADATA_DEFAULT_*: what the sink left out, so the EDID leaves undefined */
u32 defaults;
};

#define DCP_METADATA_DEFAULT_SIZE BIT(0)
#define DCP_METADATA_DEFAULT_COLOR BIT(1)
#define DCP_METADATA_DEFAULT_NAME BIT(2)
#define DCP_METADATA_DEFAULT_DATE BIT(3)
#define DCP_METADATA_DEFAULT_SERIAL BIT(4)
#define DCP_METADATA_DEFAULT_TIMING BIT(5)

/* Calibrated target named by the boot-populated raw ADT. */
enum dcp_panel_gamut {
DCP_PANEL_GAMUT_UNSPECIFIED,
Expand Down Expand Up @@ -46,6 +56,7 @@ struct drm_display_mode;
struct dcp_display_mode;
const struct drm_edid *dcp_metadata_edid(const struct dcp_display_metadata *metadata,
const struct drm_display_mode *mode);
bool dcp_metadata_timing_fits(const struct drm_display_mode *mode);

const struct drm_edid *dcp_panel_edid(const struct dcp_display_metadata *metadata,
const struct dcp_color_space *target,
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/apple/dcp-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,8 @@ void dcp_firmware_metadata_attributes(struct apple_dcp *dcp,
const struct dcp_display_metadata *attributes);
void dcp_firmware_metadata_timing(struct apple_dcp *dcp);
bool dcp_firmware_metadata_current(struct apple_dcp *dcp, u64 generation);
const struct drm_edid *dcp_firmware_edid(struct apple_dcp *dcp, u64 *generation);
const struct drm_edid *dcp_firmware_edid(struct apple_dcp *dcp, u64 *generation,
u32 *defaults);

void iomfb_scanout_complete_h17p(struct apple_dcp *dcp);
void iomfb_present_backlight_h17p(struct apple_dcp *dcp);
Expand Down
31 changes: 21 additions & 10 deletions drivers/gpu/drm/apple/dcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1039,10 +1039,10 @@ static void dcp_firmware_metadata_notify(struct apple_dcp *dcp)
unsigned long flags;
bool ready;

/* The sink's identity is enough: a timing that fits a descriptor is optional. */
spin_lock_irqsave(&dcp->metadata.lock, flags);
ready = dcp->metadata.attributes_valid && dcp->metadata.timing_valid &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.attributes_ticket) &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.timing_ticket);
ready = dcp->metadata.attributes_valid &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.attributes_ticket);
spin_unlock_irqrestore(&dcp->metadata.lock, flags);
if (ready && dcp->connector && READ_ONCE(dcp->connector->connected))
schedule_work(&dcp->connector->hotplug_wq);
Expand Down Expand Up @@ -1094,9 +1094,14 @@ void dcp_firmware_metadata_timing(struct apple_dcp *dcp)
*/
for (i = 0; i < dcp->nr_modes; i++) {
const struct dcp_display_mode *m = &dcp->modes[i];
struct drm_display_mode timing = m->mode;

if (!m->metadata_timing_valid)
continue;
/* A descriptor holds at most 655.35 MHz: faster modes are left to the list. */
timing.flags |= m->metadata_sync_flags;
if (!dcp_metadata_timing_fits(&timing))
continue;
if (best == UINT_MAX || (m->mode.type & DRM_MODE_TYPE_PREFERRED) ||
(!(dcp->modes[best].mode.type & DRM_MODE_TYPE_PREFERRED) &&
m->score > dcp->modes[best].score))
Expand Down Expand Up @@ -1128,29 +1133,35 @@ bool dcp_firmware_metadata_current(struct apple_dcp *dcp, u64 generation)
return valid;
}

const struct drm_edid *dcp_firmware_edid(struct apple_dcp *dcp, u64 *generation)
const struct drm_edid *dcp_firmware_edid(struct apple_dcp *dcp, u64 *generation,
u32 *defaults)
{
struct dcp_display_metadata attributes;
struct drm_display_mode preferred;
const struct drm_edid *edid;
unsigned long flags;
bool valid;
bool valid, timing = false;

if (!dcp_firmware_metadata_enabled(dcp))
return ERR_PTR(-ENODEV);
spin_lock_irqsave(&dcp->metadata.lock, flags);
valid = dcp->metadata.attributes_valid && dcp->metadata.timing_valid &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.attributes_ticket) &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.timing_ticket);
valid = dcp->metadata.attributes_valid &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.attributes_ticket);
if (valid) {
attributes = dcp->metadata.attributes;
preferred = dcp->metadata.preferred;
timing = dcp->metadata.timing_valid &&
dcp_metadata_matches(&dcp->metadata.epoch, dcp->metadata.timing_ticket);
if (timing)
preferred = dcp->metadata.preferred;
*generation = dcp->metadata.epoch.generation;
}
spin_unlock_irqrestore(&dcp->metadata.lock, flags);
if (!valid)
return ERR_PTR(-ENODATA);
edid = dcp_metadata_edid(&attributes, &preferred);
if (!timing)
attributes.defaults |= DCP_METADATA_DEFAULT_TIMING;
*defaults = attributes.defaults;
edid = dcp_metadata_edid(&attributes, timing ? &preferred : NULL);
spin_lock_irqsave(&dcp->metadata.lock, flags);
valid = !dcp->metadata.epoch.invalidated && dcp->metadata.epoch.connected &&
*generation == dcp->metadata.epoch.generation;
Expand Down
13 changes: 10 additions & 3 deletions drivers/gpu/drm/apple/iomfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2787,10 +2787,11 @@ int dcp_get_modes(struct drm_connector *connector)
}
} else {
u64 generation = 0;
u32 defaults = 0;
bool panel = dcp->panel_identity && dcp_has_panel(dcp);
const struct drm_edid *derived = nr_modes ?
(panel ? dcp_panel_edid_snapshot(dcp, modes, nr_modes, &generation) :
dcp_firmware_edid(dcp, &generation)) : ERR_PTR(-ENODATA);
dcp_firmware_edid(dcp, &generation, &defaults)) : ERR_PTR(-ENODATA);

if (!IS_ERR(derived)) {
bool log = !apple_connector->drm_edid_firmware_derived ||
Expand All @@ -2808,8 +2809,14 @@ int dcp_get_modes(struct drm_connector *connector)
drm_edid_connector_update(connector, NULL);
apple_connector->drm_edid_firmware_derived = false;
} else if (log) {
dev_info(dcp->dev, "using firmware-derived EDID metadata for connection %llu\n",
generation);
dev_info(dcp->dev, "using firmware-derived EDID metadata for connection %llu%s%s%s%s%s%s%s\n",
generation, defaults ? "; not reported:" : "",
defaults & DCP_METADATA_DEFAULT_SIZE ? " size" : "",
defaults & DCP_METADATA_DEFAULT_COLOR ? " colour" : "",
defaults & DCP_METADATA_DEFAULT_NAME ? " name" : "",
defaults & DCP_METADATA_DEFAULT_SERIAL ? " serial" : "",
defaults & DCP_METADATA_DEFAULT_DATE ? " date" : "",
defaults & DCP_METADATA_DEFAULT_TIMING ? " timing" : "");
}
} else {
if (panel && nr_modes)
Expand Down
Loading
Loading