Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm merge from Dave Airlie:
"Highlights:
- TI LCD controller KMS driver
- TI OMAP KMS driver merged from staging
- drop gma500 stub driver
- the fbcon locking fixes
- the vgacon dirty like zebra fix.
- open firmware videomode and hdmi common code helpers
- major locking rework for kms object handling - pageflip/cursor
won't block on polling anymore!
- fbcon helper and prime helper cleanups
- i915: all over the map, haswell power well enhancements, valleyview
macro horrors cleaned up, killing lots of legacy GTT code,
- radeon: CS ioctl unification, deprecated UMS support, gpu reset
rework, VM fixes
- nouveau: reworked thermal code, external dp/tmds encoder support
(anx9805), fences sleep instead of polling,
- exynos: all over the driver fixes."
Lovely conflict in radeon/evergreen_cs.c between commit de0babd60d
("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
and the new changes that modified that evergreen_dma_cs_parse()
function.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits)
drm/tilcdc: only build on arm
drm/i915: Revert hdmi HDP pin checks
drm/tegra: Add list of framebuffers to debugfs
drm/tegra: Fix color expansion
drm/tegra: Split DC_CMD_STATE_CONTROL register write
drm/tegra: Implement page-flipping support
drm/tegra: Implement VBLANK support
drm/tegra: Implement .mode_set_base()
drm/tegra: Add plane support
drm/tegra: Remove bogus tegra_framebuffer structure
drm: Add consistency check for page-flipping
drm/radeon: Use generic HDMI infoframe helpers
drm/tegra: Use generic HDMI infoframe helpers
drm: Add EDID helper documentation
drm: Add HDMI infoframe helpers
video: Add generic HDMI infoframe helpers
drm: Add some missing forward declarations
drm: Move mode tables to drm_edid.c
drm: Remove duplicate drm_mode_cea_vic()
gma500: Fix n, m1 and m2 clock limits for sdvo and lvds
...
This commit is contained in:
Linus Torvalds
@@ -77,7 +77,9 @@ extern const struct consw prom_con; /* SPARC PROM console */
|
||||
int con_is_bound(const struct consw *csw);
|
||||
int register_con_driver(const struct consw *csw, int first, int last);
|
||||
int unregister_con_driver(const struct consw *csw);
|
||||
int do_unregister_con_driver(const struct consw *csw);
|
||||
int take_over_console(const struct consw *sw, int first, int last, int deflt);
|
||||
int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
|
||||
void give_up_console(const struct consw *sw);
|
||||
#ifdef CONFIG_HW_CONSOLE
|
||||
int con_debug_enter(struct vc_data *vc);
|
||||
|
||||
@@ -19,6 +19,8 @@ struct vm_area_struct;
|
||||
struct fb_info;
|
||||
struct device;
|
||||
struct file;
|
||||
struct videomode;
|
||||
struct device_node;
|
||||
|
||||
/* Definitions below are used in the parsed monitor specs */
|
||||
#define FB_DPMS_ACTIVE_OFF 1
|
||||
@@ -714,6 +716,12 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb);
|
||||
extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
|
||||
extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
|
||||
|
||||
extern int of_get_fb_videomode(struct device_node *np,
|
||||
struct fb_videomode *fb,
|
||||
int index);
|
||||
extern int fb_videomode_from_videomode(const struct videomode *vm,
|
||||
struct fb_videomode *fbmode);
|
||||
|
||||
/* drivers/video/modedb.c */
|
||||
#define VESA_MODEDB_SIZE 34
|
||||
extern void fb_var_to_videomode(struct fb_videomode *mode,
|
||||
|
||||
231
include/linux/hdmi.h
Normal file
231
include/linux/hdmi.h
Normal file
@@ -0,0 +1,231 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Avionic Design GmbH
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_HDMI_H_
|
||||
#define __LINUX_HDMI_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
enum hdmi_infoframe_type {
|
||||
HDMI_INFOFRAME_TYPE_VENDOR = 0x81,
|
||||
HDMI_INFOFRAME_TYPE_AVI = 0x82,
|
||||
HDMI_INFOFRAME_TYPE_SPD = 0x83,
|
||||
HDMI_INFOFRAME_TYPE_AUDIO = 0x84,
|
||||
};
|
||||
|
||||
#define HDMI_INFOFRAME_HEADER_SIZE 4
|
||||
#define HDMI_AVI_INFOFRAME_SIZE 13
|
||||
#define HDMI_SPD_INFOFRAME_SIZE 25
|
||||
#define HDMI_AUDIO_INFOFRAME_SIZE 10
|
||||
|
||||
enum hdmi_colorspace {
|
||||
HDMI_COLORSPACE_RGB,
|
||||
HDMI_COLORSPACE_YUV422,
|
||||
HDMI_COLORSPACE_YUV444,
|
||||
};
|
||||
|
||||
enum hdmi_scan_mode {
|
||||
HDMI_SCAN_MODE_NONE,
|
||||
HDMI_SCAN_MODE_OVERSCAN,
|
||||
HDMI_SCAN_MODE_UNDERSCAN,
|
||||
};
|
||||
|
||||
enum hdmi_colorimetry {
|
||||
HDMI_COLORIMETRY_NONE,
|
||||
HDMI_COLORIMETRY_ITU_601,
|
||||
HDMI_COLORIMETRY_ITU_709,
|
||||
HDMI_COLORIMETRY_EXTENDED,
|
||||
};
|
||||
|
||||
enum hdmi_picture_aspect {
|
||||
HDMI_PICTURE_ASPECT_NONE,
|
||||
HDMI_PICTURE_ASPECT_4_3,
|
||||
HDMI_PICTURE_ASPECT_16_9,
|
||||
};
|
||||
|
||||
enum hdmi_active_aspect {
|
||||
HDMI_ACTIVE_ASPECT_16_9_TOP = 2,
|
||||
HDMI_ACTIVE_ASPECT_14_9_TOP = 3,
|
||||
HDMI_ACTIVE_ASPECT_16_9_CENTER = 4,
|
||||
HDMI_ACTIVE_ASPECT_PICTURE = 8,
|
||||
HDMI_ACTIVE_ASPECT_4_3 = 9,
|
||||
HDMI_ACTIVE_ASPECT_16_9 = 10,
|
||||
HDMI_ACTIVE_ASPECT_14_9 = 11,
|
||||
HDMI_ACTIVE_ASPECT_4_3_SP_14_9 = 13,
|
||||
HDMI_ACTIVE_ASPECT_16_9_SP_14_9 = 14,
|
||||
HDMI_ACTIVE_ASPECT_16_9_SP_4_3 = 15,
|
||||
};
|
||||
|
||||
enum hdmi_extended_colorimetry {
|
||||
HDMI_EXTENDED_COLORIMETRY_XV_YCC_601,
|
||||
HDMI_EXTENDED_COLORIMETRY_XV_YCC_709,
|
||||
HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
|
||||
HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
|
||||
HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
|
||||
};
|
||||
|
||||
enum hdmi_quantization_range {
|
||||
HDMI_QUANTIZATION_RANGE_DEFAULT,
|
||||
HDMI_QUANTIZATION_RANGE_LIMITED,
|
||||
HDMI_QUANTIZATION_RANGE_FULL,
|
||||
};
|
||||
|
||||
/* non-uniform picture scaling */
|
||||
enum hdmi_nups {
|
||||
HDMI_NUPS_UNKNOWN,
|
||||
HDMI_NUPS_HORIZONTAL,
|
||||
HDMI_NUPS_VERTICAL,
|
||||
HDMI_NUPS_BOTH,
|
||||
};
|
||||
|
||||
enum hdmi_ycc_quantization_range {
|
||||
HDMI_YCC_QUANTIZATION_RANGE_LIMITED,
|
||||
HDMI_YCC_QUANTIZATION_RANGE_FULL,
|
||||
};
|
||||
|
||||
enum hdmi_content_type {
|
||||
HDMI_CONTENT_TYPE_NONE,
|
||||
HDMI_CONTENT_TYPE_PHOTO,
|
||||
HDMI_CONTENT_TYPE_CINEMA,
|
||||
HDMI_CONTENT_TYPE_GAME,
|
||||
};
|
||||
|
||||
struct hdmi_avi_infoframe {
|
||||
enum hdmi_infoframe_type type;
|
||||
unsigned char version;
|
||||
unsigned char length;
|
||||
enum hdmi_colorspace colorspace;
|
||||
bool active_info_valid;
|
||||
bool horizontal_bar_valid;
|
||||
bool vertical_bar_valid;
|
||||
enum hdmi_scan_mode scan_mode;
|
||||
enum hdmi_colorimetry colorimetry;
|
||||
enum hdmi_picture_aspect picture_aspect;
|
||||
enum hdmi_active_aspect active_aspect;
|
||||
bool itc;
|
||||
enum hdmi_extended_colorimetry extended_colorimetry;
|
||||
enum hdmi_quantization_range quantization_range;
|
||||
enum hdmi_nups nups;
|
||||
unsigned char video_code;
|
||||
enum hdmi_ycc_quantization_range ycc_quantization_range;
|
||||
enum hdmi_content_type content_type;
|
||||
unsigned char pixel_repeat;
|
||||
unsigned short top_bar;
|
||||
unsigned short bottom_bar;
|
||||
unsigned short left_bar;
|
||||
unsigned short right_bar;
|
||||
};
|
||||
|
||||
int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame);
|
||||
ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
|
||||
size_t size);
|
||||
|
||||
enum hdmi_spd_sdi {
|
||||
HDMI_SPD_SDI_UNKNOWN,
|
||||
HDMI_SPD_SDI_DSTB,
|
||||
HDMI_SPD_SDI_DVDP,
|
||||
HDMI_SPD_SDI_DVHS,
|
||||
HDMI_SPD_SDI_HDDVR,
|
||||
HDMI_SPD_SDI_DVC,
|
||||
HDMI_SPD_SDI_DSC,
|
||||
HDMI_SPD_SDI_VCD,
|
||||
HDMI_SPD_SDI_GAME,
|
||||
HDMI_SPD_SDI_PC,
|
||||
HDMI_SPD_SDI_BD,
|
||||
HDMI_SPD_SDI_SACD,
|
||||
HDMI_SPD_SDI_HDDVD,
|
||||
HDMI_SPD_SDI_PMP,
|
||||
};
|
||||
|
||||
struct hdmi_spd_infoframe {
|
||||
enum hdmi_infoframe_type type;
|
||||
unsigned char version;
|
||||
unsigned char length;
|
||||
char vendor[8];
|
||||
char product[16];
|
||||
enum hdmi_spd_sdi sdi;
|
||||
};
|
||||
|
||||
int hdmi_spd_infoframe_init(struct hdmi_spd_infoframe *frame,
|
||||
const char *vendor, const char *product);
|
||||
ssize_t hdmi_spd_infoframe_pack(struct hdmi_spd_infoframe *frame, void *buffer,
|
||||
size_t size);
|
||||
|
||||
enum hdmi_audio_coding_type {
|
||||
HDMI_AUDIO_CODING_TYPE_STREAM,
|
||||
HDMI_AUDIO_CODING_TYPE_PCM,
|
||||
HDMI_AUDIO_CODING_TYPE_AC3,
|
||||
HDMI_AUDIO_CODING_TYPE_MPEG1,
|
||||
HDMI_AUDIO_CODING_TYPE_MP3,
|
||||
HDMI_AUDIO_CODING_TYPE_MPEG2,
|
||||
HDMI_AUDIO_CODING_TYPE_AAC_LC,
|
||||
HDMI_AUDIO_CODING_TYPE_DTS,
|
||||
HDMI_AUDIO_CODING_TYPE_ATRAC,
|
||||
HDMI_AUDIO_CODING_TYPE_DSD,
|
||||
HDMI_AUDIO_CODING_TYPE_EAC3,
|
||||
HDMI_AUDIO_CODING_TYPE_DTS_HD,
|
||||
HDMI_AUDIO_CODING_TYPE_MLP,
|
||||
HDMI_AUDIO_CODING_TYPE_DST,
|
||||
HDMI_AUDIO_CODING_TYPE_WMA_PRO,
|
||||
};
|
||||
|
||||
enum hdmi_audio_sample_size {
|
||||
HDMI_AUDIO_SAMPLE_SIZE_STREAM,
|
||||
HDMI_AUDIO_SAMPLE_SIZE_16,
|
||||
HDMI_AUDIO_SAMPLE_SIZE_20,
|
||||
HDMI_AUDIO_SAMPLE_SIZE_24,
|
||||
};
|
||||
|
||||
enum hdmi_audio_sample_frequency {
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_32000,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_44100,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_48000,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_88200,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_96000,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_176400,
|
||||
HDMI_AUDIO_SAMPLE_FREQUENCY_192000,
|
||||
};
|
||||
|
||||
enum hdmi_audio_coding_type_ext {
|
||||
HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
|
||||
HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
|
||||
HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
|
||||
HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
|
||||
};
|
||||
|
||||
struct hdmi_audio_infoframe {
|
||||
enum hdmi_infoframe_type type;
|
||||
unsigned char version;
|
||||
unsigned char length;
|
||||
unsigned char channels;
|
||||
enum hdmi_audio_coding_type coding_type;
|
||||
enum hdmi_audio_sample_size sample_size;
|
||||
enum hdmi_audio_sample_frequency sample_frequency;
|
||||
enum hdmi_audio_coding_type_ext coding_type_ext;
|
||||
unsigned char channel_allocation;
|
||||
unsigned char level_shift_value;
|
||||
bool downmix_inhibit;
|
||||
|
||||
};
|
||||
|
||||
int hdmi_audio_infoframe_init(struct hdmi_audio_infoframe *frame);
|
||||
ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame,
|
||||
void *buffer, size_t size);
|
||||
|
||||
struct hdmi_vendor_infoframe {
|
||||
enum hdmi_infoframe_type type;
|
||||
unsigned char version;
|
||||
unsigned char length;
|
||||
u8 data[27];
|
||||
};
|
||||
|
||||
ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
|
||||
void *buffer, size_t size);
|
||||
|
||||
#endif /* _DRM_HDMI_H */
|
||||
@@ -47,6 +47,7 @@ int con_set_cmap(unsigned char __user *cmap);
|
||||
int con_get_cmap(unsigned char __user *cmap);
|
||||
void scrollback(struct vc_data *vc, int lines);
|
||||
void scrollfront(struct vc_data *vc, int lines);
|
||||
void clear_buffer_attributes(struct vc_data *vc);
|
||||
void update_region(struct vc_data *vc, unsigned long start, int count);
|
||||
void redraw_screen(struct vc_data *vc, int is_switch);
|
||||
#define update_screen(x) redraw_screen(x, 0)
|
||||
@@ -130,6 +131,8 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new);
|
||||
int vt_waitactive(int n);
|
||||
void change_console(struct vc_data *new_vc);
|
||||
void reset_vc(struct vc_data *vc);
|
||||
extern int do_unbind_con_driver(const struct consw *csw, int first, int last,
|
||||
int deflt);
|
||||
extern int unbind_con_driver(const struct consw *csw, int first, int last,
|
||||
int deflt);
|
||||
int vty_init(const struct file_operations *console_fops);
|
||||
|
||||
Reference in New Issue
Block a user