drm/udl: Move register constants to udl_proto.h

Move the existing register constants to a new file in preparation of
adding more of them. Renaming is intentional. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221006095355.23579-12-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index b090b6c..5809890 100644 (file)
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -112,13 +112,4 @@ int udl_select_std_channel(struct udl_device *udl);
 #define CMD_WRITE_COPY16 "\xAF\x6A" /**< 16 bit copy command. */
 #define CMD_WRITE_RLX16  "\xAF\x6B" /**< 16 bit extended run length command. */
 
-/* On/Off for driving the DisplayLink framebuffer to the display */
-#define UDL_REG_BLANK_MODE             0x1f
-
-#define UDL_BLANK_MODE_ON              0x00 /* hsync and vsync on, visible */
-#define UDL_BLANK_MODE_BLANKED         0x01 /* hsync and vsync on, blanked */
-#define UDL_BLANK_MODE_VSYNC_OFF       0x03 /* vsync off, blanked */
-#define UDL_BLANK_MODE_HSYNC_OFF       0x05 /* hsync off, blanked */
-#define UDL_BLANK_MODE_POWERDOWN       0x07 /* powered off; requires modeset */
-
 #endif

diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index aee4fe2..702731b 100644 (file)
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -24,8 +24,7 @@
 #include <drm/drm_vblank.h>
 
 #include "udl_drv.h"
-
-#define UDL_COLOR_DEPTH_16BPP  0
+#include "udl_proto.h"
 
 /*
  * All DisplayLink bulk operations start with 0xAF, followed by specific code
@@ -52,7 +51,7 @@ static char *udl_vidreg_unlock(char *buf)
 
 static char *udl_set_blank_mode(char *buf, u8 mode)
 {
-       return udl_set_register(buf, UDL_REG_BLANK_MODE, mode);
+       return udl_set_register(buf, UDL_REG_BLANKMODE, mode);
 }
 
 static char *udl_set_color_depth(char *buf, u8 selection)
@@ -358,13 +357,13 @@ static void udl_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atom
 
        buf = (char *)urb->transfer_buffer;
        buf = udl_vidreg_lock(buf);
-       buf = udl_set_color_depth(buf, UDL_COLOR_DEPTH_16BPP);
+       buf = udl_set_color_depth(buf, UDL_COLORDEPTH_16BPP);
        /* set base for 16bpp segment to 0 */
        buf = udl_set_base16bpp(buf, 0);
        /* set base for 8bpp segment to end of fb */
        buf = udl_set_base8bpp(buf, 2 * mode->vdisplay * mode->hdisplay);
        buf = udl_set_vid_cmds(buf, mode);
-       buf = udl_set_blank_mode(buf, UDL_BLANK_MODE_ON);
+       buf = udl_set_blank_mode(buf, UDL_BLANKMODE_ON);
        buf = udl_vidreg_unlock(buf);
        buf = udl_dummy_render(buf);
 
@@ -390,7 +389,7 @@ static void udl_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_ato
 
        buf = (char *)urb->transfer_buffer;
        buf = udl_vidreg_lock(buf);
-       buf = udl_set_blank_mode(buf, UDL_BLANK_MODE_POWERDOWN);
+       buf = udl_set_blank_mode(buf, UDL_BLANKMODE_POWERDOWN);
        buf = udl_vidreg_unlock(buf);
        buf = udl_dummy_render(buf);
 

diff --git a/drivers/gpu/drm/udl/udl_proto.h b/drivers/gpu/drm/udl/udl_proto.h
new file mode 100644 (file)
index 0000000..3f5b8e8
--- /dev/null
+++ b/drivers/gpu/drm/udl/udl_proto.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef UDL_PROTO_H
+#define UDL_PROTO_H
+
+#define UDL_COLORDEPTH_16BPP           0
+
+/* On/Off for driving the DisplayLink framebuffer to the display */
+#define UDL_REG_BLANKMODE              0x1f
+#define UDL_BLANKMODE_ON               0x00 /* hsync and vsync on, visible */
+#define UDL_BLANKMODE_BLANKED          0x01 /* hsync and vsync on, blanked */
+#define UDL_BLANKMODE_VSYNC_OFF                0x03 /* vsync off, blanked */
+#define UDL_BLANKMODE_HSYNC_OFF                0x05 /* hsync off, blanked */
+#define UDL_BLANKMODE_POWERDOWN                0x07 /* powered off; requires modeset */
+
+#endif