drivers/gpu/drm/openchrome/openchrome_display.c | 6 ++--- drivers/gpu/drm/openchrome/openchrome_drv.c | 6 ----- drivers/gpu/drm/openchrome/openchrome_drv.h | 6 +---- drivers/gpu/drm/openchrome/openchrome_hdmi.c | 5 ++++ drivers/gpu/drm/openchrome/openchrome_init.c | 26 ++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 13 deletions(-)
New commits: commit 83ab468a2495dcfedd17e136947143f2118653a5 Author: Kevin Brace <kevinbr...@gmx.com> Date: Fri May 21 14:03:59 2021 -0700 drm/openchrome: Version bumped to 3.4.9 Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index 71a04a9e8633..f618d625c17b 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -61,10 +61,10 @@ #define DRIVER_MAJOR 3 #define DRIVER_MINOR 4 -#define DRIVER_PATCHLEVEL 8 +#define DRIVER_PATCHLEVEL 9 #define DRIVER_NAME "openchrome" #define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP" -#define DRIVER_DATE "20210403" +#define DRIVER_DATE "20210521" #define DRIVER_AUTHOR "OpenChrome Project" commit d1545ee25fb15c09a377add338be33db62987470 Author: Kevin Brace <kevinbr...@gmx.com> Date: Fri May 21 13:59:10 2021 -0700 drm/openchrome: Move openchrome_hdmi_audio variable Move it into openchrome_hdmi.c where it belongs. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c index e478fd8a139a..0181402b34bb 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.c +++ b/drivers/gpu/drm/openchrome/openchrome_drv.c @@ -49,12 +49,6 @@ MODULE_PARM_DESC(modeset, "Enable DRM device driver " "1 = Enabled)"); module_param_named(modeset, openchrome_modeset, int, 0400); -int openchrome_hdmi_audio = 0; - -MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)"); -module_param_named(audio, openchrome_hdmi_audio, int, 0444); - - static int openchrome_driver_open(struct drm_device *dev, struct drm_file *file_priv) { diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index 4411e6c0282c..71a04a9e8633 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -368,8 +368,6 @@ disable_second_display_channel(void __iomem *regs) extern const struct drm_ioctl_desc openchrome_driver_ioctls[]; extern int openchrome_driver_num_ioctls; -extern int openchrome_hdmi_audio; - extern struct ttm_device_funcs openchrome_bo_driver; int openchrome_vram_detect(struct openchrome_drm_private *dev_private); diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c index 59285de44e00..568ea2068504 100644 --- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c +++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c @@ -36,6 +36,11 @@ #define HDMI_AUDIO_ENABLED BIT(0) +int openchrome_hdmi_audio = 0; + +MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)"); +module_param_named(audio, openchrome_hdmi_audio, int, 0444); + /* * Routines for controlling stuff on the HDMI port */ commit 3d2d1eaea1a5bc5f83f36f1e5a46a9232a7d0fca Author: Kevin Brace <kevinbr...@gmx.com> Date: Fri May 21 13:52:19 2021 -0700 drm/openchrome: Be strict about case statement fall through Eclipse CDT code analyzer pointed out several case statements were not using a corresponding break statement in pair, and instead were relying on falling through to the next case statement's break statement or terminating with the end of switch statement. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c b/drivers/gpu/drm/openchrome/openchrome_display.c index 89f835c664c9..e33df4f7c1a1 100644 --- a/drivers/gpu/drm/openchrome/openchrome_display.c +++ b/drivers/gpu/drm/openchrome/openchrome_display.c @@ -132,9 +132,9 @@ via_encoder_commit(struct drm_encoder *encoder) svga_wseq_mask(VGABASE, 0x1E, 0x30, BIT(5) | BIT(4)); break; + case VIA_DI_PORT_NONE: default: DRM_ERROR("Unsupported DIPort.\n"); - case VIA_DI_PORT_NONE: break; } @@ -192,9 +192,9 @@ via_encoder_disable(struct drm_encoder *encoder) BIT(3) | BIT(2) | BIT(1) | BIT(0)); break; + case VIA_DI_PORT_NONE: default: DRM_ERROR("Unsupported DIPort.\n"); - case VIA_DI_PORT_NONE: break; } } @@ -236,9 +236,9 @@ via_set_sync_polarity(struct drm_encoder *encoder, struct drm_display_mode *mode svga_wcrt_mask(VGABASE, 0x9B, syncreg, BIT(6) | BIT(5)); break; + case VIA_DI_PORT_NONE: default: DRM_ERROR("No DIPort.\n"); - case VIA_DI_PORT_NONE: break; } } diff --git a/drivers/gpu/drm/openchrome/openchrome_init.c b/drivers/gpu/drm/openchrome/openchrome_init.c index 2822e06bcd69..984a238774da 100644 --- a/drivers/gpu/drm/openchrome/openchrome_init.c +++ b/drivers/gpu/drm/openchrome/openchrome_init.c @@ -108,6 +108,7 @@ static int cle266_mem_type(struct openchrome_drm_private *dev_private, break; case 133: dev_private->vram_type = VIA_MEM_SDR133; + break; default: break; } @@ -120,9 +121,11 @@ static int cle266_mem_type(struct openchrome_drm_private *dev_private, break; case 133: dev_private->vram_type = VIA_MEM_DDR_266; + break; default: break; } + break; default: break; } @@ -169,6 +172,7 @@ static int km400_mem_type(struct openchrome_drm_private *dev_private, case 0x03: dev_private->vram_type = VIA_MEM_DDR_333; + break; default: break; } @@ -187,6 +191,7 @@ static int km400_mem_type(struct openchrome_drm_private *dev_private, case 0x02: dev_private->vram_type = VIA_MEM_DDR_400; + break; default: break; } @@ -205,9 +210,11 @@ static int km400_mem_type(struct openchrome_drm_private *dev_private, case 0x03: dev_private->vram_type = VIA_MEM_DDR_266; + break; default: break; } + break; default: break; } @@ -257,6 +264,7 @@ static int km400_mem_type(struct openchrome_drm_private *dev_private, case 0x03: dev_private->vram_type = VIA_MEM_DDR_400; + break; default: break; } @@ -275,6 +283,7 @@ static int km400_mem_type(struct openchrome_drm_private *dev_private, case 0x06: dev_private->vram_type = VIA_MEM_DDR_266; + break; default: break; } @@ -293,9 +302,11 @@ static int km400_mem_type(struct openchrome_drm_private *dev_private, case 0x04: dev_private->vram_type = VIA_MEM_DDR_266; + break; default: break; } + break; default: break; } @@ -333,6 +344,7 @@ static int p4m800_mem_type(struct openchrome_drm_private *dev_private, break; case 4: freq = 7; /* 233 MHz */ + break; default: break; } @@ -363,6 +375,7 @@ static int p4m800_mem_type(struct openchrome_drm_private *dev_private, break; case 0x06: dev_private->vram_type = VIA_MEM_DDR_400; + break; default: break; } @@ -400,6 +413,7 @@ static int km8xx_mem_type(struct openchrome_drm_private *dev_private) case 0x03: dev_private->vram_type = VIA_MEM_DDR2_800; + break; default: break; } @@ -426,6 +440,7 @@ static int km8xx_mem_type(struct openchrome_drm_private *dev_private) case 0x07: dev_private->vram_type = VIA_MEM_DDR_400; + break; default: break; } @@ -460,6 +475,7 @@ static int km8xx_mem_type(struct openchrome_drm_private *dev_private) case 0x06: dev_private->vram_type = VIA_MEM_DDR3_1600; + break; default: break; } @@ -484,6 +500,7 @@ static int km8xx_mem_type(struct openchrome_drm_private *dev_private) case 0x04: dev_private->vram_type = VIA_MEM_DDR2_1066; + break; default: break; } @@ -507,6 +524,7 @@ static int km8xx_mem_type(struct openchrome_drm_private *dev_private) break; case 0x03: dev_private->vram_type = VIA_MEM_DDR2_800; + break; default: break; } @@ -543,6 +561,7 @@ static int cn400_mem_type(struct openchrome_drm_private *dev_private, break; case 4: freq = 7; /* 233 MHz */ + break; default: break; } @@ -570,6 +589,7 @@ static int cn400_mem_type(struct openchrome_drm_private *dev_private, break; case 0x06: dev_private->vram_type = VIA_MEM_DDR_400; + break; default: break; } @@ -602,6 +622,7 @@ static int cn700_mem_type(struct openchrome_drm_private *dev_private, break; case 0x05: dev_private->vram_type = VIA_MEM_DDR2_533; + break; default: break; } @@ -638,6 +659,7 @@ static int cx700_mem_type(struct openchrome_drm_private *dev_private, break; case 3: dev_private->vram_type = VIA_MEM_DDR_400; + break; default: break; } @@ -656,9 +678,11 @@ static int cx700_mem_type(struct openchrome_drm_private *dev_private, break; case 6: dev_private->vram_type = VIA_MEM_DDR2_800; + break; default: break; } + break; default: break; } @@ -705,6 +729,7 @@ static int vx900_mem_type(struct openchrome_drm_private *dev_private, break; case 7: dev_private->vram_type = VIA_MEM_DDR2_1066; + break; default: break; } @@ -730,6 +755,7 @@ static int vx900_mem_type(struct openchrome_drm_private *dev_private, break; case 7: dev_private->vram_type = VIA_MEM_DDR3_1066; + break; default: break; } _______________________________________________ openchrome-devel mailing list openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel