Commit ae25ec2f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2021-05-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.14:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:

 * aperture: Fix unlocking on errors

 * legacy: Fix some doc comments

Driver Changes:

 * drm/amdgpu: Free resource on fence usage query; Fix fence calculation;

 * drm/bridge: Lt9611: Add missing MODULE_DEVICE_TABLE

 * drm/i915: Print formats with %p4cc

 * drm/ingenic: IPU planes are now always of type OVERLAY

 * drm/nouveau: Remove left-over reference to struct drm_device.pdev

 * drm/panfrost: Disable devfreq if num_supplies > 1; Add Mediatek MT8183 +
   DT bindings; Cleanups

 * drm/simpledrm: Print resources with %pr; Fix use-after-free errors;
   Fix NULL deref; Fix MAINTAINERS entry

 * drm/vmwgfx: Fix memory allocation and leak in FIFO allocation; Fix
   return value in PCI resource setup

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YKJs2IfwSYvuGPU7@linux-uq9g.fritz.box
parents 41ab70e0 30039405

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

+29 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
    items:

      - enum:

          - amlogic,meson-g12a-mali

          - mediatek,mt8183-mali

          - realtek,rtd1619-mali

          - rockchip,px30-mali

      - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable
@@ -41,10 +42,13 @@ properties: 


  mali-supply: true



  sram-supply: true



  operating-points-v2: true



  power-domains:

    maxItems: 1

    minItems: 1

    maxItems: 3



  resets:

    maxItems: 2
@@ -89,6 +93,30 @@ allOf: 
    then:

      required:

        - resets

  - if:

      properties:

        compatible:

          contains:

            const: mediatek,mt8183-mali

    then:

      properties:

        power-domains:

          minItems: 3

        power-domain-names:

          items:

            - const: core0

            - const: core1

            - const: core2



      required:

        - sram-supply

        - power-domains

        - power-domain-names

    else:

      properties:

        power-domains:

          maxItems: 1

        sram-supply: false



examples:

  - |

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5875,7 +5875,7 @@ M: Thomas Zimmermann <tzimmermann@suse.de> 
L:	dri-devel@lists.freedesktop.org

S:	Maintained

T:	git git://anongit.freedesktop.org/drm/drm-misc

F:	drivers/gpu/drm/tiny/simplekms.c

F:	drivers/gpu/drm/tiny/simpledrm.c









DRM DRIVER FOR SIS VIDEO CARDS









S:	Orphan / Obsolete
































drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c



+22
−5






























Original line number
Diff line number
Diff line







@@ -652,12 +652,14 @@ void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr)







	mutex_destroy(&mgr->lock);









}



















void amdgpu_ctx_fence_time(struct amdgpu_ctx *ctx, struct amdgpu_ctx_entity *centity,









		ktime_t *total, ktime_t *max)









static void amdgpu_ctx_fence_time(struct amdgpu_ctx *ctx,









		struct amdgpu_ctx_entity *centity, ktime_t *total, ktime_t *max)









{









	ktime_t now, t1;









	uint32_t i;



















	*total = *max = 0;



















	now = ktime_get();









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









		struct dma_fence *fence;








@@ -669,11 +671,15 @@ void amdgpu_ctx_fence_time(struct amdgpu_ctx *ctx, struct amdgpu_ctx_entity *cen







		if (!fence)









			continue;









		s_fence = to_drm_sched_fence(fence);









		if (!dma_fence_is_signaled(&s_fence->scheduled))









		if (!dma_fence_is_signaled(&s_fence->scheduled)) {









			dma_fence_put(fence);









			continue;









		}









		t1 = s_fence->scheduled.timestamp;









		if (t1 >= now)









		if (!ktime_before(t1, now)) {









			dma_fence_put(fence);









			continue;









		}









		if (dma_fence_is_signaled(&s_fence->finished) &&









			s_fence->finished.timestamp < now)









			*total += ktime_sub(s_fence->finished.timestamp, t1);








@@ -699,11 +705,22 @@ ktime_t amdgpu_ctx_mgr_fence_usage(struct amdgpu_ctx_mgr *mgr, uint32_t hwip,







	idp = &mgr->ctx_handles;









	mutex_lock(&mgr->lock);









	idr_for_each_entry(idp, ctx, id) {









		ktime_t ttotal, tmax;



















		if (!ctx->entities[hwip][idx])









			continue;



















		centity = ctx->entities[hwip][idx];









		amdgpu_ctx_fence_time(ctx, centity, &total, &max);









		amdgpu_ctx_fence_time(ctx, centity, &ttotal, &tmax);



















		/* Harmonic mean approximation diverges for very small









		 * values. If ratio < 0.01% ignore









		 */









		if (AMDGPU_CTX_FENCE_USAGE_MIN_RATIO(tmax, ttotal))









			continue;



















		total = ktime_add(total, ttotal);









		max = ktime_after(tmax, max) ? tmax : max;









	}



















	mutex_unlock(&mgr->lock);
































drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h



+1
−2






























Original line number
Diff line number
Diff line







@@ -30,6 +30,7 @@ struct drm_file;







struct amdgpu_fpriv;



















#define AMDGPU_MAX_ENTITY_NUM 4









#define AMDGPU_CTX_FENCE_USAGE_MIN_RATIO(max, total) ((max) > 16384ULL*(total))



















struct amdgpu_ctx_entity {









	uint64_t		sequence;








@@ -89,6 +90,4 @@ long amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr, long timeout);







void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr);









ktime_t amdgpu_ctx_mgr_fence_usage(struct amdgpu_ctx_mgr *mgr, uint32_t hwip,









		uint32_t idx, uint64_t *elapsed);









void amdgpu_ctx_fence_time(struct amdgpu_ctx *ctx, struct amdgpu_ctx_entity *centity,









		ktime_t *total, ktime_t *max);









#endif
























drivers/gpu/drm/bridge/lontium-lt9611.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1215,6 +1215,7 @@ static struct i2c_device_id lt9611_id[] = {







	{ "lontium,lt9611", 0 },









	{}









};









MODULE_DEVICE_TABLE(i2c, lt9611_id);



















static const struct of_device_id lt9611_match_table[] = {









	{ .compatible = "lontium,lt9611" },