diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-05-06 15:07:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-05-06 15:07:39 +1000 |
| commit | 97ab530870cc23bf20952ce8a1d86196dddc2e6e (patch) | |
| tree | 9c8f7fef8d74445355613de36e2fbc65e4de9be1 /drivers/gpu/drm/imx | |
| parent | b900352f9ddebc5c8dd30dc16218c4ff1b8c9147 (diff) | |
| parent | 927d8fd465adbaaad6cce82f840d489d7c378f29 (diff) | |
| download | linux-97ab530870cc23bf20952ce8a1d86196dddc2e6e.tar.gz | |
Merge tag 'imx-drm-next-2022-05-04' of git://git.pengutronix.de/pza/linux into drm-next
drm/imx: various cleanups
- Use swap() instead of open-coding in ipu-image-convert.
- Use devm_platform_ioremap_resource() helper in imx-tve.
- Make static channel_offsets array const in ipu-dc.
- Remove redundant zpos, color encoding and range initialization.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220504144628.3954620-1-p.zabel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm/imx')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-tve.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c index bc8c3f802a15..2b1fdf2cbbce 100644 --- a/drivers/gpu/drm/imx/imx-tve.c +++ b/drivers/gpu/drm/imx/imx-tve.c @@ -526,7 +526,6 @@ static int imx_tve_probe(struct platform_device *pdev) struct device_node *np = dev->of_node; struct device_node *ddc_node; struct imx_tve *tve; - struct resource *res; void __iomem *base; unsigned int val; int irq; @@ -568,8 +567,7 @@ static int imx_tve_probe(struct platform_device *pdev) } } - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(dev, res); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 846c1aae69c8..36b32e8806e3 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -297,7 +297,6 @@ void ipu_plane_disable_deferred(struct drm_plane *plane) static void ipu_plane_state_reset(struct drm_plane *plane) { - unsigned int zpos = (plane->type == DRM_PLANE_TYPE_PRIMARY) ? 0 : 1; struct ipu_plane_state *ipu_state; if (plane->state) { @@ -309,13 +308,8 @@ static void ipu_plane_state_reset(struct drm_plane *plane) ipu_state = kzalloc(sizeof(*ipu_state), GFP_KERNEL); - if (ipu_state) { + if (ipu_state) __drm_atomic_helper_plane_reset(plane, &ipu_state->base); - ipu_state->base.zpos = zpos; - ipu_state->base.normalized_zpos = zpos; - ipu_state->base.color_encoding = DRM_COLOR_YCBCR_BT601; - ipu_state->base.color_range = DRM_COLOR_YCBCR_LIMITED_RANGE; - } } static struct drm_plane_state * |