* [PATCH 0/3] drm/edid & drm/display header spring cleaning
@ 2024-03-21 9:45 Jani Nikula
2024-03-21 9:45 ` [PATCH 1/3] drm/displayid: move drm_displayid.h to drm_displayd_internal.h Jani Nikula
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jani Nikula @ 2024-03-21 9:45 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx, jani.nikula
Jani Nikula (3):
drm/displayid: move drm_displayid.h to drm_displayd_internal.h
drm/edid: move all internal declarations to drm_crtc_internal.h
drm/edid: group struct drm_edid based declarations together
drivers/gpu/drm/drm_crtc_internal.h | 6 ++++++
drivers/gpu/drm/drm_displayid.c | 4 +++-
.../gpu/drm/drm_displayid_internal.h | 5 +++--
drivers/gpu/drm/drm_edid.c | 2 +-
drivers/gpu/drm/drm_eld.c | 4 +++-
drivers/gpu/drm/drm_internal.h | 5 -----
include/drm/drm_edid.h | 11 ++++-------
7 files changed, 20 insertions(+), 17 deletions(-)
rename include/drm/drm_displayid.h => drivers/gpu/drm/drm_displayid_internal.h (98%)
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] drm/displayid: move drm_displayid.h to drm_displayd_internal.h
2024-03-21 9:45 [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
@ 2024-03-21 9:45 ` Jani Nikula
2024-03-21 9:45 ` [PATCH 2/3] drm/edid: move all internal declarations to drm_crtc_internal.h Jani Nikula
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2024-03-21 9:45 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx, jani.nikula
There are no exported symbols for displayid, and it's all internal
interfaces. Move the header to drivers/gpu/drm/drm_displayd_internal.h.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_displayid.c | 3 ++-
.../gpu/drm/drm_displayid_internal.h | 5 +++--
drivers/gpu/drm/drm_edid.c | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
rename include/drm/drm_displayid.h => drivers/gpu/drm/drm_displayid_internal.h (98%)
diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index 9edc111be7ee..f72a893c7deb 100644
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -3,10 +3,11 @@
* Copyright © 2021 Intel Corporation
*/
-#include <drm/drm_displayid.h>
#include <drm/drm_edid.h>
#include <drm/drm_print.h>
+#include "drm_displayid_internal.h"
+
static const struct displayid_header *
displayid_get_header(const u8 *displayid, int length, int index)
{
diff --git a/include/drm/drm_displayid.h b/drivers/gpu/drm/drm_displayid_internal.h
similarity index 98%
rename from include/drm/drm_displayid.h
rename to drivers/gpu/drm/drm_displayid_internal.h
index 566497eeb3b8..5ca3db6d788f 100644
--- a/include/drm/drm_displayid.h
+++ b/drivers/gpu/drm/drm_displayid_internal.h
@@ -19,8 +19,9 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef DRM_DISPLAYID_H
-#define DRM_DISPLAYID_H
+
+#ifndef DRM_DISPLAYID_INTERNAL_H
+#define DRM_DISPLAYID_INTERNAL_H
#include <linux/types.h>
#include <linux/bits.h>
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ea77577a3786..07752cd37b57 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -38,7 +38,6 @@
#include <linux/slab.h>
#include <linux/vga_switcheroo.h>
-#include <drm/drm_displayid.h>
#include <drm/drm_drv.h>
#include <drm/drm_edid.h>
#include <drm/drm_eld.h>
@@ -46,6 +45,7 @@
#include <drm/drm_print.h>
#include "drm_crtc_internal.h"
+#include "drm_displayid_internal.h"
#include "drm_internal.h"
static int oui(u8 first, u8 second, u8 third)
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] drm/edid: move all internal declarations to drm_crtc_internal.h
2024-03-21 9:45 [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
2024-03-21 9:45 ` [PATCH 1/3] drm/displayid: move drm_displayid.h to drm_displayd_internal.h Jani Nikula
@ 2024-03-21 9:45 ` Jani Nikula
2024-03-21 9:45 ` [PATCH 3/3] drm/edid: group struct drm_edid based declarations together Jani Nikula
2024-04-08 8:59 ` [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
3 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2024-03-21 9:45 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx, jani.nikula
The declarations for internal EDID functions are a bit scattered. Put
them all in drm_crtc_internal.h.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_crtc_internal.h | 6 ++++++
drivers/gpu/drm/drm_displayid.c | 1 +
drivers/gpu/drm/drm_eld.c | 4 +++-
drivers/gpu/drm/drm_internal.h | 5 -----
include/drm/drm_edid.h | 3 ---
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 0c693229a1c9..2256893d7d67 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -43,12 +43,14 @@ enum drm_color_range;
enum drm_connector_force;
enum drm_mode_status;
+struct cea_sad;
struct drm_atomic_state;
struct drm_bridge;
struct drm_connector;
struct drm_crtc;
struct drm_device;
struct drm_display_mode;
+struct drm_edid;
struct drm_file;
struct drm_framebuffer;
struct drm_mode_create_dumb;
@@ -297,6 +299,10 @@ void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
int drm_edid_override_show(struct drm_connector *connector, struct seq_file *m);
int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size);
int drm_edid_override_reset(struct drm_connector *connector);
+const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
+ int ext_id, int *ext_index);
+void drm_edid_cta_sad_get(const struct cea_sad *cta_sad, u8 *sad);
+void drm_edid_cta_sad_set(struct cea_sad *cta_sad, const u8 *sad);
/* drm_edid_load.c */
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index f72a893c7deb..f800dc0906d5 100644
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -6,6 +6,7 @@
#include <drm/drm_edid.h>
#include <drm/drm_print.h>
+#include "drm_crtc_internal.h"
#include "drm_displayid_internal.h"
static const struct displayid_header *
diff --git a/drivers/gpu/drm/drm_eld.c b/drivers/gpu/drm/drm_eld.c
index 5177991aa272..c0428d07de53 100644
--- a/drivers/gpu/drm/drm_eld.c
+++ b/drivers/gpu/drm/drm_eld.c
@@ -3,10 +3,12 @@
* Copyright © 2023 Intel Corporation
*/
+#include <linux/export.h>
+
#include <drm/drm_edid.h>
#include <drm/drm_eld.h>
-#include "drm_internal.h"
+#include "drm_crtc_internal.h"
/**
* drm_eld_sad_get - get SAD from ELD to struct cea_sad
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index 2215baef9a3e..690505a1f7a5 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -35,7 +35,6 @@
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
-struct cea_sad;
struct dentry;
struct dma_buf;
struct iosys_map;
@@ -278,8 +277,4 @@ void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent,
const struct drm_framebuffer *fb);
void drm_framebuffer_debugfs_init(struct drm_device *dev);
-/* drm_edid.c */
-void drm_edid_cta_sad_get(const struct cea_sad *cta_sad, u8 *sad);
-void drm_edid_cta_sad_set(struct cea_sad *cta_sad, const u8 *sad);
-
#endif /* __DRM_INTERNAL_H__ */
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 6f65bbf655a1..6eadc4f12c07 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -467,7 +467,4 @@ int drm_edid_connector_update(struct drm_connector *connector,
int drm_edid_connector_add_modes(struct drm_connector *connector);
bool drm_edid_is_digital(const struct drm_edid *drm_edid);
-const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
- int ext_id, int *ext_index);
-
#endif /* __DRM_EDID_H__ */
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] drm/edid: group struct drm_edid based declarations together
2024-03-21 9:45 [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
2024-03-21 9:45 ` [PATCH 1/3] drm/displayid: move drm_displayid.h to drm_displayd_internal.h Jani Nikula
2024-03-21 9:45 ` [PATCH 2/3] drm/edid: move all internal declarations to drm_crtc_internal.h Jani Nikula
@ 2024-03-21 9:45 ` Jani Nikula
2024-04-08 8:59 ` [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
3 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2024-03-21 9:45 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx, jani.nikula
Keep the declarations for struct drm_edid based functions together.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/drm_edid.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 6eadc4f12c07..19814bb1103c 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -417,10 +417,6 @@ 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);
-const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapter);
-u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid);
-bool drm_edid_match(const struct drm_edid *drm_edid,
- const struct drm_edid_ident *ident);
struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
struct i2c_adapter *adapter);
struct edid *drm_edid_duplicate(const struct edid *edid);
@@ -460,11 +456,15 @@ const struct drm_edid *drm_edid_read_ddc(struct drm_connector *connector,
const struct drm_edid *drm_edid_read_custom(struct drm_connector *connector,
int (*read_block)(void *context, u8 *buf, unsigned int block, size_t len),
void *context);
+const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapter);
const struct drm_edid *drm_edid_read_switcheroo(struct drm_connector *connector,
struct i2c_adapter *adapter);
int drm_edid_connector_update(struct drm_connector *connector,
const struct drm_edid *edid);
int drm_edid_connector_add_modes(struct drm_connector *connector);
bool drm_edid_is_digital(const struct drm_edid *drm_edid);
+u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid);
+bool drm_edid_match(const struct drm_edid *drm_edid,
+ const struct drm_edid_ident *ident);
#endif /* __DRM_EDID_H__ */
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] drm/edid & drm/display header spring cleaning
2024-03-21 9:45 [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
` (2 preceding siblings ...)
2024-03-21 9:45 ` [PATCH 3/3] drm/edid: group struct drm_edid based declarations together Jani Nikula
@ 2024-04-08 8:59 ` Jani Nikula
3 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2024-04-08 8:59 UTC (permalink / raw)
To: dri-devel; +Cc: intel-gfx
On Thu, 21 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> Jani Nikula (3):
> drm/displayid: move drm_displayid.h to drm_displayd_internal.h
> drm/edid: move all internal declarations to drm_crtc_internal.h
> drm/edid: group struct drm_edid based declarations together
Resent as part of https://patchwork.freedesktop.org/series/132142/
>
> drivers/gpu/drm/drm_crtc_internal.h | 6 ++++++
> drivers/gpu/drm/drm_displayid.c | 4 +++-
> .../gpu/drm/drm_displayid_internal.h | 5 +++--
> drivers/gpu/drm/drm_edid.c | 2 +-
> drivers/gpu/drm/drm_eld.c | 4 +++-
> drivers/gpu/drm/drm_internal.h | 5 -----
> include/drm/drm_edid.h | 11 ++++-------
> 7 files changed, 20 insertions(+), 17 deletions(-)
> rename include/drm/drm_displayid.h => drivers/gpu/drm/drm_displayid_internal.h (98%)
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-08 8:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-21 9:45 [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
2024-03-21 9:45 ` [PATCH 1/3] drm/displayid: move drm_displayid.h to drm_displayd_internal.h Jani Nikula
2024-03-21 9:45 ` [PATCH 2/3] drm/edid: move all internal declarations to drm_crtc_internal.h Jani Nikula
2024-03-21 9:45 ` [PATCH 3/3] drm/edid: group struct drm_edid based declarations together Jani Nikula
2024-04-08 8:59 ` [PATCH 0/3] drm/edid & drm/display header spring cleaning Jani Nikula
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).