Merge tag 'drm-misc-next-2017-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Final drm-misc feature pull for 4.15: UAPI Changes: - new madvise ioctl for vc4 (Boris) Core Changes: - plane commit tracking fixes (Maarten) - vgaarb improvements for fancy new platforms (aka ppc64 and arm64) by Bjorn Helgaas Driver Changes: - pile of new panel drivers: Toshiba LT089AC19000, Innolux AT043TN24 - more sun4i work to support A10/A20 Tcon and hdmi outputs - vc4: fix sleep in irq handler by making it threaded (Eric) - udl probe/edid read fixes (Robert Tarasov) And a bunch of misc small cleanups/refactors and doc fixes all over. * tag 'drm-misc-next-2017-10-20' of git://anongit.freedesktop.org/drm/drm-misc: (32 commits) drm/vc4: Fix sleeps during the IRQ handler for DSI transactions. drm/vc4: Add the DRM_IOCTL_VC4_GEM_MADVISE ioctl drm/panel: simple: add Toshiba LT089AC19000 dma-fence: remove duplicate word in comment drm/panel: simple: add delays for Innolux AT043TN24 drm/panel: simple: add bus flags for Innolux AT043TN24 drm/panel: simple: fix vertical timings for Innolux AT043TN24 drm/atomic-helper: check that drivers call drm_crtc_vblank_off drm: some KMS todo ideas vgaarb: Factor out EFI and fallback default device selection vgaarb: Select a default VGA device even if there's no legacy VGA drm/bridge: adv7511: Fix a use after free drm/sun4i: Add support for A20 display pipeline components drm/sun4i: Add support for A10 display pipeline components drm/sun4i: hdmi: Support HDMI controller on A10 drm/sun4i: tcon: Add support for A10 TCON drm/sun4i: backend: Support output muxing drm/sun4i: tcon: Move out the tcon0 common setup drm/sun4i: tcon: Don't rely on encoders to set the TCON mode drm/sun4i: tcon: Don't rely on encoders to enable the TCON ...
Este cometimento está contido em:
Dave Airlie
@@ -14,70 +14,95 @@
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_edid.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
#include "udl_connector.h"
|
||||
#include "udl_drv.h"
|
||||
|
||||
/* dummy connector to just get EDID,
|
||||
all UDL appear to have a DVI-D */
|
||||
|
||||
static u8 *udl_get_edid(struct udl_device *udl)
|
||||
static bool udl_get_edid_block(struct udl_device *udl, int block_idx,
|
||||
u8 *buff)
|
||||
{
|
||||
u8 *block;
|
||||
char *rbuf;
|
||||
int ret, i;
|
||||
u8 *read_buff;
|
||||
|
||||
block = kmalloc(EDID_LENGTH, GFP_KERNEL);
|
||||
if (block == NULL)
|
||||
return NULL;
|
||||
|
||||
rbuf = kmalloc(2, GFP_KERNEL);
|
||||
if (rbuf == NULL)
|
||||
goto error;
|
||||
read_buff = kmalloc(2, GFP_KERNEL);
|
||||
if (!read_buff)
|
||||
return false;
|
||||
|
||||
for (i = 0; i < EDID_LENGTH; i++) {
|
||||
int bval = (i + block_idx * EDID_LENGTH) << 8;
|
||||
ret = usb_control_msg(udl->udev,
|
||||
usb_rcvctrlpipe(udl->udev, 0), (0x02),
|
||||
(0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2,
|
||||
HZ);
|
||||
usb_rcvctrlpipe(udl->udev, 0),
|
||||
(0x02), (0x80 | (0x02 << 5)), bval,
|
||||
0xA1, read_buff, 2, HZ);
|
||||
if (ret < 1) {
|
||||
DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
|
||||
goto error;
|
||||
kfree(read_buff);
|
||||
return false;
|
||||
}
|
||||
block[i] = rbuf[1];
|
||||
buff[i] = read_buff[1];
|
||||
}
|
||||
|
||||
kfree(rbuf);
|
||||
return block;
|
||||
kfree(read_buff);
|
||||
return true;
|
||||
}
|
||||
|
||||
error:
|
||||
kfree(block);
|
||||
kfree(rbuf);
|
||||
return NULL;
|
||||
static bool udl_get_edid(struct udl_device *udl, u8 **result_buff,
|
||||
int *result_buff_size)
|
||||
{
|
||||
int i, extensions;
|
||||
u8 *block_buff = NULL, *buff_ptr;
|
||||
|
||||
block_buff = kmalloc(EDID_LENGTH, GFP_KERNEL);
|
||||
if (block_buff == NULL)
|
||||
return false;
|
||||
|
||||
if (udl_get_edid_block(udl, 0, block_buff) &&
|
||||
memchr_inv(block_buff, 0, EDID_LENGTH)) {
|
||||
extensions = ((struct edid *)block_buff)->extensions;
|
||||
if (extensions > 0) {
|
||||
/* we have to read all extensions one by one */
|
||||
*result_buff_size = EDID_LENGTH * (extensions + 1);
|
||||
*result_buff = kmalloc(*result_buff_size, GFP_KERNEL);
|
||||
buff_ptr = *result_buff;
|
||||
if (buff_ptr == NULL) {
|
||||
kfree(block_buff);
|
||||
return false;
|
||||
}
|
||||
memcpy(buff_ptr, block_buff, EDID_LENGTH);
|
||||
kfree(block_buff);
|
||||
buff_ptr += EDID_LENGTH;
|
||||
for (i = 1; i < extensions; ++i) {
|
||||
if (udl_get_edid_block(udl, i, buff_ptr)) {
|
||||
buff_ptr += EDID_LENGTH;
|
||||
} else {
|
||||
kfree(*result_buff);
|
||||
*result_buff = NULL;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
/* we have only base edid block */
|
||||
*result_buff = block_buff;
|
||||
*result_buff_size = EDID_LENGTH;
|
||||
return true;
|
||||
}
|
||||
|
||||
kfree(block_buff);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static int udl_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct udl_device *udl = connector->dev->dev_private;
|
||||
struct edid *edid;
|
||||
int ret;
|
||||
struct udl_drm_connector *udl_connector =
|
||||
container_of(connector,
|
||||
struct udl_drm_connector,
|
||||
connector);
|
||||
|
||||
edid = (struct edid *)udl_get_edid(udl);
|
||||
if (!edid) {
|
||||
drm_mode_connector_update_edid_property(connector, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* We only read the main block, but if the monitor reports extension
|
||||
* blocks then the drm edid code expects them to be present, so patch
|
||||
* the extension count to 0.
|
||||
*/
|
||||
edid->checksum += edid->extensions;
|
||||
edid->extensions = 0;
|
||||
|
||||
drm_mode_connector_update_edid_property(connector, edid);
|
||||
ret = drm_add_edid_modes(connector, edid);
|
||||
kfree(edid);
|
||||
return ret;
|
||||
drm_mode_connector_update_edid_property(connector, udl_connector->edid);
|
||||
if (udl_connector->edid)
|
||||
return drm_add_edid_modes(connector, udl_connector->edid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int udl_mode_valid(struct drm_connector *connector,
|
||||
@@ -96,8 +121,26 @@ static int udl_mode_valid(struct drm_connector *connector,
|
||||
static enum drm_connector_status
|
||||
udl_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
if (drm_dev_is_unplugged(connector->dev))
|
||||
u8 *edid_buff = NULL;
|
||||
int edid_buff_size = 0;
|
||||
struct udl_device *udl = connector->dev->dev_private;
|
||||
struct udl_drm_connector *udl_connector =
|
||||
container_of(connector,
|
||||
struct udl_drm_connector,
|
||||
connector);
|
||||
|
||||
/* cleanup previous edid */
|
||||
if (udl_connector->edid != NULL) {
|
||||
kfree(udl_connector->edid);
|
||||
udl_connector->edid = NULL;
|
||||
}
|
||||
|
||||
|
||||
if (!udl_get_edid(udl, &edid_buff, &edid_buff_size))
|
||||
return connector_status_disconnected;
|
||||
|
||||
udl_connector->edid = (struct edid *)edid_buff;
|
||||
|
||||
return connector_status_connected;
|
||||
}
|
||||
|
||||
@@ -117,8 +160,14 @@ static int udl_connector_set_property(struct drm_connector *connector,
|
||||
|
||||
static void udl_connector_destroy(struct drm_connector *connector)
|
||||
{
|
||||
struct udl_drm_connector *udl_connector =
|
||||
container_of(connector,
|
||||
struct udl_drm_connector,
|
||||
connector);
|
||||
|
||||
drm_connector_unregister(connector);
|
||||
drm_connector_cleanup(connector);
|
||||
kfree(udl_connector->edid);
|
||||
kfree(connector);
|
||||
}
|
||||
|
||||
@@ -138,17 +187,22 @@ static const struct drm_connector_funcs udl_connector_funcs = {
|
||||
|
||||
int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
|
||||
{
|
||||
struct udl_drm_connector *udl_connector;
|
||||
struct drm_connector *connector;
|
||||
|
||||
connector = kzalloc(sizeof(struct drm_connector), GFP_KERNEL);
|
||||
if (!connector)
|
||||
udl_connector = kzalloc(sizeof(struct udl_drm_connector), GFP_KERNEL);
|
||||
if (!udl_connector)
|
||||
return -ENOMEM;
|
||||
|
||||
drm_connector_init(dev, connector, &udl_connector_funcs, DRM_MODE_CONNECTOR_DVII);
|
||||
connector = &udl_connector->connector;
|
||||
drm_connector_init(dev, connector, &udl_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_DVII);
|
||||
drm_connector_helper_add(connector, &udl_connector_helper_funcs);
|
||||
|
||||
drm_connector_register(connector);
|
||||
drm_mode_connector_attach_encoder(connector, encoder);
|
||||
connector->polled = DRM_CONNECTOR_POLL_HPD |
|
||||
DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
13
drivers/gpu/drm/udl/udl_connector.h
Ficheiro normal
13
drivers/gpu/drm/udl/udl_connector.h
Ficheiro normal
@@ -0,0 +1,13 @@
|
||||
#ifndef __UDL_CONNECTOR_H__
|
||||
#define __UDL_CONNECTOR_H__
|
||||
|
||||
#include <drm/drm_crtc.h>
|
||||
|
||||
struct udl_drm_connector {
|
||||
struct drm_connector connector;
|
||||
/* last udl_detect edid */
|
||||
struct edid *edid;
|
||||
};
|
||||
|
||||
|
||||
#endif //__UDL_CONNECTOR_H__
|
||||
@@ -14,6 +14,9 @@
|
||||
static int udl_usb_suspend(struct usb_interface *interface,
|
||||
pm_message_t message)
|
||||
{
|
||||
struct drm_device *dev = usb_get_intfdata(interface);
|
||||
|
||||
drm_kms_helper_poll_disable(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -21,6 +24,7 @@ static int udl_usb_resume(struct usb_interface *interface)
|
||||
{
|
||||
struct drm_device *dev = usb_get_intfdata(interface);
|
||||
|
||||
drm_kms_helper_poll_enable(dev);
|
||||
udl_modeset_restore(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
* more details.
|
||||
*/
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
#include "udl_drv.h"
|
||||
|
||||
/* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */
|
||||
@@ -350,6 +351,8 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
|
||||
if (ret)
|
||||
goto err_fb;
|
||||
|
||||
drm_kms_helper_poll_init(dev);
|
||||
|
||||
return 0;
|
||||
err_fb:
|
||||
udl_fbdev_cleanup(dev);
|
||||
@@ -371,6 +374,8 @@ void udl_driver_unload(struct drm_device *dev)
|
||||
{
|
||||
struct udl_device *udl = dev->dev_private;
|
||||
|
||||
drm_kms_helper_poll_fini(dev);
|
||||
|
||||
if (udl->urbs.count)
|
||||
udl_free_urb_list(dev);
|
||||
|
||||
|
||||
Criar uma nova questão referindo esta
Bloquear um utilizador