Commit 491b14b9 authored by Eugeniy Paltsev's avatar Eugeniy Paltsev Committed by Alexey Brodkin

DRM: ARC: PGU: cleanup supported format list code

Get rid of 'simplefb_format' structure usage as we only use its
'fourcc' field.
Signed-off-by: default avatarEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
parent 4c5b36ee
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#define ENCODE_PGU_XY(x, y) ((((x) - 1) << 16) | ((y) - 1)) #define ENCODE_PGU_XY(x, y) ((((x) - 1) << 16) | ((y) - 1))
static struct simplefb_format supported_formats[] = { static const u32 arc_pgu_supported_formats[] = {
{ "r5g6b5", 16, {11, 5}, {5, 6}, {0, 5}, {0, 0}, DRM_FORMAT_RGB565 }, DRM_FORMAT_RGB565,
{ "r8g8b8", 24, {16, 8}, {8, 8}, {0, 8}, {0, 0}, DRM_FORMAT_RGB888 }, DRM_FORMAT_RGB888,
}; };
static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc) static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc)
...@@ -30,20 +30,20 @@ static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc) ...@@ -30,20 +30,20 @@ static void arc_pgu_set_pxl_fmt(struct drm_crtc *crtc)
struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
const struct drm_framebuffer *fb = crtc->primary->state->fb; const struct drm_framebuffer *fb = crtc->primary->state->fb;
uint32_t pixel_format = fb->format->format; uint32_t pixel_format = fb->format->format;
struct simplefb_format *format = NULL; u32 format = DRM_FORMAT_INVALID;
int i; int i;
u32 reg_ctrl; u32 reg_ctrl;
for (i = 0; i < ARRAY_SIZE(supported_formats); i++) { for (i = 0; i < ARRAY_SIZE(arc_pgu_supported_formats); i++) {
if (supported_formats[i].fourcc == pixel_format) if (arc_pgu_supported_formats[i] == pixel_format)
format = &supported_formats[i]; format = arc_pgu_supported_formats[i];
} }
if (WARN_ON(!format)) if (WARN_ON(format == DRM_FORMAT_INVALID))
return; return;
reg_ctrl = arc_pgu_read(arcpgu, ARCPGU_REG_CTRL); reg_ctrl = arc_pgu_read(arcpgu, ARCPGU_REG_CTRL);
if (format->fourcc == DRM_FORMAT_RGB565) if (format == DRM_FORMAT_RGB565)
reg_ctrl &= ~ARCPGU_MODE_RGB888_MASK; reg_ctrl &= ~ARCPGU_MODE_RGB888_MASK;
else else
reg_ctrl |= ARCPGU_MODE_RGB888_MASK; reg_ctrl |= ARCPGU_MODE_RGB888_MASK;
...@@ -195,18 +195,15 @@ static struct drm_plane *arc_pgu_plane_init(struct drm_device *drm) ...@@ -195,18 +195,15 @@ static struct drm_plane *arc_pgu_plane_init(struct drm_device *drm)
{ {
struct arcpgu_drm_private *arcpgu = drm->dev_private; struct arcpgu_drm_private *arcpgu = drm->dev_private;
struct drm_plane *plane = NULL; struct drm_plane *plane = NULL;
u32 formats[ARRAY_SIZE(supported_formats)], i;
int ret; int ret;
plane = devm_kzalloc(drm->dev, sizeof(*plane), GFP_KERNEL); plane = devm_kzalloc(drm->dev, sizeof(*plane), GFP_KERNEL);
if (!plane) if (!plane)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
for (i = 0; i < ARRAY_SIZE(supported_formats); i++)
formats[i] = supported_formats[i].fourcc;
ret = drm_universal_plane_init(drm, plane, 0xff, &arc_pgu_plane_funcs, ret = drm_universal_plane_init(drm, plane, 0xff, &arc_pgu_plane_funcs,
formats, ARRAY_SIZE(formats), arc_pgu_supported_formats,
ARRAY_SIZE(arc_pgu_supported_formats),
NULL, NULL,
DRM_PLANE_TYPE_PRIMARY, NULL); DRM_PLANE_TYPE_PRIMARY, NULL);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment