drm/ssd130x: Replace .page_height field in device info with a constant

This deemed useful to avoid hardcoding a page height and allow to support
other Solomon controller families, but dividing the screen in pages seems
to be something that is specific to the SSD130x chip family.

For example, SSD132x chip family divides the screen in segments (columns)
and common outputs (rows), so the concept of screen pages does not exist
for the SSD132x family.

Let's drop this field from the device info struct and just use a constant
SSD130X_PAGE_HEIGHT macro to define the page height. While being there,
replace hardcoded 8 values in places where it is used as the page height.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231014071520.1342189-2-javierm@redhat.com

diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd130x.c
index 0c716136c5388bcc3705a9c8b2ca300e3473b1e2..d530d13eef5a7ec9a294c4fc9c9efbe2e3839186 100644 (file)
--- a/drivers/gpu/drm/solomon/ssd130x.c
+++ b/drivers/gpu/drm/solomon/ssd130x.c
@@ -42,6 +42,8 @@
 #define DRIVER_MAJOR   1
 #define DRIVER_MINOR   0
 
+#define SSD130X_PAGE_HEIGHT 8
+
 #define SSD130X_PAGE_COL_START_LOW             0x00
 #define SSD130X_PAGE_COL_START_HIGH            0x10
 #define SSD130X_SET_ADDRESS_MODE               0x20
@@ -102,7 +104,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] = {
                .default_width = 132,
                .default_height = 64,
                .page_mode_only = 1,
-               .page_height = 8,
        },
        [SSD1305_ID] = {
                .default_vcomh = 0x34,
@@ -110,7 +111,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] = {
                .default_dclk_frq = 7,
                .default_width = 132,
                .default_height = 64,
-               .page_height = 8,
        },
        [SSD1306_ID] = {
                .default_vcomh = 0x20,
@@ -119,7 +119,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] = {
                .need_chargepump = 1,
                .default_width = 128,
                .default_height = 64,
-               .page_height = 8,
        },
        [SSD1307_ID] = {
                .default_vcomh = 0x20,
@@ -128,7 +127,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] = {
                .need_pwm = 1,
                .default_width = 128,
                .default_height = 39,
-               .page_height = 8,
        },
        [SSD1309_ID] = {
                .default_vcomh = 0x34,
@@ -136,7 +134,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] = {
                .default_dclk_frq = 10,
                .default_width = 128,
                .default_height = 64,
-               .page_height = 8,
        }
 };
 EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X);
@@ -465,13 +462,13 @@ static int ssd130x_update_rect(struct ssd130x_device *ssd130x,
        unsigned int width = drm_rect_width(rect);
        unsigned int height = drm_rect_height(rect);
        unsigned int line_length = DIV_ROUND_UP(width, 8);
-       unsigned int page_height = ssd130x->device_info->page_height;
+       unsigned int page_height = SSD130X_PAGE_HEIGHT;
        unsigned int pages = DIV_ROUND_UP(height, page_height);
        struct drm_device *drm = &ssd130x->drm;
        u32 array_idx = 0;
        int ret, i, j, k;
 
-       drm_WARN_ONCE(drm, y % 8 != 0, "y must be aligned to screen page\n");
+       drm_WARN_ONCE(drm, y % page_height != 0, "y must be aligned to screen page\n");
 
        /*
         * The screen is divided in pages, each having a height of 8
@@ -503,27 +500,32 @@ static int ssd130x_update_rect(struct ssd130x_device *ssd130x,
         */
 
        if (!ssd130x->page_address_mode) {
+               u8 page_start;
+
                /* Set address range for horizontal addressing mode */
                ret = ssd130x_set_col_range(ssd130x, ssd130x->col_offset + x, width);
                if (ret < 0)
                        return ret;
 
-               ret = ssd130x_set_page_range(ssd130x, ssd130x->page_offset + y / 8, pages);
+               page_start = ssd130x->page_offset + y / page_height;
+               ret = ssd130x_set_page_range(ssd130x, page_start, pages);
                if (ret < 0)
                        return ret;
        }
 
        for (i = 0; i < pages; i++) {
-               int m = 8;
+               int m = page_height;
 
                /* Last page may be partial */
-               if (8 * (y / 8 + i + 1) > ssd130x->height)
-                       m = ssd130x->height % 8;
+               if (page_height * (y / page_height + i + 1) > ssd130x->height)
+                       m = ssd130x->height % page_height;
+
                for (j = 0; j < width; j++) {
                        u8 data = 0;
 
                        for (k = 0; k < m; k++) {
-                               u8 byte = buf[(8 * i + k) * line_length + j / 8];
+                               u32 idx = (page_height * i + k) * line_length + j / 8;
+                               u8 byte = buf[idx];
                                u8 bit = (byte >> (j % 8)) & 1;
 
                                data |= bit << k;
@@ -559,8 +561,7 @@ static int ssd130x_update_rect(struct ssd130x_device *ssd130x,
 
 static void ssd130x_clear_screen(struct ssd130x_device *ssd130x, u8 *data_array)
 {
-       unsigned int page_height = ssd130x->device_info->page_height;
-       unsigned int pages = DIV_ROUND_UP(ssd130x->height, page_height);
+       unsigned int pages = DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT);
        unsigned int width = ssd130x->width;
        int ret, i;
 
@@ -605,14 +606,13 @@ static int ssd130x_fb_blit_rect(struct drm_framebuffer *fb,
                                u8 *buf, u8 *data_array)
 {
        struct ssd130x_device *ssd130x = drm_to_ssd130x(fb->dev);
-       unsigned int page_height = ssd130x->device_info->page_height;
        struct iosys_map dst;
        unsigned int dst_pitch;
        int ret = 0;
 
        /* Align y to display page boundaries */
-       rect->y1 = round_down(rect->y1, page_height);
-       rect->y2 = min_t(unsigned int, round_up(rect->y2, page_height), ssd130x->height);
+       rect->y1 = round_down(rect->y1, SSD130X_PAGE_HEIGHT);
+       rect->y2 = min_t(unsigned int, round_up(rect->y2, SSD130X_PAGE_HEIGHT), ssd130x->height);
 
        dst_pitch = DIV_ROUND_UP(drm_rect_width(rect), 8);
 
@@ -815,8 +815,7 @@ static int ssd130x_crtc_atomic_check(struct drm_crtc *crtc,
        struct ssd130x_device *ssd130x = drm_to_ssd130x(drm);
        struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
        struct ssd130x_crtc_state *ssd130x_state = to_ssd130x_crtc_state(crtc_state);
-       unsigned int page_height = ssd130x->device_info->page_height;
-       unsigned int pages = DIV_ROUND_UP(ssd130x->height, page_height);
+       unsigned int pages = DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT);
        int ret;
 
        ret = drm_crtc_helper_atomic_check(crtc, state);

diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ssd130x.h
index aa39b13615ebedf29a5b7d2eaa92fd4de87291ea..bbe374453605bb505164127d5fa8609e3627297d 100644 (file)
--- a/drivers/gpu/drm/solomon/ssd130x.h
+++ b/drivers/gpu/drm/solomon/ssd130x.h
@@ -39,7 +39,6 @@ struct ssd130x_deviceinfo {
        u32 default_dclk_frq;
        u32 default_width;
        u32 default_height;
-       u32 page_height;
        bool need_pwm;
        bool need_chargepump;
        bool page_mode_only;