From: Peter Rosin <peda@axentia.se>
To: linux-kernel@vger.kernel.org
Cc: Peter Rosin <peda@axentia.se>,
Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
David Airlie <airlied@linux.ie>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Sean Paul <seanpaul@chromium.org>,
Boris Brezillon <boris.brezillon@free-electrons.com>
Subject: [PATCH v4 09/14] drm: i915: remove dead code and pointless local lut storage
Date: Thu, 6 Jul 2017 14:20:43 +0200 [thread overview]
Message-ID: <1499343648-29695-10-git-send-email-peda@axentia.se> (raw)
In-Reply-To: <1499343648-29695-1-git-send-email-peda@axentia.se>
The driver stores lut values from the fbdev interface, and is able
to give them back, but does not appear to do anything with these
lut values. The generic fb helpers have replaced this function,
and may even have made the driver work for the C8 mode from the
fbdev interface. But that is untested.
Since the fb helpers .gamma_set and .gamma_get are obsolete,
remove the dead code.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/gpu/drm/i915/intel_drv.h | 1 -
drivers/gpu/drm/i915/intel_fbdev.c | 31 -------------------------------
2 files changed, 32 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index d93efb4..bc7bfa0 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -786,7 +786,6 @@ struct intel_crtc {
struct drm_crtc base;
enum pipe pipe;
enum plane plane;
- u8 lut_r[256], lut_g[256], lut_b[256];
/*
* Whether the crtc and the connected output pipeline is active. Implies
* that crtc->enabled is set, i.e. the current mode configuration has
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 460ca0b..19d650b 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -281,27 +281,6 @@ static int intelfb_create(struct drm_fb_helper *helper,
return ret;
}
-/** Sets the color ramps on behalf of RandR */
-static void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
- u16 blue, int regno)
-{
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
- intel_crtc->lut_r[regno] = red >> 8;
- intel_crtc->lut_g[regno] = green >> 8;
- intel_crtc->lut_b[regno] = blue >> 8;
-}
-
-static void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
- u16 *blue, int regno)
-{
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
- *red = intel_crtc->lut_r[regno] << 8;
- *green = intel_crtc->lut_g[regno] << 8;
- *blue = intel_crtc->lut_b[regno] << 8;
-}
-
static struct drm_fb_helper_crtc *
intel_fb_helper_crtc(struct drm_fb_helper *fb_helper, struct drm_crtc *crtc)
{
@@ -376,7 +355,6 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
struct drm_connector *connector;
struct drm_encoder *encoder;
struct drm_fb_helper_crtc *new_crtc;
- struct intel_crtc *intel_crtc;
fb_conn = fb_helper->connector_info[i];
connector = fb_conn->connector;
@@ -418,13 +396,6 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
num_connectors_enabled++;
- intel_crtc = to_intel_crtc(connector->state->crtc);
- for (j = 0; j < 256; j++) {
- intel_crtc->lut_r[j] = j;
- intel_crtc->lut_g[j] = j;
- intel_crtc->lut_b[j] = j;
- }
-
new_crtc = intel_fb_helper_crtc(fb_helper,
connector->state->crtc);
@@ -527,8 +498,6 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
static const struct drm_fb_helper_funcs intel_fb_helper_funcs = {
.initial_config = intel_fb_initial_config,
- .gamma_set = intel_crtc_fb_gamma_set,
- .gamma_get = intel_crtc_fb_gamma_get,
.fb_probe = intelfb_create,
};
--
2.1.4
next prev parent reply other threads:[~2017-07-06 12:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-06 12:20 [PATCH v4 00/14] improve the fb_setcmap helper Peter Rosin
2017-07-06 12:20 ` [PATCH v4 01/14] drm/atomic: export drm_atomic_replace_property_blob Peter Rosin
2017-07-11 8:01 ` Daniel Vetter
2017-07-11 12:06 ` Peter Rosin
2017-07-06 12:20 ` [PATCH v4 02/14] drm/atomic-helper: update lut props directly in ..._legacy_gamma_set Peter Rosin
2017-07-11 8:02 ` Daniel Vetter
2017-07-11 13:08 ` Peter Rosin
2017-07-06 12:20 ` [PATCH v4 03/14] drm/fb-helper: separate the fb_setcmap helper into atomic and legacy paths Peter Rosin
2017-07-11 8:10 ` Daniel Vetter
2017-07-11 12:12 ` Peter Rosin
2017-07-12 7:03 ` Daniel Vetter
2017-07-12 7:47 ` Peter Rosin
2017-07-13 12:42 ` Daniel Vetter
2017-07-06 12:20 ` [PATCH v4 04/14] drm: amd: remove dead code and pointless local lut storage Peter Rosin
2017-07-06 12:20 ` [PATCH v4 05/14] drm: armada: remove dead empty functions Peter Rosin
2017-07-06 12:20 ` [PATCH v4 06/14] drm: ast: remove dead code and pointless local lut storage Peter Rosin
2017-07-06 12:20 ` [PATCH v4 07/14] drm: cirrus: " Peter Rosin
2017-07-06 12:20 ` [PATCH v4 08/14] drm: gma500: " Peter Rosin
2017-07-06 12:20 ` Peter Rosin [this message]
2017-07-06 12:20 ` [PATCH v4 10/14] drm: mgag200: " Peter Rosin
2017-07-06 12:20 ` [PATCH v4 11/14] drm: nouveau: " Peter Rosin
2017-07-06 12:20 ` [PATCH v4 12/14] drm: radeon: " Peter Rosin
2017-07-06 12:20 ` [PATCH v4 13/14] drm: stm: " Peter Rosin
2017-07-06 12:20 ` [PATCH v4 14/14] drm: remove unused and redundant callbacks Peter Rosin
2017-07-11 8:13 ` Daniel Vetter
2017-07-11 12:13 ` Peter Rosin
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=1499343648-29695-10-git-send-email-peda@axentia.se \
--to=peda@axentia.se \
--cc=airlied@linux.ie \
--cc=boris.brezillon@free-electrons.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=seanpaul@chromium.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
all inboxes | Powered by JetHome®