From patchwork Thu Nov 8 00:23:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Souza, Jose" X-Patchwork-Id: 10673259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B90A14D6 for ; Thu, 8 Nov 2018 00:24:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74FAF2C055 for ; Thu, 8 Nov 2018 00:24:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 732942D443; Thu, 8 Nov 2018 00:24:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 38A1A2D43D for ; Thu, 8 Nov 2018 00:24:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F111A6E24F; Thu, 8 Nov 2018 00:23:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 94A2E6E220; Thu, 8 Nov 2018 00:23:57 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2018 16:23:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,477,1534834800"; d="scan'208";a="94510881" Received: from josouza-mobl.jf.intel.com ([10.24.11.2]) by FMSMGA003.fm.intel.com with ESMTP; 07 Nov 2018 16:23:57 -0800 From: =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= To: intel-gfx@lists.freedesktop.org Subject: [PATCH 1/2] drm/edid: Add and export function to parse manufacturer id Date: Wed, 7 Nov 2018 16:23:52 -0800 Message-Id: <20181108002353.19020-1-jose.souza@intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This function will be helpful to drivers that wants to add its own quirks to sinks. Signed-off-by: José Roberto de Souza --- drivers/gpu/drm/drm_edid.c | 20 ++++++++++++++++---- include/drm/drm_edid.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index b506e3622b08..1a0ddf3d326b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1755,6 +1755,21 @@ EXPORT_SYMBOL(drm_edid_duplicate); /*** EDID parsing ***/ +/** + * drm_edid_manufacturer_parse - parse the EDID manufacturer id to readable + * characters and set into manufacturer parameter. + * @edid: EDID to get the manufacturer + * @manufacturer: the char buffer to store the id + */ +void drm_edid_manufacturer_parse(const struct edid *edid, char manufacturer[3]) +{ + manufacturer[0] = ((edid->mfg_id[0] & 0x7c) >> 2) + '@'; + manufacturer[1] = (((edid->mfg_id[0] & 0x3) << 3) | + ((edid->mfg_id[1] & 0xe0) >> 5)) + '@'; + manufacturer[2] = (edid->mfg_id[1] & 0x1f) + '@'; +} +EXPORT_SYMBOL(drm_edid_manufacturer_parse); + /** * edid_vendor - match a string against EDID's obfuscated vendor field * @edid: EDID to match @@ -1766,10 +1781,7 @@ static bool edid_vendor(const struct edid *edid, const char *vendor) { char edid_vendor[3]; - edid_vendor[0] = ((edid->mfg_id[0] & 0x7c) >> 2) + '@'; - edid_vendor[1] = (((edid->mfg_id[0] & 0x3) << 3) | - ((edid->mfg_id[1] & 0xe0) >> 5)) + '@'; - edid_vendor[2] = (edid->mfg_id[1] & 0x1f) + '@'; + drm_edid_manufacturer_parse(edid, edid_vendor); return !strncmp(edid_vendor, vendor, 3); } diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index e3c404833115..e4f3f7f34d6a 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -466,6 +466,7 @@ struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, struct i2c_adapter *adapter); struct edid *drm_edid_duplicate(const struct edid *edid); int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid); +void drm_edid_manufacturer_parse(const struct edid *edid, char manufacturer[3]); u8 drm_match_cea_mode(const struct drm_display_mode *to_match); enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code);