Merge tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Cross-subsystem Changes: - device tree doc for the Mitsubishi AA070MC01 and Tianma TM070RVHG71 panels (Lukasz Majewski) and for a 2nd endpoint on stm32 (Philippe Cornu) Core Changes: The most important changes are: - Add drm_driver .last_close and .output_poll_changed helpers to reduce fbdev emulation footprint in drivers (Noralf) - Fix plane clipping in core and for vmwgfx (Ville) Then we have a bunch of of improvement for print and debug such as the addition of a framebuffer debugfs file. ELD connector, HDMI and improvements. And a bunch of misc improvements, clean ups and style changes and doc updates [airlied: drop eld bits from amdgpu_dm] Driver Changes: - sii8620: filter unsupported modes and add DVI mode support (Maciej Purski) - rockchip: analogix_dp: Remove unnecessary init code (Jeffy Chen) - virtio, cirrus: add fb create_handle support to enable screenshots(Lepton Wu) - virtio: replace reference/unreference with get/put (Aastha Gupta) - vc4, gma500: Convert timers to use timer_setup() (Kees Cook) - vc4: Reject HDMI modes with too high of clocks (Eric) - vc4: Add support for more pixel formats (Dave Stevenson) - stm: dsi: Rename driver name to "stm32-display-dsi" (Philippe Cornu) - stm: ltdc: add a 2nd endpoint (Philippe Cornu) - via: use monotonic time for VIA_WAIT_IRQ (Arnd Bergmann) * tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc: (96 commits) drm/bridge: tc358767: add copyright lines MAINTAINERS: change maintainer for Rockchip drm drivers drm/vblank: Fix vblank timestamp debugs drm/via: use monotonic time for VIA_WAIT_IRQ dma-buf: Fix ifnullfree.cocci warnings drm/printer: Add drm_vprintf() drm/edid: Allow HDMI infoframe without VIC or S3D video/hdmi: Allow "empty" HDMI infoframes dma-buf/fence: Fix lock inversion within dma-fence-array drm/sti: Handle return value of platform_get_irq_byname drm/vc4: Add support for NV21 and NV61. drm/vc4: Use .pixel_order instead of custom .flip_cbcr drm/vc4: Add support for DRM_FORMAT_RGB888 and DRM_FORMAT_BGR888 drm: Move drm_plane_helper_check_state() into drm_atomic_helper.c drm: Check crtc_state->enable rather than crtc->enabled in drm_plane_helper_check_state() drm/vmwgfx: Try to fix plane clipping drm/vmwgfx: Use drm_plane_helper_check_state() drm/vmwgfx: Remove bogus crtc coords vs fb size check gpu: gma500: remove unneeded DRIVER_LICENSE #define drm: don't link DP aux i2c adapter to the hardware device node ...
This commit is contained in:
@@ -221,7 +221,7 @@ static struct rpi_touchscreen *panel_to_ts(struct drm_panel *panel)
|
||||
return container_of(panel, struct rpi_touchscreen, base);
|
||||
}
|
||||
|
||||
static u8 rpi_touchscreen_i2c_read(struct rpi_touchscreen *ts, u8 reg)
|
||||
static int rpi_touchscreen_i2c_read(struct rpi_touchscreen *ts, u8 reg)
|
||||
{
|
||||
return i2c_smbus_read_byte_data(ts->i2c, reg);
|
||||
}
|
||||
|
@@ -1356,6 +1356,38 @@ static const struct panel_desc lg_lp129qe = {
|
||||
},
|
||||
};
|
||||
|
||||
static const struct drm_display_mode mitsubishi_aa070mc01_mode = {
|
||||
.clock = 30400,
|
||||
.hdisplay = 800,
|
||||
.hsync_start = 800 + 0,
|
||||
.hsync_end = 800 + 1,
|
||||
.htotal = 800 + 0 + 1 + 160,
|
||||
.vdisplay = 480,
|
||||
.vsync_start = 480 + 0,
|
||||
.vsync_end = 480 + 48 + 1,
|
||||
.vtotal = 480 + 48 + 1 + 0,
|
||||
.vrefresh = 60,
|
||||
.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
|
||||
};
|
||||
|
||||
static const struct panel_desc mitsubishi_aa070mc01 = {
|
||||
.modes = &mitsubishi_aa070mc01_mode,
|
||||
.num_modes = 1,
|
||||
.bpc = 8,
|
||||
.size = {
|
||||
.width = 152,
|
||||
.height = 91,
|
||||
},
|
||||
|
||||
.delay = {
|
||||
.enable = 200,
|
||||
.unprepare = 200,
|
||||
.disable = 400,
|
||||
},
|
||||
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
|
||||
.bus_flags = DRM_BUS_FLAG_DE_HIGH,
|
||||
};
|
||||
|
||||
static const struct display_timing nec_nl12880bc20_05_timing = {
|
||||
.pixelclock = { 67000000, 71000000, 75000000 },
|
||||
.hactive = { 1280, 1280, 1280 },
|
||||
@@ -1837,6 +1869,30 @@ static const struct panel_desc tianma_tm070jdhg30 = {
|
||||
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
|
||||
};
|
||||
|
||||
static const struct display_timing tianma_tm070rvhg71_timing = {
|
||||
.pixelclock = { 27700000, 29200000, 39600000 },
|
||||
.hactive = { 800, 800, 800 },
|
||||
.hfront_porch = { 12, 40, 212 },
|
||||
.hback_porch = { 88, 88, 88 },
|
||||
.hsync_len = { 1, 1, 40 },
|
||||
.vactive = { 480, 480, 480 },
|
||||
.vfront_porch = { 1, 13, 88 },
|
||||
.vback_porch = { 32, 32, 32 },
|
||||
.vsync_len = { 1, 1, 3 },
|
||||
.flags = DISPLAY_FLAGS_DE_HIGH,
|
||||
};
|
||||
|
||||
static const struct panel_desc tianma_tm070rvhg71 = {
|
||||
.timings = &tianma_tm070rvhg71_timing,
|
||||
.num_timings = 1,
|
||||
.bpc = 8,
|
||||
.size = {
|
||||
.width = 154,
|
||||
.height = 86,
|
||||
},
|
||||
.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
|
||||
};
|
||||
|
||||
static const struct drm_display_mode toshiba_lt089ac29000_mode = {
|
||||
.clock = 79500,
|
||||
.hdisplay = 1280,
|
||||
@@ -2085,6 +2141,9 @@ static const struct of_device_id platform_of_match[] = {
|
||||
}, {
|
||||
.compatible = "lg,lp129qe",
|
||||
.data = &lg_lp129qe,
|
||||
}, {
|
||||
.compatible = "mitsubishi,aa070mc01-ca1",
|
||||
.data = &mitsubishi_aa070mc01,
|
||||
}, {
|
||||
.compatible = "nec,nl12880bc20-05",
|
||||
.data = &nec_nl12880bc20_05,
|
||||
@@ -2142,6 +2201,9 @@ static const struct of_device_id platform_of_match[] = {
|
||||
}, {
|
||||
.compatible = "tianma,tm070jdhg30",
|
||||
.data = &tianma_tm070jdhg30,
|
||||
}, {
|
||||
.compatible = "tianma,tm070rvhg71",
|
||||
.data = &tianma_tm070rvhg71,
|
||||
}, {
|
||||
.compatible = "toshiba,lt089ac29000",
|
||||
.data = &toshiba_lt089ac29000,
|
||||
|
Reference in New Issue
Block a user