Skip to content

L
linux
Commit 38e5cced authored by Jani Nikula's avatar Jani Nikula
Browse files
Options

drm/i915/sdvo: revert bogus kernel-doc comments to normal comments 

The comments were never proper kernel-doc, but with SDVO it's not worth
the trouble to make them kernel-doc. Just turn them into normal
comments.
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453101588-18008-1-git-send-email-jani.nikula@intel.com
parent f3272e7a
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
drivers/gpu/drm/i915/intel_sdvo_regs.h
View file @ 38e5cced
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* Eric Anholt <eric@anholt.net> * Eric Anholt <eric@anholt.net>
*/ */
/** /*
* @file SDVO command definitions and structures. * SDVO command definitions and structures.
*/ */
#define SDVO_OUTPUT_FIRST (0) #define SDVO_OUTPUT_FIRST (0)
...@@ -66,39 +66,39 @@ struct intel_sdvo_caps { ...@@ -66,39 +66,39 @@ struct intel_sdvo_caps {
#define DTD_FLAG_VSYNC_POSITIVE (1 << 2) #define DTD_FLAG_VSYNC_POSITIVE (1 << 2)
#define DTD_FLAG_INTERLACE (1 << 7) #define DTD_FLAG_INTERLACE (1 << 7)
/** This matches the EDID DTD structure, more or less */ /* This matches the EDID DTD structure, more or less */
struct intel_sdvo_dtd { struct intel_sdvo_dtd {
struct { struct {
u16 clock; /**< pixel clock, in 10kHz units */ u16 clock; /* pixel clock, in 10kHz units */
u8 h_active; /**< lower 8 bits (pixels) */ u8 h_active; /* lower 8 bits (pixels) */
u8 h_blank; /**< lower 8 bits (pixels) */ u8 h_blank; /* lower 8 bits (pixels) */
u8 h_high; /**< upper 4 bits each h_active, h_blank */ u8 h_high; /* upper 4 bits each h_active, h_blank */
u8 v_active; /**< lower 8 bits (lines) */ u8 v_active; /* lower 8 bits (lines) */
u8 v_blank; /**< lower 8 bits (lines) */ u8 v_blank; /* lower 8 bits (lines) */
u8 v_high; /**< upper 4 bits each v_active, v_blank */ u8 v_high; /* upper 4 bits each v_active, v_blank */
} part1; } part1;
struct { struct {
u8 h_sync_off; /**< lower 8 bits, from hblank start */ u8 h_sync_off; /* lower 8 bits, from hblank start */
u8 h_sync_width; /**< lower 8 bits (pixels) */ u8 h_sync_width; /* lower 8 bits (pixels) */
/** lower 4 bits each vsync offset, vsync width */ /* lower 4 bits each vsync offset, vsync width */
u8 v_sync_off_width; u8 v_sync_off_width;
/** /*
* 2 high bits of hsync offset, 2 high bits of hsync width, * 2 high bits of hsync offset, 2 high bits of hsync width,
* bits 4-5 of vsync offset, and 2 high bits of vsync width. * bits 4-5 of vsync offset, and 2 high bits of vsync width.
*/ */
u8 sync_off_width_high; u8 sync_off_width_high;
u8 dtd_flags; u8 dtd_flags;
u8 sdvo_flags; u8 sdvo_flags;
/** bits 6-7 of vsync offset at bits 6-7 */ /* bits 6-7 of vsync offset at bits 6-7 */
u8 v_sync_off_high; u8 v_sync_off_high;
u8 reserved; u8 reserved;
} part2; } part2;
} __packed; } __packed;
struct intel_sdvo_pixel_clock_range { struct intel_sdvo_pixel_clock_range {
u16 min; /**< pixel clock, in 10kHz units */ u16 min; /* pixel clock, in 10kHz units */
u16 max; /**< pixel clock, in 10kHz units */ u16 max; /* pixel clock, in 10kHz units */
} __packed; } __packed;
struct intel_sdvo_preferred_input_timing_args { struct intel_sdvo_preferred_input_timing_args {
...@@ -144,7 +144,7 @@ struct intel_sdvo_preferred_input_timing_args { ...@@ -144,7 +144,7 @@ struct intel_sdvo_preferred_input_timing_args {
#define SDVO_CMD_RESET 0x01 #define SDVO_CMD_RESET 0x01
/** Returns a struct intel_sdvo_caps */ /* Returns a struct intel_sdvo_caps */
#define SDVO_CMD_GET_DEVICE_CAPS 0x02 #define SDVO_CMD_GET_DEVICE_CAPS 0x02
#define SDVO_CMD_GET_FIRMWARE_REV 0x86 #define SDVO_CMD_GET_FIRMWARE_REV 0x86
...@@ -152,7 +152,7 @@ struct intel_sdvo_preferred_input_timing_args { ...@@ -152,7 +152,7 @@ struct intel_sdvo_preferred_input_timing_args {
# define SDVO_DEVICE_FIRMWARE_MAJOR SDVO_I2C_RETURN_1 # define SDVO_DEVICE_FIRMWARE_MAJOR SDVO_I2C_RETURN_1
# define SDVO_DEVICE_FIRMWARE_PATCH SDVO_I2C_RETURN_2 # define SDVO_DEVICE_FIRMWARE_PATCH SDVO_I2C_RETURN_2
/** /*
* Reports which inputs are trained (managed to sync). * Reports which inputs are trained (managed to sync).
* *
* Devices must have trained within 2 vsyncs of a mode change. * Devices must have trained within 2 vsyncs of a mode change.
...@@ -164,10 +164,10 @@ struct intel_sdvo_get_trained_inputs_response { ...@@ -164,10 +164,10 @@ struct intel_sdvo_get_trained_inputs_response {
unsigned int pad:6; unsigned int pad:6;
} __packed; } __packed;
/** Returns a struct intel_sdvo_output_flags of active outputs. */ /* Returns a struct intel_sdvo_output_flags of active outputs. */
#define SDVO_CMD_GET_ACTIVE_OUTPUTS 0x04 #define SDVO_CMD_GET_ACTIVE_OUTPUTS 0x04
/** /*
* Sets the current set of active outputs. * Sets the current set of active outputs.
* *
* Takes a struct intel_sdvo_output_flags. Must be preceded by a SET_IN_OUT_MAP * Takes a struct intel_sdvo_output_flags. Must be preceded by a SET_IN_OUT_MAP
...@@ -175,7 +175,7 @@ struct intel_sdvo_get_trained_inputs_response { ...@@ -175,7 +175,7 @@ struct intel_sdvo_get_trained_inputs_response {
*/ */
#define SDVO_CMD_SET_ACTIVE_OUTPUTS 0x05 #define SDVO_CMD_SET_ACTIVE_OUTPUTS 0x05
/** /*
* Returns the current mapping of SDVO inputs to outputs on the device. * Returns the current mapping of SDVO inputs to outputs on the device.
* *
* Returns two struct intel_sdvo_output_flags structures. * Returns two struct intel_sdvo_output_flags structures.
...@@ -185,29 +185,29 @@ struct intel_sdvo_in_out_map { ...@@ -185,29 +185,29 @@ struct intel_sdvo_in_out_map {
u16 in0, in1; u16 in0, in1;
}; };
/** /*
* Sets the current mapping of SDVO inputs to outputs on the device. * Sets the current mapping of SDVO inputs to outputs on the device.
* *
* Takes two struct i380_sdvo_output_flags structures. * Takes two struct i380_sdvo_output_flags structures.
*/ */
#define SDVO_CMD_SET_IN_OUT_MAP 0x07 #define SDVO_CMD_SET_IN_OUT_MAP 0x07
/** /*
* Returns a struct intel_sdvo_output_flags of attached displays. * Returns a struct intel_sdvo_output_flags of attached displays.
*/ */
#define SDVO_CMD_GET_ATTACHED_DISPLAYS 0x0b #define SDVO_CMD_GET_ATTACHED_DISPLAYS 0x0b
/** /*
* Returns a struct intel_sdvo_ouptut_flags of displays supporting hot plugging. * Returns a struct intel_sdvo_ouptut_flags of displays supporting hot plugging.
*/ */
#define SDVO_CMD_GET_HOT_PLUG_SUPPORT 0x0c #define SDVO_CMD_GET_HOT_PLUG_SUPPORT 0x0c
/** /*
* Takes a struct intel_sdvo_output_flags. * Takes a struct intel_sdvo_output_flags.
*/ */
#define SDVO_CMD_SET_ACTIVE_HOT_PLUG 0x0d #define SDVO_CMD_SET_ACTIVE_HOT_PLUG 0x0d
/** /*
* Returns a struct intel_sdvo_output_flags of displays with hot plug * Returns a struct intel_sdvo_output_flags of displays with hot plug
* interrupts enabled. * interrupts enabled.
*/ */
...@@ -221,7 +221,7 @@ struct intel_sdvo_get_interrupt_event_source_response { ...@@ -221,7 +221,7 @@ struct intel_sdvo_get_interrupt_event_source_response {
unsigned int pad:6; unsigned int pad:6;
} __packed; } __packed;
/** /*
* Selects which input is affected by future input commands. * Selects which input is affected by future input commands.
* *
* Commands affected include SET_INPUT_TIMINGS_PART[12], * Commands affected include SET_INPUT_TIMINGS_PART[12],
...@@ -234,7 +234,7 @@ struct intel_sdvo_set_target_input_args { ...@@ -234,7 +234,7 @@ struct intel_sdvo_set_target_input_args {
unsigned int pad:7; unsigned int pad:7;
} __packed; } __packed;
/** /*
* Takes a struct intel_sdvo_output_flags of which outputs are targeted by * Takes a struct intel_sdvo_output_flags of which outputs are targeted by
* future output commands. * future output commands.
* *
...@@ -280,7 +280,7 @@ struct intel_sdvo_set_target_input_args { ...@@ -280,7 +280,7 @@ struct intel_sdvo_set_target_input_args {
# define SDVO_DTD_SDVO_FLAG_SCALING_SMOOTH (2 << 4) # define SDVO_DTD_SDVO_FLAG_SCALING_SMOOTH (2 << 4)
# define SDVO_DTD_VSYNC_OFF_HIGH SDVO_I2C_ARG_6 # define SDVO_DTD_VSYNC_OFF_HIGH SDVO_I2C_ARG_6
/** /*
* Generates a DTD based on the given width, height, and flags. * Generates a DTD based on the given width, height, and flags.
* *
* This will be supported by any device supporting scaling or interlaced * This will be supported by any device supporting scaling or interlaced
...@@ -300,24 +300,24 @@ struct intel_sdvo_set_target_input_args { ...@@ -300,24 +300,24 @@ struct intel_sdvo_set_target_input_args {
#define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1 0x1b #define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1 0x1b
#define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2 0x1c #define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2 0x1c
/** Returns a struct intel_sdvo_pixel_clock_range */ /* Returns a struct intel_sdvo_pixel_clock_range */
#define SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE 0x1d #define SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE 0x1d
/** Returns a struct intel_sdvo_pixel_clock_range */ /* Returns a struct intel_sdvo_pixel_clock_range */
#define SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE 0x1e #define SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE 0x1e
/** Returns a byte bitfield containing SDVO_CLOCK_RATE_MULT_* flags */ /* Returns a byte bitfield containing SDVO_CLOCK_RATE_MULT_* flags */
#define SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS 0x1f #define SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS 0x1f
/** Returns a byte containing a SDVO_CLOCK_RATE_MULT_* flag */ /* Returns a byte containing a SDVO_CLOCK_RATE_MULT_* flag */
#define SDVO_CMD_GET_CLOCK_RATE_MULT 0x20 #define SDVO_CMD_GET_CLOCK_RATE_MULT 0x20
/** Takes a byte containing a SDVO_CLOCK_RATE_MULT_* flag */ /* Takes a byte containing a SDVO_CLOCK_RATE_MULT_* flag */
#define SDVO_CMD_SET_CLOCK_RATE_MULT 0x21 #define SDVO_CMD_SET_CLOCK_RATE_MULT 0x21
# define SDVO_CLOCK_RATE_MULT_1X (1 << 0) # define SDVO_CLOCK_RATE_MULT_1X (1 << 0)
# define SDVO_CLOCK_RATE_MULT_2X (1 << 1) # define SDVO_CLOCK_RATE_MULT_2X (1 << 1)
# define SDVO_CLOCK_RATE_MULT_4X (1 << 3) # define SDVO_CLOCK_RATE_MULT_4X (1 << 3)
#define SDVO_CMD_GET_SUPPORTED_TV_FORMATS 0x27 #define SDVO_CMD_GET_SUPPORTED_TV_FORMATS 0x27
/** 6 bytes of bit flags for TV formats shared by all TV format functions */ /* 6 bytes of bit flags for TV formats shared by all TV format functions */
struct intel_sdvo_tv_format { struct intel_sdvo_tv_format {
unsigned int ntsc_m:1; unsigned int ntsc_m:1;
unsigned int ntsc_j:1; unsigned int ntsc_j:1;
...@@ -376,7 +376,7 @@ struct intel_sdvo_tv_format { ...@@ -376,7 +376,7 @@ struct intel_sdvo_tv_format {
#define SDVO_CMD_SET_TV_FORMAT 0x29 #define SDVO_CMD_SET_TV_FORMAT 0x29
/** Returns the resolutiosn that can be used with the given TV format */ /* Returns the resolutiosn that can be used with the given TV format */
#define SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT 0x83 #define SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT 0x83
struct intel_sdvo_sdtv_resolution_request { struct intel_sdvo_sdtv_resolution_request {
unsigned int ntsc_m:1; unsigned int ntsc_m:1;
...@@ -539,7 +539,7 @@ struct intel_sdvo_hdtv_resolution_reply { ...@@ -539,7 +539,7 @@ struct intel_sdvo_hdtv_resolution_reply {
#define SDVO_CMD_GET_MAX_PANEL_POWER_SEQUENCING 0x2d #define SDVO_CMD_GET_MAX_PANEL_POWER_SEQUENCING 0x2d
#define SDVO_CMD_GET_PANEL_POWER_SEQUENCING 0x2e #define SDVO_CMD_GET_PANEL_POWER_SEQUENCING 0x2e
#define SDVO_CMD_SET_PANEL_POWER_SEQUENCING 0x2f #define SDVO_CMD_SET_PANEL_POWER_SEQUENCING 0x2f
/** /*
* The panel power sequencing parameters are in units of milliseconds. * The panel power sequencing parameters are in units of milliseconds.
* The high fields are bits 8:9 of the 10-bit values. * The high fields are bits 8:9 of the 10-bit values.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7