Commit ae677a67 authored by Sean Paul's avatar Sean Paul
Browse files

Merge panfrost-fixes into drm-misc-next-fixes 



Merging some panfrost fixes as well as one rockchip fix that _just_
missed feature freeze.

Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parents 43068cb7 aa202367

drivers/gpu/drm/panfrost/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
config DRM_PANFROST

	tristate "Panfrost (DRM support for ARM Mali Midgard/Bifrost GPUs)"

	depends on DRM

	depends on ARM || ARM64 || COMPILE_TEST

	depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64)

	depends on MMU

	select DRM_SCHED

	select IOMMU_SUPPORT

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/regulator/consumer.h>



#include "panfrost_device.h"

#include "panfrost_devfreq.h"

#include "panfrost_features.h"

#include "panfrost_issues.h"

#include "panfrost_gpu.h"

drivers/gpu/drm/panfrost/panfrost_device.c

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ int panfrost_device_init(struct panfrost_device *pfdev) 
	struct resource *res;



	mutex_init(&pfdev->sched_lock);

	mutex_init(&pfdev->reset_lock);

	INIT_LIST_HEAD(&pfdev->scheduled_jobs);



	spin_lock_init(&pfdev->hwaccess_lock);

drivers/gpu/drm/panfrost/panfrost_device.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct panfrost_device { 
	struct list_head scheduled_jobs;



	struct mutex sched_lock;

	struct mutex reset_lock;



	struct {

		struct devfreq *devfreq;

drivers/gpu/drm/panfrost/panfrost_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
/* Called DRM core on the last userspace/kernel unreference of the

 * BO.

 */

void panfrost_gem_free_object(struct drm_gem_object *obj)

static void panfrost_gem_free_object(struct drm_gem_object *obj)

{

	struct panfrost_gem_object *bo = to_panfrost_bo(obj);

	struct panfrost_device *pfdev = obj->dev->dev_private;

CRA Git | Maintained and supported by SUSTech CRA and CCSE