From: Shawn Guo <shawnguo@kernel.org>
To: David Airlie <airlied@linux.ie>
Cc: Shawn Guo <shawnguo@kernel.org>, dri-devel@lists.freedesktop.org
Subject: [PATCH] drm/edid: move DDC_SEGMENT_ADDR into drm_edid.h
Date: Thu, 14 Jul 2016 17:00:28 +0800 [thread overview]
Message-ID: <1468486828-29293-1-git-send-email-shawnguo@kernel.org> (raw)
The same definition of DDC_SEGMENT_ADDR is currently defined in two
places, drm_edid.c and inno_hdmi.h. Let's consolidate the definition
into drm_edid.h in the same way that DDC_ADDR is defined.
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---
drivers/gpu/drm/drm_edid.c | 1 -
drivers/gpu/drm/rockchip/inno_hdmi.h | 2 --
include/drm/drm_edid.h | 1 +
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 7df26d4b7ad8..9d6735b68152 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1191,7 +1191,6 @@ bool drm_edid_is_valid(struct edid *edid)
}
EXPORT_SYMBOL(drm_edid_is_valid);
-#define DDC_SEGMENT_ADDR 0x30
/**
* drm_do_probe_ddc_edid() - get EDID information via I2C
* @data: I2C device adapter
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.h b/drivers/gpu/drm/rockchip/inno_hdmi.h
index aa7c415f8cc1..b27b30934c7e 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.h
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.h
@@ -16,8 +16,6 @@
#ifndef __INNO_HDMI_H__
#define __INNO_HDMI_H__
-#define DDC_SEGMENT_ADDR 0x30
-
enum PWR_MODE {
NORMAL,
LOWER_PWR,
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 919933d1beb4..7ee78d5c9252 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -26,6 +26,7 @@
#include <linux/types.h>
#define EDID_LENGTH 128
+#define DDC_SEGMENT_ADDR 0x30
#define DDC_ADDR 0x50
#define DDC_ADDR2 0x52 /* E-DDC 1.2 - where DisplayID can hide */
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2016-07-14 9:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-14 9:00 Shawn Guo [this message]
2016-07-14 12:45 ` [PATCH] drm/edid: move DDC_SEGMENT_ADDR into drm_edid.h Daniel Vetter
2016-07-14 13:21 ` Shawn Guo
2016-07-15 7:24 ` Daniel Vetter
2016-07-15 11:31 ` Shawn Guo
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=1468486828-29293-1-git-send-email-shawnguo@kernel.org \
--to=shawnguo@kernel.org \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.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