drm: renesas: shmobile: Remove backlight support (0da28d5f) · Commits · github.com / kvm-riscv / linux

drivers/gpu/drm/renesas/shmobile/Makefile

+1 −2

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		shmob-drm-y := shmob_drm_backlight.o \
		shmob_drm_crtc.o \
		shmob-drm-y := shmob_drm_crtc.o \
		shmob_drm_drv.o \
		shmob_drm_kms.o \
		shmob_drm_plane.o

drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c

deleted100644 → 0

+0 −82

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0+
		/*
		* shmob_drm_backlight.c -- SH Mobile DRM Backlight
		*
		* Copyright (C) 2012 Renesas Electronics Corporation
		*
		* Laurent Pinchart (laurent.pinchart@ideasonboard.com)
		*/

		#include <linux/backlight.h>

		#include "shmob_drm_backlight.h"
		#include "shmob_drm_crtc.h"
		#include "shmob_drm_drv.h"

		static int shmob_drm_backlight_update(struct backlight_device *bdev)
		{
		struct shmob_drm_connector *scon = bl_get_data(bdev);
		struct shmob_drm_device *sdev = scon->connector.dev->dev_private;
		const struct shmob_drm_backlight_data *bdata = &sdev->pdata->backlight;
		int brightness = backlight_get_brightness(bdev);

		return bdata->set_brightness(brightness);
		}

		static int shmob_drm_backlight_get_brightness(struct backlight_device *bdev)
		{
		struct shmob_drm_connector *scon = bl_get_data(bdev);
		struct shmob_drm_device *sdev = scon->connector.dev->dev_private;
		const struct shmob_drm_backlight_data *bdata = &sdev->pdata->backlight;

		return bdata->get_brightness();
		}

		static const struct backlight_ops shmob_drm_backlight_ops = {
		.options = BL_CORE_SUSPENDRESUME,
		.update_status = shmob_drm_backlight_update,
		.get_brightness = shmob_drm_backlight_get_brightness,
		};

		void shmob_drm_backlight_dpms(struct shmob_drm_connector *scon, int mode)
		{
		if (scon->backlight == NULL)
		return;

		scon->backlight->props.power = mode == DRM_MODE_DPMS_ON
		? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
		backlight_update_status(scon->backlight);
		}

		int shmob_drm_backlight_init(struct shmob_drm_connector *scon)
		{
		struct shmob_drm_device *sdev = scon->connector.dev->dev_private;
		const struct shmob_drm_backlight_data *bdata = &sdev->pdata->backlight;
		struct drm_connector *connector = &scon->connector;
		struct drm_device *dev = connector->dev;
		struct backlight_device *backlight;

		if (!bdata->max_brightness)
		return 0;

		backlight = backlight_device_register(bdata->name, dev->dev, scon,
		&shmob_drm_backlight_ops, NULL);
		if (IS_ERR(backlight)) {
		dev_err(dev->dev, "unable to register backlight device: %ld\n",
		PTR_ERR(backlight));
		return PTR_ERR(backlight);
		}

		backlight->props.max_brightness = bdata->max_brightness;
		backlight->props.brightness = bdata->max_brightness;
		backlight->props.power = FB_BLANK_POWERDOWN;
		backlight_update_status(backlight);

		scon->backlight = backlight;
		return 0;
		}

		void shmob_drm_backlight_exit(struct shmob_drm_connector *scon)
		{
		backlight_device_unregister(scon->backlight);
		}

drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0+ */
		/*
		* shmob_drm_backlight.h -- SH Mobile DRM Backlight
		*
		* Copyright (C) 2012 Renesas Electronics Corporation
		*
		* Laurent Pinchart (laurent.pinchart@ideasonboard.com)
		*/

		#ifndef __SHMOB_DRM_BACKLIGHT_H__
		#define __SHMOB_DRM_BACKLIGHT_H__

		struct shmob_drm_connector;

		void shmob_drm_backlight_dpms(struct shmob_drm_connector *scon, int mode);
		int shmob_drm_backlight_init(struct shmob_drm_connector *scon);
		void shmob_drm_backlight_exit(struct shmob_drm_connector *scon);

		#endif /* __SHMOB_DRM_BACKLIGHT_H__ */

drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c

+4 −29

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		* Laurent Pinchart (laurent.pinchart@ideasonboard.com)
		*/

		#include <linux/backlight.h>
		#include <linux/clk.h>
		#include <linux/pm_runtime.h>

		@@ -24,7 +23,6 @@
		#include <drm/drm_simple_kms_helper.h>
		#include <drm/drm_vblank.h>

		#include "shmob_drm_backlight.h"
		#include "shmob_drm_crtc.h"
		#include "shmob_drm_drv.h"
		#include "shmob_drm_kms.h"
		@@ -487,21 +485,9 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)
		* Encoder
		*/

		#define to_shmob_encoder(e) \
		container_of(e, struct shmob_drm_encoder, encoder)

		static void shmob_drm_encoder_dpms(struct drm_encoder *encoder, int mode)
		{
		struct shmob_drm_encoder *senc = to_shmob_encoder(encoder);
		struct shmob_drm_device *sdev = encoder->dev->dev_private;
		struct shmob_drm_connector *scon = &sdev->connector;

		if (senc->dpms == mode)
		return;

		shmob_drm_backlight_dpms(scon, mode);

		senc->dpms = mode;
		/* No-op, everything is handled in the CRTC code. */
		}

		static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder,
		@@ -553,11 +539,9 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

		int shmob_drm_encoder_create(struct shmob_drm_device *sdev)
		{
		struct drm_encoder *encoder = &sdev->encoder.encoder;
		struct drm_encoder *encoder = &sdev->encoder;
		int ret;

		sdev->encoder.dpms = DRM_MODE_DPMS_OFF;

		encoder->possible_crtcs = 1;

		ret = drm_simple_encoder_init(sdev->ddev, encoder,
		@@ -622,9 +606,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {

		static void shmob_drm_connector_destroy(struct drm_connector *connector)
		{
		struct shmob_drm_connector *scon = to_shmob_connector(connector);

		shmob_drm_backlight_exit(scon);
		drm_connector_unregister(connector);
		drm_connector_cleanup(connector);
		}
		@@ -653,13 +634,9 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,

		drm_connector_helper_add(connector, &connector_helper_funcs);

		ret = shmob_drm_backlight_init(&sdev->connector);
		if (ret < 0)
		goto err_cleanup;

		ret = drm_connector_attach_encoder(connector, encoder);
		if (ret < 0)
		goto err_backlight;
		goto error;

		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
		drm_object_property_set_value(&connector->base,
		@@ -667,9 +644,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,

		return 0;

		err_backlight:
		shmob_drm_backlight_exit(&sdev->connector);
		err_cleanup:
		error:
		drm_connector_cleanup(connector);
		return ret;
		}

drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include <drm/drm_connector.h>
		#include <drm/drm_encoder.h>

		struct backlight_device;
		struct drm_pending_vblank_event;
		struct shmob_drm_device;
		struct shmob_drm_format_info;
		@@ -31,16 +30,9 @@ struct shmob_drm_crtc {
		bool started;
		};

		struct shmob_drm_encoder {
		struct drm_encoder encoder;
		int dpms;
		};

		struct shmob_drm_connector {
		struct drm_connector connector;
		struct drm_encoder *encoder;

		struct backlight_device *backlight;
		};

		int shmob_drm_crtc_create(struct shmob_drm_device *sdev);