![Daniel Vetter](/assets/img/avatar_default.png)
Having the probe helper stuff (which pretty much everyone needs) in the drm_crtc_helper.h file (which atomic drivers should never need) is confusing. Split them out. To make sure I actually achieved the goal here I went through all drivers. And indeed, all atomic drivers are now free of drm_crtc_helper.h includes. v2: Make it compile. There was so much compile fail on arm drivers that I figured I'll better not include any of the acks on v1. v3: Massive rebase because i915 has lost a lot of drmP.h includes, but not all: Through drm_crtc_helper.h > drm_modeset_helper.h -> drmP.h there was still one, which this patch largely removes. Which means rolling out lots more includes all over. This will also conflict with ongoing drmP.h cleanup by others I expect. v3: Rebase on top of atomic bochs. v4: Review from Laurent for bridge/rcar/omap/shmob/core bits: - (re)move some of the added includes, use the better include files in other places (all suggested from Laurent adopted unchanged). - sort alphabetically v5: Actually try to sort them, and while at it, sort all the ones I touch. v6: Rebase onto i915 changes. v7: Rebase once more. Acked-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Acked-by: CK Hu <ck.hu@mediatek.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: linux-arm-kernel@lists.infradead.org Cc: virtualization@lists.linux-foundation.org Cc: etnaviv@lists.freedesktop.org Cc: linux-samsung-soc@vger.kernel.org Cc: intel-gfx@lists.freedesktop.org Cc: linux-mediatek@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: spice-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-tegra@vger.kernel.org Cc: xen-devel@lists.xen.org Link: https://patchwork.freedesktop.org/patch/msgid/20190117210334.13234-1-daniel.vetter@ffwll.ch
210 lines
5.3 KiB
C
210 lines
5.3 KiB
C
/*
|
|
* Copyright (C) 2012 Red Hat
|
|
* based in parts on udlfb.c:
|
|
* Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it>
|
|
* Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com>
|
|
* Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License v2. See the file COPYING in the main directory of this archive for
|
|
* more details.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_edid.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
#include "udl_connector.h"
|
|
#include "udl_drv.h"
|
|
|
|
static bool udl_get_edid_block(struct udl_device *udl, int block_idx,
|
|
u8 *buff)
|
|
{
|
|
int ret, i;
|
|
u8 *read_buff;
|
|
|
|
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)), bval,
|
|
0xA1, read_buff, 2, HZ);
|
|
if (ret < 1) {
|
|
DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
|
|
kfree(read_buff);
|
|
return false;
|
|
}
|
|
buff[i] = read_buff[1];
|
|
}
|
|
|
|
kfree(read_buff);
|
|
return true;
|
|
}
|
|
|
|
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_drm_connector *udl_connector =
|
|
container_of(connector,
|
|
struct udl_drm_connector,
|
|
connector);
|
|
|
|
drm_connector_update_edid_property(connector, udl_connector->edid);
|
|
if (udl_connector->edid)
|
|
return drm_add_edid_modes(connector, udl_connector->edid);
|
|
return 0;
|
|
}
|
|
|
|
static enum drm_mode_status udl_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
struct udl_device *udl = connector->dev->dev_private;
|
|
if (!udl->sku_pixel_limit)
|
|
return 0;
|
|
|
|
if (mode->vdisplay * mode->hdisplay > udl->sku_pixel_limit)
|
|
return MODE_VIRTUAL_Y;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static enum drm_connector_status
|
|
udl_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
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;
|
|
}
|
|
|
|
static struct drm_encoder*
|
|
udl_best_single_encoder(struct drm_connector *connector)
|
|
{
|
|
int enc_id = connector->encoder_ids[0];
|
|
return drm_encoder_find(connector->dev, NULL, enc_id);
|
|
}
|
|
|
|
static int udl_connector_set_property(struct drm_connector *connector,
|
|
struct drm_property *property,
|
|
uint64_t val)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs udl_connector_helper_funcs = {
|
|
.get_modes = udl_get_modes,
|
|
.mode_valid = udl_mode_valid,
|
|
.best_encoder = udl_best_single_encoder,
|
|
};
|
|
|
|
static const struct drm_connector_funcs udl_connector_funcs = {
|
|
.dpms = drm_helper_connector_dpms,
|
|
.detect = udl_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = udl_connector_destroy,
|
|
.set_property = udl_connector_set_property,
|
|
};
|
|
|
|
int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
|
|
{
|
|
struct udl_drm_connector *udl_connector;
|
|
struct drm_connector *connector;
|
|
|
|
udl_connector = kzalloc(sizeof(struct udl_drm_connector), GFP_KERNEL);
|
|
if (!udl_connector)
|
|
return -ENOMEM;
|
|
|
|
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_connector_attach_encoder(connector, encoder);
|
|
connector->polled = DRM_CONNECTOR_POLL_HPD |
|
|
DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
|
|
|
|
return 0;
|
|
}
|