From: Mario Limonciello <mario.limonciello@amd.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
amd-gfx@lists.freedesktop.org,
Alex Deucher <alexander.deucher@amd.com>,
Harry Wentland <harry.wentland@amd.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Hans de Goede <hdegoede@redhat.com>
Cc: "open list:ACPI" <linux-acpi@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
Melissa Wen <mwen@igalia.com>,
Mark Pearson <mpearson-lenovo@squebb.ca>
Subject: Re: [PATCH v3 2/5] drm: Add drm_get_acpi_edid() helper
Date: Fri, 2 Feb 2024 09:19:42 -0600 [thread overview]
Message-ID: <2c72f42e-2170-4cd3-b471-c079a754f9d1@amd.com> (raw)
In-Reply-To: <878r43f9bd.fsf@intel.com>
On 2/2/2024 04:29, Jani Nikula wrote:
> On Thu, 01 Feb 2024, Mario Limonciello <mario.limonciello@amd.com> wrote:
>> Some manufacturers have intentionally put an EDID that differs from
>> the EDID on the internal panel on laptops. Drivers can call this
>> helper to attempt to fetch the EDID from the BIOS's ACPI _DDC method.
>
> I'm really not happy about adding new struct edid based APIs to
> drm_edid.[ch]. Everything new should be struct drm_edid based. All
> drivers should be converting towards struct drm_edid, instead of adding
> more legacy to rip out later.
OK; I'll redo it with struct drm_edid.
The changeover for amdgpu to use drm_edid is going to be a pretty
involved effort so I'm going to use a get_raw in amdgpu for now so we
can unblock the issue this is fixing and let that part get removed when
the rest of the overhaul gets done there.
>
> BR,
> Jani.
>
>>
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>> v1->v2:
>> * Split code from previous amdgpu specific helper to generic drm helper.
>> v2->v3:
>> * Add an extra select to fix a variety of randconfig errors found from
>> LKP robot.
>> ---
>> drivers/gpu/drm/Kconfig | 5 +++
>> drivers/gpu/drm/drm_edid.c | 73 ++++++++++++++++++++++++++++++++++++++
>> include/drm/drm_edid.h | 1 +
>> 3 files changed, 79 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>> index 2520db0b776e..14df907c96c8 100644
>> --- a/drivers/gpu/drm/Kconfig
>> +++ b/drivers/gpu/drm/Kconfig
>> @@ -21,6 +21,11 @@ menuconfig DRM
>> select KCMP
>> select VIDEO_CMDLINE
>> select VIDEO_NOMODESET
>> + select ACPI_VIDEO if ACPI
>> + select BACKLIGHT_CLASS_DEVICE if ACPI
>> + select INPUT if ACPI
>> + select X86_PLATFORM_DEVICES if ACPI && X86
>> + select ACPI_WMI if ACPI && X86
>> help
>> Kernel-level support for the Direct Rendering Infrastructure (DRI)
>> introduced in XFree86 4.0. If you say Y here, you need to select
>> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>> index 69c68804023f..1fbbeaa664b2 100644
>> --- a/drivers/gpu/drm/drm_edid.c
>> +++ b/drivers/gpu/drm/drm_edid.c
>> @@ -28,6 +28,7 @@
>> * DEALINGS IN THE SOFTWARE.
>> */
>>
>> +#include <acpi/video.h>
>> #include <linux/bitfield.h>
>> #include <linux/cec.h>
>> #include <linux/hdmi.h>
>> @@ -2188,6 +2189,47 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned int block, size_t len)
>> return ret == xfers ? 0 : -1;
>> }
>>
>> +/**
>> + * drm_do_probe_acpi_edid() - get EDID information via ACPI _DDC
>> + * @data: struct drm_device
>> + * @buf: EDID data buffer to be filled
>> + * @block: 128 byte EDID block to start fetching from
>> + * @len: EDID data buffer length to fetch
>> + *
>> + * Try to fetch EDID information by calling acpi_video_get_edid() function.
>> + *
>> + * Return: 0 on success or error code on failure.
>> + */
>> +static int
>> +drm_do_probe_acpi_edid(void *data, u8 *buf, unsigned int block, size_t len)
>> +{
>> + struct drm_device *ddev = data;
>> + struct acpi_device *acpidev = ACPI_COMPANION(ddev->dev);
>> + unsigned char start = block * EDID_LENGTH;
>> + void *edid;
>> + int r;
>> +
>> + if (!acpidev)
>> + return -ENODEV;
>> +
>> + /* fetch the entire edid from BIOS */
>> + r = acpi_video_get_edid(acpidev, ACPI_VIDEO_DISPLAY_LCD, -1, &edid);
>> + if (r < 0) {
>> + DRM_DEBUG_KMS("Failed to get EDID from ACPI: %d\n", r);
>> + return -EINVAL;
>> + }
>> + if (len > r || start > r || start + len > r) {
>> + r = EINVAL;
>> + goto cleanup;
>> + }
>> +
>> + memcpy(buf, edid + start, len);
>> + r = 0;
>> +cleanup:
>> + kfree(edid);
>> + return r;
>> +}
>> +
>> static void connector_bad_edid(struct drm_connector *connector,
>> const struct edid *edid, int num_blocks)
>> {
>> @@ -2643,6 +2685,37 @@ struct edid *drm_get_edid(struct drm_connector *connector,
>> }
>> EXPORT_SYMBOL(drm_get_edid);
>>
>> +/**
>> + * drm_get_acpi_edid - get EDID data, if available
>> + * @connector: connector we're probing
>> + *
>> + * Use the BIOS to attempt to grab EDID data if possible. If found,
>> + * attach it to the connector.
>> + *
>> + * Return: Pointer to valid EDID or NULL if we couldn't find any.
>> + */
>> +struct edid *drm_get_acpi_edid(struct drm_connector *connector)
>> +{
>> + struct edid *edid = NULL;
>> +
>> + switch (connector->connector_type) {
>> + case DRM_MODE_CONNECTOR_LVDS:
>> + case DRM_MODE_CONNECTOR_eDP:
>> + break;
>> + default:
>> + return NULL;
>> + }
>> +
>> + if (connector->force == DRM_FORCE_OFF)
>> + return NULL;
>> +
>> + edid = _drm_do_get_edid(connector, drm_do_probe_acpi_edid, connector->dev, NULL);
>> +
>> + drm_connector_update_edid_property(connector, edid);
>> + return edid;
>> +}
>> +EXPORT_SYMBOL(drm_get_acpi_edid);
>> +
>> /**
>> * drm_edid_read_custom - Read EDID data using given EDID block read function
>> * @connector: Connector to use
>> diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
>> index 518d1b8106c7..60fbdc06badc 100644
>> --- a/include/drm/drm_edid.h
>> +++ b/include/drm/drm_edid.h
>> @@ -412,6 +412,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
>> void *data);
>> struct edid *drm_get_edid(struct drm_connector *connector,
>> struct i2c_adapter *adapter);
>> +struct edid *drm_get_acpi_edid(struct drm_connector *connector);
>> u32 drm_edid_get_panel_id(struct i2c_adapter *adapter);
>> struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
>> struct i2c_adapter *adapter);
>
next prev parent reply other threads:[~2024-02-02 15:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 22:11 [PATCH v3 0/5] Add support for fetching EDID from ACPI _DDC Mario Limonciello
2024-02-01 22:11 ` [PATCH v3 1/5] ACPI: video: Handle fetching EDID that is longer than 256 bytes Mario Limonciello
2024-02-02 16:07 ` Rafael J. Wysocki
2024-02-02 16:09 ` Mario Limonciello
2024-02-06 19:43 ` Rafael J. Wysocki
2024-02-01 22:11 ` [PATCH v3 2/5] drm: Add drm_get_acpi_edid() helper Mario Limonciello
2024-02-02 10:24 ` Pranjal Ramajor Asha Kanojiya
2024-02-02 10:29 ` Jani Nikula
2024-02-02 15:19 ` Mario Limonciello [this message]
2024-02-01 22:11 ` [PATCH v3 3/5] drm/amd: Fetch the EDID from _DDC if available for eDP Mario Limonciello
2024-02-03 12:53 ` kernel test robot
2024-02-01 22:11 ` [PATCH v3 4/5] drm/nouveau: Use drm_get_acpi_edid() helper Mario Limonciello
2024-02-01 22:11 ` [PATCH v3 5/5] drm: Drop unneeded selects in DRM drivers Mario Limonciello
2024-02-02 10:12 ` Pranjal Ramajor Asha Kanojiya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c72f42e-2170-4cd3-b471-c079a754f9d1@amd.com \
--to=mario.limonciello@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=hdegoede@redhat.com \
--cc=jani.nikula@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpearson-lenovo@squebb.ca \
--cc=mwen@igalia.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).