summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@gmx.com>2021-05-21 13:59:10 -0700
committerKevin Brace <kevinbrace@gmx.com>2021-05-21 14:03:40 -0700
commitd1545ee25fb15c09a377add338be33db62987470 (patch)
treefec1ee9c835f8d9af0972c903fdc444ec5e8e72d
parent3d2d1eaea1a5bc5f83f36f1e5a46a9232a7d0fca (diff)
drm/openchrome: Move openchrome_hdmi_audio variable
Move it into openchrome_hdmi.c where it belongs. Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
-rw-r--r--drivers/gpu/drm/openchrome/openchrome_drv.c6
-rw-r--r--drivers/gpu/drm/openchrome/openchrome_drv.h2
-rw-r--r--drivers/gpu/drm/openchrome/openchrome_hdmi.c5
3 files changed, 5 insertions, 8 deletions
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
*/