drivers/gpu/drm/via/crtc_hw.h | 26 ++++++++++++------------
drivers/gpu/drm/via/via_analog.c | 35 ++++++++++++++++++--------------
drivers/gpu/drm/via/via_crtc.c | 42 +++++++++++++++++++--------------------
drivers/gpu/drm/via/via_drv.h | 4 +--
drivers/gpu/drm/via/via_tmds.c | 36 ++++++++++++++++-----------------
5 files changed, 74 insertions(+), 69 deletions(-)
New commits:
commit cf10d8dde3ac48a037c95a3e266a9100a0d4e1c1
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Jun 16 23:51:53 2017 -0500
Version bumped to 3.0.34
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 3f8ff78460d..185df94b24f 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -30,11 +30,11 @@
#define DRIVER_AUTHOR "The OpenChrome Project"
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20170613"
+#define DRIVER_DATE "20170616"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 33
+#define DRIVER_PATCHLEVEL 34
#include <linux/module.h>
commit bf8d577aedd3c3d5fa9f2bf24d6ca3a046005542
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Jun 16 22:39:44 2017 -0500
Controlling analog (VGA) power state from DPMS callback function
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/via/via_analog.c b/drivers/gpu/drm/via/via_analog.c
index 3c41e9f84a5..31c9b4b6613 100644
--- a/drivers/gpu/drm/via/via_analog.c
+++ b/drivers/gpu/drm/via/via_analog.c
@@ -106,15 +106,19 @@ via_analog_dpms(struct drm_encoder *encoder, int mode)
switch (mode) {
case DRM_MODE_DPMS_ON:
via_analog_set_dpms_control(VGABASE, VIA_ANALOG_DPMS_ON);
+ via_analog_power(VGABASE, true);
break;
case DRM_MODE_DPMS_STANDBY:
via_analog_set_dpms_control(VGABASE, VIA_ANALOG_DPMS_STANDBY);
+ via_analog_power(VGABASE, true);
break;
case DRM_MODE_DPMS_SUSPEND:
via_analog_set_dpms_control(VGABASE, VIA_ANALOG_DPMS_SUSPEND);
+ via_analog_power(VGABASE, true);
break;
case DRM_MODE_DPMS_OFF:
via_analog_set_dpms_control(VGABASE, VIA_ANALOG_DPMS_OFF);
+ via_analog_power(VGABASE, false);
break;
default:
DRM_ERROR("Bad DPMS mode.");
commit b3ea5c246b560079f37281e3669acefd4cb38898
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Jun 16 19:36:01 2017 -0500
Renamed via_analog_output to via_analog_power
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/via/via_analog.c b/drivers/gpu/drm/via/via_analog.c
index 9418a0e0225..3c41e9f84a5 100644
--- a/drivers/gpu/drm/via/via_analog.c
+++ b/drivers/gpu/drm/via/via_analog.c
@@ -31,14 +31,15 @@
* Enables or disables analog (VGA) output.
*/
static void
-via_analog_output(struct via_device *dev_priv, bool outputState)
+via_analog_power(struct via_device *dev_priv, bool outputState)
{
- DRM_DEBUG_KMS("Entered via_analog_output.\n");
+ DRM_DEBUG_KMS("Entered via_analog_power.\n");
via_analog_set_power(VGABASE, outputState);
- DRM_INFO("Analog (VGA) Output: %s\n", outputState ? "On" : "Off");
+ DRM_INFO("Analog (VGA) Power: %s\n",
+ outputState ? "On" : "Off");
- DRM_DEBUG_KMS("Exiting via_analog_output.\n");
+ DRM_DEBUG_KMS("Exiting via_analog_power.\n");
}
/*
commit 6df849943d461992be1f3d4305d46177e14359fa
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Jun 16 19:27:42 2017 -0500
Renamed via_analog_set_dac_output to via_analog_set_power
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/via/crtc_hw.h b/drivers/gpu/drm/via/crtc_hw.h
index c64e97cb424..388fd3fb3ec 100644
--- a/drivers/gpu/drm/via/crtc_hw.h
+++ b/drivers/gpu/drm/via/crtc_hw.h
@@ -135,14 +135,14 @@ via_dvp1_set_io_pad_state(void __iomem *regs, u8
io_pad_state)
* Sets analog (VGA) DAC output state.
*/
static inline void
-via_analog_set_dac_output(void __iomem *regs, bool outputState)
+via_analog_set_power(void __iomem *regs, bool outputState)
{
- /* Set analog (VGA) DAC output state. */
/* 3X5.47[2] - DACOFF Backdoor Register
* 0: DAC on
* 1: DAC off */
- svga_wcrt_mask(regs, 0x47, outputState ? 0x00 : BIT(2), BIT(2));
- DRM_DEBUG_KMS("Analog (VGA) DAC Output: %s\n",
+ svga_wcrt_mask(regs, 0x47, outputState ? 0x00 : BIT(2),
+ BIT(2));
+ DRM_DEBUG_KMS("Analog (VGA) Power: %s\n",
outputState ? "On" : "Off");
}
diff --git a/drivers/gpu/drm/via/via_analog.c b/drivers/gpu/drm/via/via_analog.c
index 12b06d08e29..9418a0e0225 100644
--- a/drivers/gpu/drm/via/via_analog.c
+++ b/drivers/gpu/drm/via/via_analog.c
@@ -35,7 +35,7 @@ via_analog_output(struct via_device *dev_priv, bool
outputState)
{
DRM_DEBUG_KMS("Entered via_analog_output.\n");
- via_analog_set_dac_output(VGABASE, outputState);
+ via_analog_set_power(VGABASE, outputState);
DRM_INFO("Analog (VGA) Output: %s\n", outputState ? "On" : "Off");
DRM_DEBUG_KMS("Exiting via_analog_output.\n");
commit a4268d29cd299c9b7a1d28b2e7b6b705c1206cac
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Jun 16 19:06:44 2017 -0500
Converted camel case function names to lower case with underscore(s)
Suggested-by: RafaÅ MiÅecki <zaj...@gmail.com>
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/via/crtc_hw.h b/drivers/gpu/drm/via/crtc_hw.h
index 857e6a9e7a2..c64e97cb424 100644
--- a/drivers/gpu/drm/via/crtc_hw.h
+++ b/drivers/gpu/drm/via/crtc_hw.h
@@ -135,7 +135,7 @@ via_dvp1_set_io_pad_state(void __iomem *regs, u8
io_pad_state)
* Sets analog (VGA) DAC output state.
*/
static inline void
-viaAnalogSetDACOutput(void __iomem *regs, bool outputState)
+via_analog_set_dac_output(void __iomem *regs, bool outputState)
{
/* Set analog (VGA) DAC output state. */
/* 3X5.47[2] - DACOFF Backdoor Register
@@ -169,7 +169,7 @@ via_analog_set_dpms_control(void __iomem *regs, u8
dpmsControl)
* Sets analog (VGA) sync polarity.
*/
static inline void
-viaAnalogSetSyncPolarity(void __iomem *regs, u8 syncPolarity)
+via_analog_set_sync_polarity(void __iomem *regs, u8 syncPolarity)
{
/* Set analog (VGA) sync polarity. */
/* 3C2[7] - Analog Vertical Sync Polarity
@@ -189,7 +189,7 @@ viaAnalogSetSyncPolarity(void __iomem *regs, u8
syncPolarity)
* Sets analog (VGA) display source.
*/
static inline void
-viaAnalogSetDisplaySource(void __iomem *regs, u8 displaySource)
+via_analog_set_display_source(void __iomem *regs, u8 displaySource)
{
/* Set analog (VGA) display source. */
/* 3C5.16[6] - CRT Display Source
@@ -242,7 +242,7 @@ via_fpdp_high_set_io_pad_state(void __iomem *regs, u8
io_pad_state)
* Sets CX700 or later single chipset's LVDS1 power sequence type.
*/
static inline void
-viaLVDS1SetPowerSeq(void __iomem *regs, bool softCtrl)
+via_lvds1_set_power_seq(void __iomem *regs, bool softCtrl)
{
/* Set LVDS1 power sequence type. */
/* 3X5.91[0] - LVDS1 Hardware or Software Control Power Sequence
@@ -258,7 +258,7 @@ viaLVDS1SetPowerSeq(void __iomem *regs, bool softCtrl)
* data path state.
*/
static inline void
-viaLVDS1SetSoftData(void __iomem *regs, bool softOn)
+via_lvds1_set_soft_data(void __iomem *regs, bool softOn)
{
/* Set LVDS1 software controlled data path state. */
/* 3X5.91[3] - Software Data On
@@ -273,7 +273,7 @@ viaLVDS1SetSoftData(void __iomem *regs, bool softOn)
* Sets CX700 or later single chipset's LVDS1 software controlled Vdd.
*/
static inline void
-viaLVDS1SetSoftVdd(void __iomem *regs, bool softOn)
+via_lvds1_set_soft_vdd(void __iomem *regs, bool softOn)
{
/* Set LVDS1 software controlled Vdd. */
/* 3X5.91[4] - Software VDD On
@@ -289,7 +289,7 @@ viaLVDS1SetSoftVdd(void __iomem *regs, bool softOn)
* display period.
*/
static inline void
-viaLVDS1SetSoftDisplayPeriod(void __iomem *regs, bool softOn)
+via_lvds1_set_soft_display_period(void __iomem *regs, bool softOn)
{
/* Set LVDS1 software controlled display period state. */
/* 3X5.91[7] - Software Direct On / Off Display Period
@@ -343,7 +343,7 @@ via_lvds2_set_io_pad_setting(void __iomem *regs, u8
io_pad_state)
* Sets CX700 / VX700 and VX800 chipsets' TMDS (DVI) power state.
*/
static inline void
-viaTMDSSetPower(void __iomem *regs, bool powerState)
+via_tmds_set_power(void __iomem *regs, bool powerState)
{
/* Set TMDS (DVI) power state. */
/* 3X5.D2[3] - Power Down (Active High) for DVI
@@ -358,7 +358,7 @@ viaTMDSSetPower(void __iomem *regs, bool powerState)
* Sets CX700 / VX700 and VX800 chipsets' TMDS (DVI) sync polarity.
*/
static inline void
-viaTMDSSetSyncPolarity(void __iomem *regs, u8 syncPolarity)
+via_tmds_set_sync_polarity(void __iomem *regs, u8 syncPolarity)
{
/* Set TMDS (DVI) sync polarity. */
/* 3X5.97[6] - DVI (TMDS) VSYNC Polarity
@@ -378,7 +378,7 @@ viaTMDSSetSyncPolarity(void __iomem *regs, u8 syncPolarity)
* Sets TMDS (DVI) display source.
*/
static inline void
-viaTMDSSetDisplaySource(void __iomem *regs, u8 displaySource)
+via_tmds_set_display_source(void __iomem *regs, u8 displaySource)
{
/* Set TMDS (DVI) display source.
* The integrated TMDS transmitter appears to utilize LVDS1's
diff --git a/drivers/gpu/drm/via/via_analog.c b/drivers/gpu/drm/via/via_analog.c
index c1e6ff3fd76..12b06d08e29 100644
--- a/drivers/gpu/drm/via/via_analog.c
+++ b/drivers/gpu/drm/via/via_analog.c
@@ -31,25 +31,25 @@
* Enables or disables analog (VGA) output.
*/
static void
-viaAnalogOutput(struct via_device *dev_priv, bool outputState)
+via_analog_output(struct via_device *dev_priv, bool outputState)
{
- DRM_DEBUG_KMS("Entered viaAnalogOutput.\n");
+ DRM_DEBUG_KMS("Entered via_analog_output.\n");
- viaAnalogSetDACOutput(VGABASE, outputState);
+ via_analog_set_dac_output(VGABASE, outputState);
DRM_INFO("Analog (VGA) Output: %s\n", outputState ? "On" : "Off");
- DRM_DEBUG_KMS("Exiting viaAnalogOutput.\n");
+ DRM_DEBUG_KMS("Exiting via_analog_output.\n");
}
/*
* Set analog (VGA) sync polarity.
*/
static void
-viaAnalogSyncPolarity(struct via_device *dev_priv, unsigned int flags)
+via_analog_sync_polarity(struct via_device *dev_priv, unsigned int flags)
{
u8 syncPolarity = 0x00;
- DRM_DEBUG_KMS("Entered viaAnalogSyncPolarity.\n");
+ DRM_DEBUG_KMS("Entered via_analog_sync_polarity.\n");
if (flags & DRM_MODE_FLAG_NHSYNC) {
syncPolarity |= BIT(0);
@@ -59,30 +59,30 @@ viaAnalogSyncPolarity(struct via_device *dev_priv, unsigned
int flags)
syncPolarity |= BIT(1);
}
- viaAnalogSetSyncPolarity(VGABASE, syncPolarity);
+ via_analog_set_sync_polarity(VGABASE, syncPolarity);
DRM_INFO("Analog (VGA) Horizontal Sync Polarity: %s\n",
(syncPolarity & BIT(0)) ? "-" : "+");
DRM_INFO("Analog (VGA) Vertical Sync Polarity: %s\n",
(syncPolarity & BIT(1)) ? "-" : "+");
- DRM_DEBUG_KMS("Exiting viaAnalogSyncPolarity.\n");
+ DRM_DEBUG_KMS("Exiting via_analog_sync_polarity.\n");
}
/*
* Sets analog (VGA) display source.
*/
static void
-viaAnalogDisplaySource(struct via_device *dev_priv, int index)
+via_analog_display_source(struct via_device *dev_priv, int index)
{
u8 displaySource = index;
- DRM_DEBUG_KMS("Entered viaAnalogDisplaySource.\n");
+ DRM_DEBUG_KMS("Entered via_analog_display_source.\n");
- viaAnalogSetDisplaySource(VGABASE, displaySource & 0x01);
+ via_analog_set_display_source(VGABASE, displaySource & 0x01);
DRM_INFO("Analog (VGA) Display Source: IGA%d\n",
(displaySource & 0x01) + 1);
- DRM_DEBUG_KMS("Exiting viaAnalogDisplaySource.\n");
+ DRM_DEBUG_KMS("Exiting via_analog_display_source.\n");
}
/*
@@ -149,8 +149,8 @@ via_analog_mode_set(struct drm_encoder *encoder,
DRM_DEBUG_KMS("Entered via_analog_mode_set.\n");
- viaAnalogSyncPolarity(dev_priv, adjusted_mode->flags);
- viaAnalogDisplaySource(dev_priv, iga->index);
+ via_analog_sync_polarity(dev_priv, adjusted_mode->flags);
+ via_analog_display_source(dev_priv, iga->index);
DRM_DEBUG_KMS("Exiting via_analog_mode_set.\n");
}
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index e4de40649f7..bf71b5f349d 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -46,9 +46,9 @@ static struct vga_regset vpit_table[] = {
};
static void
-viaIGACommonInit(void __iomem *regs)
+via_iga_common_init(void __iomem *regs)
{
- DRM_DEBUG("Entered viaIGACommonInit.\n");
+ DRM_DEBUG("Entered via_iga_common_init.\n");
/* Be careful with 3C5.15[5] - Wrap Around Disable.
* It must be set to 1 for proper operation. */
@@ -60,16 +60,16 @@ viaIGACommonInit(void __iomem *regs)
* 1: Enable */
svga_wseq_mask(regs, 0x15, BIT(5) | BIT(1), BIT(5) | BIT(1));
- DRM_DEBUG("Exiting viaIGACommonInit.\n");
+ DRM_DEBUG("Exiting via_iga_common_init.\n");
}
static void
-viaIGA1SetColorDepth(struct via_device *dev_priv,
+via_iga1_set_color_depth(struct via_device *dev_priv,
u8 depth)
{
u8 value;
- DRM_DEBUG("Entered viaIGA1SetColorDepth.\n");
+ DRM_DEBUG("Entered via_iga1_set_color_depth.\n");
value = 0x00;
@@ -104,11 +104,11 @@ viaIGA1SetColorDepth(struct via_device *dev_priv,
DRM_ERROR("Unsupported IGA1 Color Depth: %d bit\n", depth);
}
- DRM_DEBUG("Exiting viaIGA1SetColorDepth.\n");
+ DRM_DEBUG("Exiting via_iga1_set_color_depth.\n");
}
static inline void
-viaIGA1SetPaletteLUTResolution(void __iomem *regs, bool paletteLUT)
+via_iga1_set_palette_lut_resolution(void __iomem *regs, bool paletteLUT)
{
/* Set the palette LUT resolution for IGA1. */
/* 3C5.15[7] - IGA1 6 / 8 Bit LUT
@@ -120,7 +120,7 @@ viaIGA1SetPaletteLUTResolution(void __iomem *regs, bool
paletteLUT)
}
static inline void
-viaIGA1InterlaceMode(void __iomem *regs, bool interlaceMode)
+via_iga1_interlace_mode(void __iomem *regs, bool interlaceMode)
{
svga_wcrt_mask(regs, 0x33, interlaceMode ? BIT(6) : 0, BIT(6));
DRM_INFO("IGA1 Interlace Mode: %s\n",
@@ -128,12 +128,12 @@ viaIGA1InterlaceMode(void __iomem *regs, bool
interlaceMode)
}
static void
-viaIGA2SetColorDepth(struct via_device *dev_priv,
+via_iga2_set_color_depth(struct via_device *dev_priv,
u8 depth)
{
u8 value;
- DRM_DEBUG("Entered viaIGA2SetColorDepth.\n");
+ DRM_DEBUG("Entered via_iga2_set_color_depth.\n");
value = 0x00;
@@ -164,11 +164,11 @@ viaIGA2SetColorDepth(struct via_device *dev_priv,
DRM_ERROR("Unsupported IGA2 Color Depth: %d bit\n", depth);
}
- DRM_DEBUG("Exiting viaIGA2SetColorDepth.\n");
+ DRM_DEBUG("Exiting via_iga2_set_color_depth.\n");
}
static inline void
-viaIGA2SetPaletteLUTResolution(void __iomem *regs, bool paletteLUT)
+via_iga2_set_palette_lut_resolution(void __iomem *regs, bool paletteLUT)
{
/* Set the palette LUT resolution for IGA2. */
/* 3X5.6A[5] - IGA2 6 / 8 Bit LUT
@@ -180,7 +180,7 @@ viaIGA2SetPaletteLUTResolution(void __iomem *regs, bool
paletteLUT)
}
static inline void
-viaIGA2InterlaceMode(void __iomem *regs, bool interlaceMode)
+via_iga2_interlace_mode(void __iomem *regs, bool interlaceMode)
{
svga_wcrt_mask(regs, 0x67, interlaceMode ? BIT(5) : 0, BIT(5));
DRM_INFO("IGA2 Interlace Mode: %s\n",
@@ -1195,7 +1195,7 @@ via_iga1_crtc_mode_set(struct drm_crtc *crtc,
via_lock_crtc(VGABASE);
/* Set non-interlace / interlace mode. */
- viaIGA1InterlaceMode(VGABASE,
+ via_iga1_interlace_mode(VGABASE,
adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE);
/* Load FIFO */
@@ -1296,12 +1296,12 @@ via_iga1_mode_set_base_atomic(struct drm_crtc *crtc,
return -EINVAL;
}
- viaIGACommonInit(VGABASE);
+ via_iga_common_init(VGABASE);
/* Set palette LUT to 8-bit mode. */
- viaIGA1SetPaletteLUTResolution(VGABASE, true);
+ via_iga1_set_palette_lut_resolution(VGABASE, true);
- viaIGA1SetColorDepth(dev_priv, fb->depth);
+ via_iga1_set_color_depth(dev_priv, fb->depth);
/* Set the framebuffer offset */
addr = round_up(bo->offset + pitch, 16) >> 1;
@@ -1508,7 +1508,7 @@ via_iga2_crtc_mode_set(struct drm_crtc *crtc,
via_lock_crtc(VGABASE);
/* Set non-interlace / interlace mode. */
- viaIGA2InterlaceMode(VGABASE,
+ via_iga2_interlace_mode(VGABASE,
adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE);
/* Load FIFO */
@@ -1609,12 +1609,12 @@ via_iga2_mode_set_base_atomic(struct drm_crtc *crtc,
return -EINVAL;
}
- viaIGACommonInit(VGABASE);
+ via_iga_common_init(VGABASE);
/* Set palette LUT to 8-bit mode. */
- viaIGA2SetPaletteLUTResolution(VGABASE, true);
+ via_iga2_set_palette_lut_resolution(VGABASE, true);
- viaIGA2SetColorDepth(dev_priv, fb->depth);
+ via_iga2_set_color_depth(dev_priv, fb->depth);
/* Set the framebuffer offset */
addr = round_up(bo->offset + pitch, 16);
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 9db1515c31a..e66d9935b23 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -36,18 +36,18 @@ viaTMDSPower(struct via_device *dev_priv,
if (powerState) {
/* Software control for LVDS1 power sequence. */
- viaLVDS1SetPowerSeq(VGABASE, true);
+ via_lvds1_set_power_seq(VGABASE, true);
- viaLVDS1SetSoftDisplayPeriod(VGABASE, true);
- viaLVDS1SetSoftData(VGABASE, true);
- viaTMDSSetPower(VGABASE, true);
+ via_lvds1_set_soft_display_period(VGABASE, true);
+ via_lvds1_set_soft_data(VGABASE, true);
+ via_tmds_set_power(VGABASE, true);
} else {
/* Software control for LVDS1 power sequence. */
- viaLVDS1SetPowerSeq(VGABASE, true);
+ via_lvds1_set_power_seq(VGABASE, true);
- viaTMDSSetPower(VGABASE, false);
- viaLVDS1SetSoftData(VGABASE, false);
- viaLVDS1SetSoftDisplayPeriod(VGABASE, false);
+ via_tmds_set_power(VGABASE, false);
+ via_lvds1_set_soft_data(VGABASE, false);
+ via_lvds1_set_soft_display_period(VGABASE, false);
}
DRM_INFO("Integrated TMDS (DVI) Power: %s\n",
@@ -60,11 +60,11 @@ viaTMDSPower(struct via_device *dev_priv,
* Set TMDS (DVI) sync polarity.
*/
static void
-viaTMDSSyncPolarity(struct via_device *dev_priv, unsigned int flags)
+via_tmds_sync_polarity(struct via_device *dev_priv, unsigned int flags)
{
u8 syncPolarity = 0x00;
- DRM_DEBUG_KMS("Entered viaTMDSSyncPolarity.\n");
+ DRM_DEBUG_KMS("Entered via_tmds_sync_polarity.\n");
if (flags & DRM_MODE_FLAG_NHSYNC) {
syncPolarity |= BIT(0);
@@ -74,30 +74,30 @@ viaTMDSSyncPolarity(struct via_device *dev_priv, unsigned
int flags)
syncPolarity |= BIT(1);
}
- viaTMDSSetSyncPolarity(VGABASE, syncPolarity);
+ via_tmds_set_sync_polarity(VGABASE, syncPolarity);
DRM_INFO("TMDS (DVI) Horizontal Sync Polarity: %s\n",
(syncPolarity & BIT(0)) ? "-" : "+");
DRM_INFO("TMDS (DVI) Vertical Sync Polarity: %s\n",
(syncPolarity & BIT(1)) ? "-" : "+");
- DRM_DEBUG_KMS("Exiting viaTMDSSyncPolarity.\n");
+ DRM_DEBUG_KMS("Exiting via_tmds_sync_polarity.\n");
}
/*
* Sets TMDS (DVI) display source.
*/
static void
-viaTMDSDisplaySource(struct via_device *dev_priv, int index)
+via_tmds_display_source(struct via_device *dev_priv, int index)
{
u8 displaySource = index;
- DRM_DEBUG_KMS("Entered viaTMDSDisplaySource.\n");
+ DRM_DEBUG_KMS("Entered via_tmds_display_source.\n");
- viaTMDSSetDisplaySource(VGABASE, displaySource & 0x01);
+ via_tmds_set_display_source(VGABASE, displaySource & 0x01);
DRM_INFO("TMDS (DVI) Display Source: IGA%d\n",
(displaySource & 0x01) + 1);
- DRM_DEBUG_KMS("Exiting viaTMDSDisplaySource.\n");
+ DRM_DEBUG_KMS("Exiting via_tmds_display_source.\n");
}
/*
@@ -158,8 +158,8 @@ via_tmds_mode_set(struct drm_encoder *encoder,
DRM_DEBUG_KMS("Entered via_tmds_mode_set.\n");
- viaTMDSSyncPolarity(dev_priv, adjusted_mode->flags);
- viaTMDSDisplaySource(dev_priv, iga->index);
+ via_tmds_sync_polarity(dev_priv, adjusted_mode->flags);
+ via_tmds_display_source(dev_priv, iga->index);
DRM_DEBUG_KMS("Exiting via_tmds_mode_set.\n");
}
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
