Commit 38ed0fca authored by Jason Wessel's avatar Jason Wessel Committed by Dave Airlie

Revert "radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit"

This reverts commit ff773714.

A generic solution is needed to save and retore the LUT information.

CC: Jesse Barnes <jbarnes@virtuousgeek.org>
CC: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f6086134
...@@ -138,38 +138,6 @@ void radeon_crtc_load_lut(struct drm_crtc *crtc) ...@@ -138,38 +138,6 @@ void radeon_crtc_load_lut(struct drm_crtc *crtc)
legacy_crtc_load_lut(crtc); legacy_crtc_load_lut(crtc);
} }
void radeon_crtc_save_lut(struct drm_crtc *crtc)
{
struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
int i;
if (!crtc->enabled)
return;
for (i = 0; i < 256; i++) {
radeon_crtc->lut_r_copy[i] = radeon_crtc->lut_r[i];
radeon_crtc->lut_g_copy[i] = radeon_crtc->lut_g[i];
radeon_crtc->lut_b_copy[i] = radeon_crtc->lut_b[i];
}
}
void radeon_crtc_restore_lut(struct drm_crtc *crtc)
{
struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
int i;
if (!crtc->enabled)
return;
for (i = 0; i < 256; i++) {
radeon_crtc->lut_r[i] = radeon_crtc->lut_r_copy[i];
radeon_crtc->lut_g[i] = radeon_crtc->lut_g_copy[i];
radeon_crtc->lut_b[i] = radeon_crtc->lut_b_copy[i];
}
radeon_crtc_load_lut(crtc);
}
/** Sets the color ramps on behalf of fbcon */ /** Sets the color ramps on behalf of fbcon */
void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
u16 blue, int regno) u16 blue, int regno)
......
...@@ -355,11 +355,6 @@ int radeon_crtc_set_base_atomic(struct drm_crtc *crtc, ...@@ -355,11 +355,6 @@ int radeon_crtc_set_base_atomic(struct drm_crtc *crtc,
struct drm_framebuffer *fb, struct drm_framebuffer *fb,
int x, int y, int enter) int x, int y, int enter)
{ {
if (enter)
radeon_crtc_save_lut(crtc);
else
radeon_crtc_restore_lut(crtc);
return radeon_crtc_do_set_base(crtc, fb, x, y, 1); return radeon_crtc_do_set_base(crtc, fb, x, y, 1);
} }
......
...@@ -261,7 +261,6 @@ struct radeon_crtc { ...@@ -261,7 +261,6 @@ struct radeon_crtc {
struct drm_crtc base; struct drm_crtc base;
int crtc_id; int crtc_id;
u16 lut_r[256], lut_g[256], lut_b[256]; u16 lut_r[256], lut_g[256], lut_b[256];
u16 lut_r_copy[256], lut_g_copy[256], lut_b_copy[256];
bool enabled; bool enabled;
bool can_tile; bool can_tile;
uint32_t crtc_offset; uint32_t crtc_offset;
...@@ -523,8 +522,6 @@ extern int atombios_get_encoder_mode(struct drm_encoder *encoder); ...@@ -523,8 +522,6 @@ extern int atombios_get_encoder_mode(struct drm_encoder *encoder);
extern void radeon_encoder_set_active_device(struct drm_encoder *encoder); extern void radeon_encoder_set_active_device(struct drm_encoder *encoder);
extern void radeon_crtc_load_lut(struct drm_crtc *crtc); extern void radeon_crtc_load_lut(struct drm_crtc *crtc);
extern void radeon_crtc_save_lut(struct drm_crtc *crtc);
extern void radeon_crtc_restore_lut(struct drm_crtc *crtc);
extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y, extern int atombios_crtc_set_base(struct drm_crtc *crtc, int x, int y,
struct drm_framebuffer *old_fb); struct drm_framebuffer *old_fb);
extern int atombios_crtc_set_base_atomic(struct drm_crtc *crtc, extern int atombios_crtc_set_base_atomic(struct drm_crtc *crtc,
......
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