Commit 098ca765 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2024-03-07' of... 

Merge tag 'drm-misc-next-fixes-2024-03-07' of https://anongit.freedesktop.org/git/drm/drm-misc

 into drm-next

Short summary of fixes pull:

- i915: Fix applying placement flags
- fbdev: Fix build on PowerMacs after header cleanup

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240307124640.GA18593@localhost.localdomain
parents af165fb0 838f8658

arch/powerpc/include/asm/backlight.h

+2 −3
Original line number Diff line number Diff line
@@ -10,15 +10,14 @@ 
#define __ASM_POWERPC_BACKLIGHT_H

#ifdef __KERNEL__



#include <linux/fb.h>

#include <linux/mutex.h>



struct backlight_device;



/* For locking instructions, see the implementation file */

extern struct backlight_device *pmac_backlight;

extern struct mutex pmac_backlight_mutex;



extern int pmac_backlight_curve_lookup(struct fb_info *info, int value);



extern int pmac_has_backlight_type(const char *type);



extern void pmac_backlight_key(int direction);

arch/powerpc/platforms/powermac/backlight.c

+0 −26
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/fb.h>

#include <linux/backlight.h>

#include <linux/adb.h>

#include <linux/pmu.h>
@@ -72,31 +71,6 @@ int pmac_has_backlight_type(const char *type) 
	return 0;

}



int pmac_backlight_curve_lookup(struct fb_info *info, int value)

{

	int level = (FB_BACKLIGHT_LEVELS - 1);



	if (info && info->bl_dev) {

		int i, max = 0;



		/* Look for biggest value */

		for (i = 0; i < FB_BACKLIGHT_LEVELS; i++)

			max = max((int)info->bl_curve[i], max);



		/* Look for nearest value */

		for (i = 0; i < FB_BACKLIGHT_LEVELS; i++) {

			int diff = abs(info->bl_curve[i] - value);

			if (diff < max) {

				max = diff;

				level = i;

			}

		}



	}



	return level;

}



static void pmac_backlight_key_worker(struct work_struct *work)

{

	if (atomic_read(&kernel_backlight_disabled))

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

+1 −1
Original line number Diff line number Diff line
@@ -162,10 +162,10 @@ i915_ttm_placement_from_obj(const struct drm_i915_gem_object *obj, 
	unsigned int flags = obj->flags;

	unsigned int i;



	places[0].flags |= TTM_PL_FLAG_DESIRED;

	i915_ttm_place_from_region(num_allowed ? obj->mm.placements[0] :

				   obj->mm.region, &places[0], obj->bo_offset,

				   obj->base.size, flags);

	places[0].flags |= TTM_PL_FLAG_DESIRED;



	/* Cache this on object? */

	for (i = 0; i < num_allowed; ++i) {

drivers/macintosh/via-pmu-backlight.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <asm/ptrace.h>

#include <linux/adb.h>

#include <linux/backlight.h>

#include <linux/pmu.h>

#include <asm/backlight.h>

drivers/video/fbdev/chipsfb.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <linux/aperture.h>

#include <linux/backlight.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/errno.h>