Skip to content

Commit 4e76592

Browse files
committed
drm/edid: move all internal declarations to drm_crtc_internal.h
The declarations for internal EDID functions are a bit scattered. Put them all in drm_crtc_internal.h. Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/9ae137ea51f9cc2ccb3899b0acda553e6a8ce2db.1713259151.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 44e030d commit 4e76592

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

drivers/gpu/drm/drm_crtc_internal.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@ enum drm_color_range;
4343
enum drm_connector_force;
4444
enum drm_mode_status;
4545

46+
struct cea_sad;
4647
struct drm_atomic_state;
4748
struct drm_bridge;
4849
struct drm_connector;
4950
struct drm_crtc;
5051
struct drm_device;
5152
struct drm_display_mode;
53+
struct drm_edid;
5254
struct drm_file;
5355
struct drm_framebuffer;
5456
struct drm_mode_create_dumb;
@@ -297,6 +299,10 @@ void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
297299
int drm_edid_override_show(struct drm_connector *connector, struct seq_file *m);
298300
int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size);
299301
int drm_edid_override_reset(struct drm_connector *connector);
302+
const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
303+
int ext_id, int *ext_index);
304+
void drm_edid_cta_sad_get(const struct cea_sad *cta_sad, u8 *sad);
305+
void drm_edid_cta_sad_set(struct cea_sad *cta_sad, const u8 *sad);
300306

301307
/* drm_edid_load.c */
302308
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE

drivers/gpu/drm/drm_displayid.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <drm/drm_edid.h>
77
#include <drm/drm_print.h>
88

9+
#include "drm_crtc_internal.h"
910
#include "drm_displayid_internal.h"
1011

1112
static const struct displayid_header *

drivers/gpu/drm/drm_eld.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
* Copyright © 2023 Intel Corporation
44
*/
55

6+
#include <linux/export.h>
7+
68
#include <drm/drm_edid.h>
79
#include <drm/drm_eld.h>
810

9-
#include "drm_internal.h"
11+
#include "drm_crtc_internal.h"
1012

1113
/**
1214
* drm_eld_sad_get - get SAD from ELD to struct cea_sad

drivers/gpu/drm/drm_internal.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
3737

38-
struct cea_sad;
3938
struct dentry;
4039
struct dma_buf;
4140
struct iosys_map;
@@ -278,8 +277,4 @@ void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent,
278277
const struct drm_framebuffer *fb);
279278
void drm_framebuffer_debugfs_init(struct drm_device *dev);
280279

281-
/* drm_edid.c */
282-
void drm_edid_cta_sad_get(const struct cea_sad *cta_sad, u8 *sad);
283-
void drm_edid_cta_sad_set(struct cea_sad *cta_sad, const u8 *sad);
284-
285280
#endif /* __DRM_INTERNAL_H__ */

include/drm/drm_edid.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,4 @@ void drm_edid_get_product_id(const struct drm_edid *drm_edid,
485485
void drm_edid_print_product_id(struct drm_printer *p,
486486
const struct drm_edid_product_id *id, bool raw);
487487

488-
const u8 *drm_find_edid_extension(const struct drm_edid *drm_edid,
489-
int ext_id, int *ext_index);
490-
491488
#endif /* __DRM_EDID_H__ */

0 commit comments

Comments
 (0)