Commit 1cc17590 authored by Stephen Kitt's avatar Stephen Kitt Committed by Helge Deller
Browse files

fbdev: nvidia: Use backlight helper 



Instead of retrieving the backlight brightness in struct
backlight_properties manually, and then checking whether the backlight
should be on at all, use backlight_get_brightness() which does all
this and insulates this from future changes.

Signed-off-by: default avatarStephen Kitt <steve@sk2.org>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 973fcf37

drivers/video/fbdev/nvidia/nv_backlight.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -49,17 +49,11 @@ static int nvidia_bl_update_status(struct backlight_device *bd) 
{

{

	struct nvidia_par *par = bl_get_data(bd);

	struct nvidia_par *par = bl_get_data(bd);

	u32 tmp_pcrt, tmp_pmc, fpcontrol;

	u32 tmp_pcrt, tmp_pmc, fpcontrol;

	int level;

	int level = backlight_get_brightness(bd);





	if (!par->FlatPanel)

	if (!par->FlatPanel)

		return 0;

		return 0;





	if (bd->props.power != FB_BLANK_UNBLANK ||

	    bd->props.fb_blank != FB_BLANK_UNBLANK)

		level = 0;

	else

		level = bd->props.brightness;



	tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF;

	tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF;

	tmp_pcrt = NV_RD32(par->PCRTC0, 0x081C) & 0xFFFFFFFC;

	tmp_pcrt = NV_RD32(par->PCRTC0, 0x081C) & 0xFFFFFFFC;

	fpcontrol = NV_RD32(par->PRAMDAC, 0x0848) & 0xCFFFFFCC;

	fpcontrol = NV_RD32(par->PRAMDAC, 0x0848) & 0xCFFFFFCC;