![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
141 lines
3.5 KiB
C
141 lines
3.5 KiB
C
/*
|
|
* Copyright (C) 2012 Russell King
|
|
*
|
|
* 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.
|
|
*/
|
|
#include <drm/drm_modeset_helper.h>
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_gem_framebuffer_helper.h>
|
|
#include "armada_drm.h"
|
|
#include "armada_fb.h"
|
|
#include "armada_gem.h"
|
|
#include "armada_hw.h"
|
|
|
|
static const struct drm_framebuffer_funcs armada_fb_funcs = {
|
|
.destroy = drm_gem_fb_destroy,
|
|
.create_handle = drm_gem_fb_create_handle,
|
|
};
|
|
|
|
struct armada_framebuffer *armada_framebuffer_create(struct drm_device *dev,
|
|
const struct drm_mode_fb_cmd2 *mode, struct armada_gem_object *obj)
|
|
{
|
|
struct armada_framebuffer *dfb;
|
|
uint8_t format, config;
|
|
int ret;
|
|
|
|
switch (mode->pixel_format) {
|
|
#define FMT(drm, fmt, mod) \
|
|
case DRM_FORMAT_##drm: \
|
|
format = CFG_##fmt; \
|
|
config = mod; \
|
|
break
|
|
FMT(RGB565, 565, CFG_SWAPRB);
|
|
FMT(BGR565, 565, 0);
|
|
FMT(ARGB1555, 1555, CFG_SWAPRB);
|
|
FMT(ABGR1555, 1555, 0);
|
|
FMT(RGB888, 888PACK, CFG_SWAPRB);
|
|
FMT(BGR888, 888PACK, 0);
|
|
FMT(XRGB8888, X888, CFG_SWAPRB);
|
|
FMT(XBGR8888, X888, 0);
|
|
FMT(ARGB8888, 8888, CFG_SWAPRB);
|
|
FMT(ABGR8888, 8888, 0);
|
|
FMT(YUYV, 422PACK, CFG_YUV2RGB | CFG_SWAPYU | CFG_SWAPUV);
|
|
FMT(UYVY, 422PACK, CFG_YUV2RGB);
|
|
FMT(VYUY, 422PACK, CFG_YUV2RGB | CFG_SWAPUV);
|
|
FMT(YVYU, 422PACK, CFG_YUV2RGB | CFG_SWAPYU);
|
|
FMT(YUV422, 422, CFG_YUV2RGB);
|
|
FMT(YVU422, 422, CFG_YUV2RGB | CFG_SWAPUV);
|
|
FMT(YUV420, 420, CFG_YUV2RGB);
|
|
FMT(YVU420, 420, CFG_YUV2RGB | CFG_SWAPUV);
|
|
FMT(C8, PSEUDO8, 0);
|
|
#undef FMT
|
|
default:
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
dfb = kzalloc(sizeof(*dfb), GFP_KERNEL);
|
|
if (!dfb) {
|
|
DRM_ERROR("failed to allocate Armada fb object\n");
|
|
return ERR_PTR(-ENOMEM);
|
|
}
|
|
|
|
dfb->fmt = format;
|
|
dfb->mod = config;
|
|
dfb->fb.obj[0] = &obj->obj;
|
|
|
|
drm_helper_mode_fill_fb_struct(dev, &dfb->fb, mode);
|
|
|
|
ret = drm_framebuffer_init(dev, &dfb->fb, &armada_fb_funcs);
|
|
if (ret) {
|
|
kfree(dfb);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
/*
|
|
* Take a reference on our object as we're successful - the
|
|
* caller already holds a reference, which keeps us safe for
|
|
* the above call, but the caller will drop their reference
|
|
* to it. Hence we need to take our own reference.
|
|
*/
|
|
drm_gem_object_get(&obj->obj);
|
|
|
|
return dfb;
|
|
}
|
|
|
|
struct drm_framebuffer *armada_fb_create(struct drm_device *dev,
|
|
struct drm_file *dfile, const struct drm_mode_fb_cmd2 *mode)
|
|
{
|
|
struct armada_gem_object *obj;
|
|
struct armada_framebuffer *dfb;
|
|
int ret;
|
|
|
|
DRM_DEBUG_DRIVER("w%u h%u pf%08x f%u p%u,%u,%u\n",
|
|
mode->width, mode->height, mode->pixel_format,
|
|
mode->flags, mode->pitches[0], mode->pitches[1],
|
|
mode->pitches[2]);
|
|
|
|
/* We can only handle a single plane at the moment */
|
|
if (drm_format_num_planes(mode->pixel_format) > 1 &&
|
|
(mode->handles[0] != mode->handles[1] ||
|
|
mode->handles[0] != mode->handles[2])) {
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
obj = armada_gem_object_lookup(dfile, mode->handles[0]);
|
|
if (!obj) {
|
|
ret = -ENOENT;
|
|
goto err;
|
|
}
|
|
|
|
if (obj->obj.import_attach && !obj->sgt) {
|
|
ret = armada_gem_map_import(obj);
|
|
if (ret)
|
|
goto err_unref;
|
|
}
|
|
|
|
/* Framebuffer objects must have a valid device address for scanout */
|
|
if (!obj->mapped) {
|
|
ret = -EINVAL;
|
|
goto err_unref;
|
|
}
|
|
|
|
dfb = armada_framebuffer_create(dev, mode, obj);
|
|
if (IS_ERR(dfb)) {
|
|
ret = PTR_ERR(dfb);
|
|
goto err;
|
|
}
|
|
|
|
drm_gem_object_put_unlocked(&obj->obj);
|
|
|
|
return &dfb->fb;
|
|
|
|
err_unref:
|
|
drm_gem_object_put_unlocked(&obj->obj);
|
|
err:
|
|
DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
|
|
return ERR_PTR(ret);
|
|
}
|