From: Lyude Paul <lyude@redhat.com>
To: nouveau@lists.freedesktop.org
Cc: Jeffery Miller <jmiller@neverware.com>,
Karol Herbst <kherbst@redhat.com>,
Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] drm/nouveau: Refactor nvXX_backlight_init()
Date: Wed, 22 Aug 2018 21:21:50 -0400 [thread overview]
Message-ID: <20180823012151.20099-6-lyude@redhat.com> (raw)
In-Reply-To: <20180823012151.20099-1-lyude@redhat.com>
There's literally no difference between any of the backlight init
functions besides the backlight properties they set and the backlight
callbacks that they set, so move all of the duplicated backlight init
code out of there and into nouveau_backlight_init().
This gets rid of a lot of copy pasta!
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Jeffery Miller <jmiller@neverware.com>
Cc: Karol Herbst <kherbst@redhat.com>
---
drivers/gpu/drm/nouveau/nouveau_backlight.c | 131 +++++++++-----------
1 file changed, 57 insertions(+), 74 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 7ad90e7610a1..0712b2688e18 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -94,48 +94,20 @@ static const struct backlight_ops nv40_bl_ops = {
};
static int
-nv40_backlight_init(struct drm_connector *connector)
+nv40_backlight_init(struct drm_connector *connector,
+ struct backlight_properties *props,
+ const struct backlight_ops **ops)
{
struct nouveau_drm *drm = nouveau_drm(connector->dev);
- struct nouveau_backlight *bl;
struct nvif_object *device = &drm->client.device.object;
- struct backlight_properties props;
- char backlight_name[BL_NAME_SIZE];
- int ret = 0;
if (!(nvif_rd32(device, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
- return 0;
-
- bl = kzalloc(sizeof(*bl), GFP_KERNEL);
- if (!bl)
- return -ENOMEM;
-
- memset(&props, 0, sizeof(struct backlight_properties));
- props.type = BACKLIGHT_RAW;
- props.max_brightness = 31;
- if (!nouveau_get_backlight_name(backlight_name, bl)) {
- NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
- goto fail_alloc;
- }
-
- bl->dev = backlight_device_register(backlight_name, connector->kdev,
- drm, &nv40_bl_ops, &props);
- if (IS_ERR(bl->dev)) {
- if (bl->id >= 0)
- ida_simple_remove(&bl_ida, bl->id);
-
- ret = PTR_ERR(bl->dev);
- goto fail_alloc;
- }
-
- nouveau_connector(connector)->backlight = bl;
- bl->dev->props.brightness = nv40_get_intensity(bl->dev);
- backlight_update_status(bl->dev);
+ return -ENODEV;
+ props->type = BACKLIGHT_RAW;
+ props->max_brightness = 31;
+ *ops = &nv40_bl_ops;
return 0;
-fail_alloc:
- kfree(bl);
- return ret;
}
static int
@@ -221,16 +193,13 @@ static const struct backlight_ops nva3_bl_ops = {
};
static int
-nv50_backlight_init(struct drm_connector *connector)
+nv50_backlight_init(struct drm_connector *connector,
+ struct backlight_properties *props,
+ const struct backlight_ops **ops)
{
struct nouveau_drm *drm = nouveau_drm(connector->dev);
struct nvif_object *device = &drm->client.device.object;
struct nouveau_encoder *nv_encoder;
- struct nouveau_backlight *bl;
- struct backlight_properties props;
- const struct backlight_ops *ops;
- char backlight_name[BL_NAME_SIZE];
- int ret = 0;
nv_encoder = find_encoder(connector, DCB_OUTPUT_LVDS);
if (!nv_encoder) {
@@ -240,52 +209,31 @@ nv50_backlight_init(struct drm_connector *connector)
}
if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)))
- return 0;
-
- bl = kzalloc(sizeof(*bl), GFP_KERNEL);
- if (!bl)
- return -ENOMEM;
+ return -ENODEV;
if (drm->client.device.info.chipset <= 0xa0 ||
drm->client.device.info.chipset == 0xaa ||
drm->client.device.info.chipset == 0xac)
- ops = &nv50_bl_ops;
+ *ops = &nv50_bl_ops;
else
- ops = &nva3_bl_ops;
+ *ops = &nva3_bl_ops;
- memset(&props, 0, sizeof(struct backlight_properties));
- props.type = BACKLIGHT_RAW;
- props.max_brightness = 100;
- if (!nouveau_get_backlight_name(backlight_name, bl)) {
- NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
- goto fail_alloc;
- }
-
- bl->dev = backlight_device_register(backlight_name, connector->kdev,
- nv_encoder, ops, &props);
- if (IS_ERR(bl->dev)) {
- if (bl->id >= 0)
- ida_simple_remove(&bl_ida, bl->id);
+ props->type = BACKLIGHT_RAW;
+ props->max_brightness = 100;
- ret = PTR_ERR(bl->dev);
- goto fail_alloc;
- }
-
- nouveau_connector(connector)->backlight = bl;
- bl->dev->props.brightness = bl->dev->ops->get_brightness(bl->dev);
- backlight_update_status(bl->dev);
return 0;
-
-fail_alloc:
- kfree(bl);
- return ret;
}
int
nouveau_backlight_init(struct drm_connector *connector)
{
struct nouveau_drm *drm = nouveau_drm(connector->dev);
+ struct nouveau_backlight *bl;
struct nvif_device *device = &drm->client.device;
+ char backlight_name[BL_NAME_SIZE];
+ struct backlight_properties props = {0};
+ const struct backlight_ops *ops;
+ int ret;
if (apple_gmux_present()) {
NV_INFO(drm, "Apple GMUX detected: not registering Nouveau backlight interface\n");
@@ -298,15 +246,50 @@ nouveau_backlight_init(struct drm_connector *connector)
switch (device->info.family) {
case NV_DEVICE_INFO_V0_CURIE:
- return nv40_backlight_init(connector);
+ ret = nv40_backlight_init(connector, &props, &ops);
+ break;
case NV_DEVICE_INFO_V0_TESLA:
case NV_DEVICE_INFO_V0_FERMI:
case NV_DEVICE_INFO_V0_KEPLER:
case NV_DEVICE_INFO_V0_MAXWELL:
- return nv50_backlight_init(connector);
+ ret = nv50_backlight_init(connector, &props, &ops);
+ break;
default:
return 0;
}
+
+ if (ret == -ENODEV)
+ return 0;
+ else if (ret)
+ return ret;
+
+ bl = kzalloc(sizeof(*bl), GFP_KERNEL);
+ if (!bl)
+ return -ENOMEM;
+
+ if (!nouveau_get_backlight_name(backlight_name, bl)) {
+ NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
+ goto fail_alloc;
+ }
+
+ bl->dev = backlight_device_register(backlight_name, connector->kdev,
+ drm, ops, &props);
+ if (IS_ERR(bl->dev)) {
+ if (bl->id >= 0)
+ ida_simple_remove(&bl_ida, bl->id);
+ ret = PTR_ERR(bl->dev);
+ goto fail_alloc;
+ }
+
+ nouveau_connector(connector)->backlight = bl;
+ bl->dev->props.brightness = bl->dev->ops->get_brightness(bl->dev);
+ backlight_update_status(bl->dev);
+
+ return 0;
+
+fail_alloc:
+ kfree(bl);
+ return ret;
}
void
--
2.17.1
prev parent reply other threads:[~2018-08-23 1:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 1:21 [PATCH 0/5] drm/nouveau: Backlight fixes and cleanup Lyude Paul
2018-08-23 1:21 ` [PATCH 1/5] drm/nouveau: Check backlight IDs are >= 0, not > 0 Lyude Paul
2018-08-23 12:00 ` Karol Herbst
2018-08-23 16:29 ` Lyude Paul
2018-08-23 1:21 ` [PATCH 2/5] drm/nouveau: Move backlight device into nouveau_connector Lyude Paul
2018-08-23 1:21 ` [PATCH 3/5] drm/nouveau: s/nouveau_backlight_exit/nouveau_backlight_fini/ Lyude Paul
2018-08-23 1:21 ` [PATCH 4/5] drm/nouveau: Cleanup indenting in nouveau_backlight.c Lyude Paul
2018-08-23 1:21 ` Lyude Paul [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180823012151.20099-6-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jmiller@neverware.com \
--cc=kherbst@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).