drm/edid: Refactor DisplayID timing block structs

Using le16 instead of u8[2].

Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Egor Vorontsov <sdoregor@sdore.me>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/a7967d7884d48b15ca08ae78d687e73124f0ba04.1744708239.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/drm_displayid_internal.h b/drivers/gpu/drm/drm_displayid_internal.h
index 84831ecfdb6edaa2c90bac06b1b2c602f1e9835a..957dd0619f5c5c6951463508ef8f952edf78898c 100644 (file)
--- a/drivers/gpu/drm/drm_displayid_internal.h
+++ b/drivers/gpu/drm/drm_displayid_internal.h
@@ -115,20 +115,20 @@ struct displayid_tiled_block {
 struct displayid_detailed_timings_1 {
        u8 pixel_clock[3];
        u8 flags;
-       u8 hactive[2];
-       u8 hblank[2];
-       u8 hsync[2];
-       u8 hsw[2];
-       u8 vactive[2];
-       u8 vblank[2];
-       u8 vsync[2];
-       u8 vsw[2];
+       __le16 hactive;
+       __le16 hblank;
+       __le16 hsync;
+       __le16 hsw;
+       __le16 vactive;
+       __le16 vblank;
+       __le16 vsync;
+       __le16 vsw;
 } __packed;
 
 struct displayid_detailed_timing_block {
        struct displayid_block base;
        struct displayid_detailed_timings_1 timings[];
-};
+} __packed;
 
 struct displayid_formula_timings_9 {
        u8 flags;

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 002aa083276392a84c491021e23404c88acf69fc..eab5196140d7062984dc65a0fcc3bf0bfad7176d 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -6760,23 +6760,23 @@ out:
 }
 
 static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *dev,
-                                                           struct displayid_detailed_timings_1 *timings,
+                                                           const struct displayid_detailed_timings_1 *timings,
                                                            bool type_7)
 {
        struct drm_display_mode *mode;
-       unsigned pixel_clock = (timings->pixel_clock[0] |
-                               (timings->pixel_clock[1] << 8) |
-                               (timings->pixel_clock[2] << 16)) + 1;
-       unsigned hactive = (timings->hactive[0] | timings->hactive[1] << 8) + 1;
-       unsigned hblank = (timings->hblank[0] | timings->hblank[1] << 8) + 1;
-       unsigned hsync = (timings->hsync[0] | (timings->hsync[1] & 0x7f) << 8) + 1;
-       unsigned hsync_width = (timings->hsw[0] | timings->hsw[1] << 8) + 1;
-       unsigned vactive = (timings->vactive[0] | timings->vactive[1] << 8) + 1;
-       unsigned vblank = (timings->vblank[0] | timings->vblank[1] << 8) + 1;
-       unsigned vsync = (timings->vsync[0] | (timings->vsync[1] & 0x7f) << 8) + 1;
-       unsigned vsync_width = (timings->vsw[0] | timings->vsw[1] << 8) + 1;
-       bool hsync_positive = (timings->hsync[1] >> 7) & 0x1;
-       bool vsync_positive = (timings->vsync[1] >> 7) & 0x1;
+       unsigned int pixel_clock = (timings->pixel_clock[0] |
+                                   (timings->pixel_clock[1] << 8) |
+                                   (timings->pixel_clock[2] << 16)) + 1;
+       unsigned int hactive = le16_to_cpu(timings->hactive) + 1;
+       unsigned int hblank = le16_to_cpu(timings->hblank) + 1;
+       unsigned int hsync = (le16_to_cpu(timings->hsync) & 0x7fff) + 1;
+       unsigned int hsync_width = le16_to_cpu(timings->hsw) + 1;
+       unsigned int vactive = le16_to_cpu(timings->vactive) + 1;
+       unsigned int vblank = le16_to_cpu(timings->vblank) + 1;
+       unsigned int vsync = (le16_to_cpu(timings->vsync) & 0x7fff) + 1;
+       unsigned int vsync_width = le16_to_cpu(timings->vsw) + 1;
+       bool hsync_positive = le16_to_cpu(timings->hsync) & (1 << 15);
+       bool vsync_positive = le16_to_cpu(timings->vsync) & (1 << 15);
 
        mode = drm_mode_create(dev);
        if (!mode)