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:
@@ -8,5 +8,6 @@ config DRM_STI
|
||||
select DRM_PANEL
|
||||
select FW_LOADER
|
||||
select SND_SOC_HDMI_CODEC if SND_SOC
|
||||
select OF
|
||||
help
|
||||
Choose this option to enable DRM on STM stiH4xx chipset
|
||||
|
@@ -515,7 +515,9 @@ static int hdmi_vendor_infoframe_config(struct sti_hdmi *hdmi)
|
||||
|
||||
DRM_DEBUG_DRIVER("\n");
|
||||
|
||||
ret = drm_hdmi_vendor_infoframe_from_display_mode(&infoframe, mode);
|
||||
ret = drm_hdmi_vendor_infoframe_from_display_mode(&infoframe,
|
||||
hdmi->drm_connector,
|
||||
mode);
|
||||
if (ret < 0) {
|
||||
/*
|
||||
* Going into that statement does not means vendor infoframe
|
||||
@@ -976,7 +978,6 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
|
||||
|
||||
count = drm_add_edid_modes(connector, edid);
|
||||
drm_mode_connector_update_edid_property(connector, edid);
|
||||
drm_edid_to_eld(connector, edid);
|
||||
|
||||
kfree(edid);
|
||||
return count;
|
||||
@@ -1414,6 +1415,11 @@ static int sti_hdmi_probe(struct platform_device *pdev)
|
||||
init_waitqueue_head(&hdmi->wait_event);
|
||||
|
||||
hdmi->irq = platform_get_irq_byname(pdev, "irq");
|
||||
if (hdmi->irq < 0) {
|
||||
DRM_ERROR("Cannot get HDMI irq\n");
|
||||
ret = hdmi->irq;
|
||||
goto release_adapter;
|
||||
}
|
||||
|
||||
ret = devm_request_threaded_irq(dev, hdmi->irq, hdmi_irq,
|
||||
hdmi_irq_thread, IRQF_ONESHOT, dev_name(dev), hdmi);
|
||||
|
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/notifier.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <drm/drmP.h>
|
||||
@@ -72,8 +73,6 @@
|
||||
#define AWG_DELAY_ED (-8)
|
||||
#define AWG_DELAY_SD (-7)
|
||||
|
||||
static LIST_HEAD(vtg_lookup);
|
||||
|
||||
/*
|
||||
* STI VTG register offset structure
|
||||
*
|
||||
@@ -123,42 +122,31 @@ struct sti_vtg_sync_params {
|
||||
/**
|
||||
* STI VTG structure
|
||||
*
|
||||
* @dev: pointer to device driver
|
||||
* @np: device node
|
||||
* @regs: register mapping
|
||||
* @sync_params: synchronisation parameters used to generate timings
|
||||
* @irq: VTG irq
|
||||
* @irq_status: store the IRQ status value
|
||||
* @notifier_list: notifier callback
|
||||
* @crtc: the CRTC for vblank event
|
||||
* @link: List node to link the structure in lookup list
|
||||
*/
|
||||
struct sti_vtg {
|
||||
struct device *dev;
|
||||
struct device_node *np;
|
||||
void __iomem *regs;
|
||||
struct sti_vtg_sync_params sync_params[VTG_MAX_SYNC_OUTPUT];
|
||||
int irq;
|
||||
u32 irq_status;
|
||||
struct raw_notifier_head notifier_list;
|
||||
struct drm_crtc *crtc;
|
||||
struct list_head link;
|
||||
};
|
||||
|
||||
static void vtg_register(struct sti_vtg *vtg)
|
||||
{
|
||||
list_add_tail(&vtg->link, &vtg_lookup);
|
||||
}
|
||||
|
||||
struct sti_vtg *of_vtg_find(struct device_node *np)
|
||||
{
|
||||
struct sti_vtg *vtg;
|
||||
struct platform_device *pdev;
|
||||
|
||||
list_for_each_entry(vtg, &vtg_lookup, link) {
|
||||
if (vtg->np == np)
|
||||
return vtg;
|
||||
}
|
||||
return NULL;
|
||||
pdev = of_find_device_by_node(np);
|
||||
if (!pdev)
|
||||
return NULL;
|
||||
|
||||
return (struct sti_vtg *)platform_get_drvdata(pdev);
|
||||
}
|
||||
|
||||
static void vtg_reset(struct sti_vtg *vtg)
|
||||
@@ -397,9 +385,6 @@ static int vtg_probe(struct platform_device *pdev)
|
||||
if (!vtg)
|
||||
return -ENOMEM;
|
||||
|
||||
vtg->dev = dev;
|
||||
vtg->np = pdev->dev.of_node;
|
||||
|
||||
/* Get Memory ressources */
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
@@ -428,19 +413,13 @@ static int vtg_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
vtg_register(vtg);
|
||||
platform_set_drvdata(pdev, vtg);
|
||||
|
||||
DRM_INFO("%s %s\n", __func__, dev_name(vtg->dev));
|
||||
DRM_INFO("%s %s\n", __func__, dev_name(dev));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vtg_remove(struct platform_device *pdev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id vtg_of_match[] = {
|
||||
{ .compatible = "st,vtg", },
|
||||
{ /* sentinel */ }
|
||||
@@ -454,7 +433,6 @@ struct platform_driver sti_vtg_driver = {
|
||||
.of_match_table = vtg_of_match,
|
||||
},
|
||||
.probe = vtg_probe,
|
||||
.remove = vtg_remove,
|
||||
};
|
||||
|
||||
MODULE_AUTHOR("Benjamin Gaignard <benjamin.gaignard@st.com>");
|
||||
|
Reference in New Issue
Block a user